coc-git 2.4.8 → 2.4.11

package/Readme.md

@@ -61,8 +61,6 @@ In your vim/neovim, run command:
 
 - `git.browserBranchName`: Branch name for browserOpen and copyUrl., default: `""`
 
-- `git.urlMode`: URL mode for browserOpen and copyUrl, you can set it to `"permalink"`. default: `"normal"`
-
 - `git.urlFix`: a object to configure the url style of copyUrl and browserOpen, make this two command support other git services like gitlab and gitea. default: `{}`
 
 - `git.issueFormat`: Formatting string for issue completion. Supported interpolation variables: %i - issue id. %r - repository name. %o - organization/owner name. %t - issue title. %b - issue body. %c - issue created at. %a - issue author. %u - issue url., default: `"#%i"`
@@ -222,6 +220,7 @@ related commands.
 - `:CocCommand git.chunkInfo` Show chunk info under cursor.
 - `:CocCommand git.chunkUndo` Undo current chunk.
 - `:CocCommand git.chunkStage` Stage current chunk.
+- `:CocCommand git.chunkUnstage` Unstage chunk that contains current line.
 - `:CocCommand git.diffCached` Show cached diff in preview window.
 - `:CocCommand git.showCommit` Show commit of current chunk.
 - `:CocCommand git.browserOpen` Open current line in browser

package/lib/index.js

@@ -4565,6 +4565,30 @@ var import_child_process = __toModule(require("child_process"));
 var import_coc = __toModule(require("coc.nvim"));
 var import_path = __toModule(require("path"));
 var import_which = __toModule(require_which());
