coc-git 2.4.10 → 2.4.11

package/lib/index.js

@@ -5249,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);
@@ -5273,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";
@@ -5369,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,
@@ -5501,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");
       }
@@ -5879,6 +5879,12 @@ var DocumentManager = class {
     if (buf)
       await buf.showCommit();
   }
+  async showBlameDoc() {
+    let buf = await this.buffer;
+    let line = await this.nvim.call("line", ".");
+    if (buf)
+      await buf.showBlameDoc(line);
+  }
   async browser(action = "open", range, permalink = false) {
     let buf = await this.buffer;
     if (buf)
@@ -5959,7 +5965,7 @@ var Repo = class {
     this.root = root;
   }
   async getStagedChunks(relpath) {
-    let args = ["--no-pager", "diff", "-p", "-U0", "--no-color", "--staged"];
+    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);
@@ -6108,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)
@@ -6756,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;
@@ -7732,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();
   }));
@@ -7777,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.10",
+  "version": "2.4.11",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -74,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": {