+function reverseLine(line) {
+  if (line.startsWith("-"))
+    return "+" + line.slice(1);
+  if (line.startsWith("+"))
+    return "-" + line.slice(1);
+  return line;
+}
+function createUnstagePatch(relpath, chunk) {
+  if (chunk.remove.count == 0 && chunk.add.count == 0)
+    return "";
+  let head = `@@ -${chunk.add.lnum},${chunk.add.count} +${chunk.add.lnum + 1 - chunk.add.count},${chunk.remove.count} @@`;
+  if (!head)
+    return "";
+  const lines = [
+    `diff --git a/${relpath} b/${relpath}`,
+    `index 000000..000000 100644`,
+    `--- a/${relpath}`,
+    `+++ b/${relpath}`,
+    head
+  ];
+  lines.push(...chunk.lines.map((s) => reverseLine(s)));
+  lines.push("");
+  return lines.join("\n");
+}
 function wait(ms) {
   return new Promise((resolve) => {
     setTimeout(() => {
@@ -4900,20 +4924,19 @@ var Bcommits = class extends import_coc2.BasicList {
     }, {tabPersist: true});
     this.addAction("view", async (item, context) => {
       let {commit, root, file} = item.data;
-      let {window: window9, listWindow} = context;
+      let {window: window9} = context;
       let content = await import_coc2.runCommand(`git show ${commit}:${shellescape(file)}`, {cwd: root});
       let lines = content.replace(/\n$/, "").split("\n");
       nvim.pauseNotification();
       nvim.call("win_gotoid", [window9.id], true);
-      nvim.command(`exe "edit ".fnameescape('(${commit}) ${file}')`, true);
+      nvim.command(`exe "tabe ".fnameescape('(${commit}) ${file}')`, true);
       nvim.call("append", [0, lines], true);
       nvim.command("normal! Gdd", true);
       nvim.command(`exe 1`, true);
       nvim.command("setl buftype=nofile nomodifiable bufhidden=wipe nobuflisted", true);
       nvim.command("filetype detect", true);
-      nvim.call("win_gotoid", [listWindow.id], true);
       await nvim.resumeNotification();
-    }, {persist: true});
+    }, {persist: false});
     this.addAction("diff", async (item, context) => {
       let buffer = await context.window.buffer;
       let filetype = await buffer.getOption("filetype");
@@ -5226,7 +5249,7 @@ var Commits = class extends import_coc4.BasicList {
       } else {
         arg = `${list[1].data.commit} ${list[0].data.commit}`;
       }
-      let content = await runCommand(`git --no-pager diff ${arg}`, {cwd: list[0].data.root});
+      let content = await runCommand(`git --no-pager diff --no-ext-diff ${arg}`, {cwd: list[0].data.root});
       let lines = content.replace(/\n$/, "").split("\n");
       nvim.pauseNotification();
       nvim.command(`tabe [diff ${arg}]`, true);
@@ -5250,7 +5273,7 @@ var Commits = class extends import_coc4.BasicList {
       } else {
         arg = `${list[1].data.commit} ${list[0].data.commit}`;
       }
-      let content = await runCommand(`git --no-pager diff ${arg}`, {cwd: list[0].data.root});
+      let content = await runCommand(`git --no-pager diff --no-ext-diff ${arg}`, {cwd: list[0].data.root});
       let lines = content.replace(/\n$/, "").split("\n");
       let winid = context.listWindow.id;
       let mod = context.options.position == "tab" ? "below" : "above";
@@ -5346,7 +5369,7 @@ var Gfiles = class extends import_coc5.BasicList {
       let {root, sha, filepath, branch} = item.data;
       if (!sha)
         return;
-      let content = await runCommand(`git --no-pager diff ${branch} -- ${shellescape(filepath)}`, {cwd: root});
+      let content = await runCommand(`git --no-pager diff --no-ext-diff ${branch} -- ${shellescape(filepath)}`, {cwd: root});
       let lines = content.replace(/\n$/, "").split("\n");
       await this.preview({
         lines,
@@ -5478,7 +5501,7 @@ var GStatus = class extends import_coc6.BasicList {
         }, context);
         return;
       }
-      let args = ["--no-pager", "diff"];
+      let args = ["--no-pager", "diff", "--no-ext-diff"];
       if (index_symbol == "M" && tree_symbol != "M") {
         args.push("--cached");
       }
@@ -5840,6 +5863,12 @@ var DocumentManager = class {
       return;
     await buf.chunkStage();
   }
+  async chunkUnstage() {
+    let buf = await this.buffer;
+    if (!buf)
+      return;
+    await buf.chunkUnstage();
+  }
   async chunkUndo() {
     let buf = await this.buffer;
     if (buf)
@@ -5850,10 +5879,16 @@ var DocumentManager = class {
     if (buf)
       await buf.showCommit();
   }
-  async browser(action = "open", range) {
+  async showBlameDoc() {
     let buf = await this.buffer;
+    let line = await this.nvim.call("line", ".");
     if (buf)
-      await buf.browser(action, range);
+      await buf.showBlameDoc(line);
+  }
+  async browser(action = "open", range, permalink = false) {
+    let buf = await this.buffer;
+    if (buf)
+      await buf.browser(action, range, permalink);
   }
   async diffCached() {
     let buf = await this.buffer;
@@ -5929,6 +5964,48 @@ var Repo = class {
     this.channel = channel;
     this.root = root;
   }
+  async getStagedChunks(relpath) {
+    let args = ["--no-pager", "diff", "--no-ext-diff", "-p", "-U0", "--no-color", "--staged"];
+    if (relpath)
+      args.push(toUnixSlash(relpath));
+    const result = await this.exec(args);
+    if (!result.stdout) {
+      throw new Error(`No staged result.`);
+    }
+    let res = {};
+    let idx = 0;
+    let lines = result.stdout.split(/\r?\n/);
+    let curr;
+    let fsPath;
+    while (idx < lines.length) {
+      let line = lines[idx];
+      if (fsPath && line.startsWith("@@")) {
+        curr = void 0;
+        let ms = line.match(/^@@\s+-(\d+),?(\d*)\s+\+(\d+),?(\d*)\s+@@/);
+        if (ms) {
+          curr = {
+            remove: {lnum: Number(ms[1]), count: ms[2] ? Number(ms[2]) : 1},
+            add: {lnum: Number(ms[3]), count: ms[4] ? Number(ms[4]) : 1},
+            lines: []
+          };
+          res[fsPath] = res[fsPath] || [];
+          res[fsPath].push(curr);
+        }
+      } else if (curr && /^[+\-]/.test(line)) {
+        curr.lines.push(line);
+      } else if (line.startsWith("diff --git")) {
+        let ms = line.match(/diff\s--git\sa\/(.*)\sb\//);
+        if (ms) {
+          fsPath = ms[1];
+          curr = void 0;
+          idx += 4;
+          continue;
+        }
+      }
+      idx++;
+    }
+    return res;
+  }
   async getHEAD() {
     try {
       const result = await this.exec(["symbolic-ref", "--short", "HEAD"]);
@@ -6037,7 +6114,7 @@ var Repo = class {
     const currentFile = import_path4.default.join(import_os.default.tmpdir(), `coc-${uuid()}`);
     await import_util6.default.promisify(import_fs2.default.writeFile)(stagedFile, staged + "\n", "utf8");
     await import_util6.default.promisify(import_fs2.default.writeFile)(currentFile, content, "utf8");
-    let output = await getStdout(`git --no-pager diff -p -U0 --no-color ${shellescape(stagedFile)} ${shellescape(currentFile)}`);
+    let output = await getStdout(`git --no-pager diff --no-ext-diff -p -U0 --no-color ${shellescape(stagedFile)} ${shellescape(currentFile)}`);
     await import_util6.default.promisify(import_fs2.default.unlink)(stagedFile);
     await import_util6.default.promisify(import_fs2.default.unlink)(currentFile);
     if (!output)
@@ -6558,6 +6635,49 @@ var GitBuffer = class {
       this.channel.appendLine(`[Error] ${e.message}`);
     }
   }
+  async chunkUnstage() {
+    let {nvim} = import_coc11.workspace;
+    const {diffs} = this;
+    let line = await nvim.call("line", ".");
+    let adjust = 0;
+    let invalid = false;
+    for (let diff of diffs) {
+      if (diff.end >= line) {
+        if (diff.start <= line && diff.changeType != ChangeType.Delete) {
+          import_coc11.window.showErrorMessage(`Current line contains unstaged change.`);
+          invalid = true;
+        }
+        break;
+      }
+      adjust -= diff.added.count;
+      adjust += diff.removed.count;
+    }
+    if (invalid)
+      return;
+    line = line + adjust;
+    let stagedDiff = await this.repo.getStagedChunks(this.relpath);
+    let chunks = Object.values(stagedDiff)[0];
+    if (!chunks.length) {
+      import_coc11.window.showErrorMessage(`Staged chunk not found`);
+      return;
+    }
+    let chunk = chunks.find((o) => o.add.lnum <= line && o.add.lnum + o.add.count >= line);
+    if (!chunk) {
+      import_coc11.window.showErrorMessage(`Unable to find staged chunk on current line`);
+      return;
+    }
+    this.channel.appendLine(`[Info] resolved chunk ${JSON.stringify(chunk, null, 2)}`);
+    let patch = createUnstagePatch(this.relpath, chunk);
+    if (!patch)
+      return;
+    try {
+      await this.git.exec(this.repo.root, ["apply", "--cached", "--unidiff-zero", "-"], {input: patch});
+      this.refresh();
+    } catch (e) {
+      import_coc11.window.showErrorMessage(`Unable to apply patch: ${e.message}`);
+      this.channel.appendLine(`[Error] ${e.message}`);
+    }
+  }
   async nextChunk() {
     const {diffs} = this;
     let {nvim} = import_coc11.workspace;
@@ -6642,6 +6762,24 @@ var GitBuffer = class {
       }
     }
   }
+  async showBlameDoc(lnum) {
+    let indexed = await this.repo.isIndexed(this.relpath);
+    if (!indexed) {
+      import_coc11.window.showMessage("File not indexed");
+    } else {
+      let infos = await this.getBlameInfo();
+      let info = infos.find((o) => lnum >= o.startLnum && lnum <= o.endLnum);
+      if (info && info.author && info.author != "Not Committed Yet") {
+        let blameText = [];
+        blameText.push(`${info.author}, ${info.time}`);
+        blameText.push(`${info.summary}`);
+        blameText.push(`${info.sha.substring(0, 7)}`);
+        await this.showDoc(blameText.join("\n\n"), "text");
+      } else {
+        import_coc11.window.showMessage("Not committed yet");
+      }
+    }
+  }
   async diffDocument(force = false) {
     var _a;
     let {nvim} = import_coc11.workspace;
@@ -6869,10 +7007,9 @@ var GitBuffer = class {
     }
     import_coc11.window.showMessage("Not positioned on a conflict");
   }
-  async browser(action = "open", range) {
+  async browser(action = "open", range, permalink = false) {
     let {nvim} = import_coc11.workspace;
     let config = import_coc11.workspace.getConfiguration("git");
-    let mode = config.get("urlMode", "normal").trim();
     let head = (await this.repo.safeRun(["rev-parse", "HEAD"])).trim();
     let branch = config.get("browserBranchName", "").trim();
     if (!branch.length) {
@@ -6914,16 +7051,16 @@ var GitBuffer = class {
       let hostname = tmp.hostname;
       let fix = "|";
       try {
-        fix = config.get("urlFix")[hostname][mode == "permalink" ? 1 : 0];
+        fix = config.get("urlFix")[hostname][permalink ? 1 : 0];
       } catch (e) {
       }
-      let url = getUrl(fix, repoURL, mode == "permalink" ? head : branch, this.relpath.replace(/\\\\/g, "/"), lines);
+      let url = getUrl(fix, repoURL, permalink ? head : branch, this.relpath.replace(/\\\\/g, "/"), lines);
       if (url)
         urls.push(url);
     }
     if (urls.length == 1) {
       if (action == "open") {
-        nvim.call("coc#util#open_url", [urls[0]], true);
+        await import_coc11.workspace.openResource(urls[0]);
       } else {
         nvim.command(`let @+ = '${urls[0]}'`, true);
         import_coc11.window.showMessage("Copied url to clipboard");
@@ -6932,7 +7069,7 @@ var GitBuffer = class {
       let idx = await import_coc11.window.showQuickpick(urls, "Select url:");
       if (idx >= 0) {
         if (action == "open") {
-          nvim.call("coc#util#open_url", [urls[idx]], true);
+          await import_coc11.workspace.openResource(urls[idx]);
         } else {
           nvim.command(`let @+ = '${urls[idx]}'`, true);
           import_coc11.window.showMessage("Copied url to clipboard");
@@ -7619,6 +7756,9 @@ async function activate(context) {
   subscriptions.push(import_coc14.workspace.registerKeymap(["n"], "git-commit", async () => {
     await manager.showCommit();
   }, {sync: false}));
+  subscriptions.push(import_coc14.workspace.registerKeymap(["n"], "git-showblamedoc", async () => {
+    await manager.showBlameDoc();
+  }, {sync: false}));
   subscriptions.push(import_coc14.commands.registerCommand("git.keepCurrent", async () => {
     await manager.keepCurrent();
   }));
@@ -7634,6 +7774,9 @@ async function activate(context) {
   subscriptions.push(import_coc14.commands.registerCommand("git.chunkStage", async () => {
     await manager.chunkStage();
   }));
+  subscriptions.push(import_coc14.commands.registerCommand("git.chunkUnstage", async () => {
+    await manager.chunkUnstage();
+  }));
   subscriptions.push(import_coc14.commands.registerCommand("git.chunkUndo", async () => {
     await manager.chunkUndo();
   }));
@@ -7646,6 +7789,9 @@ async function activate(context) {
   subscriptions.push(import_coc14.commands.registerCommand("git.copyUrl", async (...args) => {
     await manager.browser("copy", args);
   }));
+  subscriptions.push(import_coc14.commands.registerCommand("git.copyPermalink", async (...args) => {
+    await manager.browser("copy", args, true);
+  }));
   subscriptions.push(import_coc14.commands.registerCommand("git.push", async (...args) => {
     await manager.push(args);
   }));
@@ -7658,6 +7804,9 @@ async function activate(context) {
   subscriptions.push(import_coc14.commands.registerCommand("git.foldUnchanged", async () => {
     await manager.toggleFold();
   }));
+  subscriptions.push(import_coc14.commands.registerCommand("git.showBlameDoc", async () => {
+    await manager.showBlameDoc();
+  }));
   subscriptions.push(import_coc14.listManager.registerList(new gstatus_default(nvim, manager)));
   subscriptions.push(import_coc14.listManager.registerList(new branches_default(nvim, manager)));
   subscriptions.push(import_coc14.listManager.registerList(new commits_default(nvim, manager)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -35,6 +35,10 @@
         "title": "Stage current chunk.",
         "command": "git.chunkStage"
       },
+      {
+        "title": "Unstage chunk that contains current line",
+        "command": "git.chunkUnstage"
+      },
       {
         "title": "Undo current chunk.",
         "command": "git.chunkUndo"
@@ -51,6 +55,10 @@
         "title": "Copy url of current line to clipboard, github url supported.",
         "command": "git.copyUrl"
       },
+      {
+        "title": "Copy permalink of current line to clipboard, github url supported.",
+        "command": "git.copyPermalink"
+      },
       {
         "title": "Show cached diff in preview window.",
         "command": "git.diffCached"
@@ -66,6 +74,10 @@
       {
         "title": "Push code of current branch to remote",
         "command": "git.push"
+      },
+      {
+        "title": "Show git blame info in float or popup window",
+        "command": "git.showBlameDoc"
       }
     ],
     "configuration": {
@@ -91,14 +103,6 @@
           "default": "",
           "description": "Branch name for browserOpen and copyUrl."
         },
-        "git.urlMode": {
-          "type": "string",
-          "default": "normal",
-          "enum": [
-            "normal",
-            "permalink"
-          ]
-        },
         "git.urlFix": {
           "type": "object",
           "default": {},