Merge pull request #174 from incidentist/incidentist/issue117

#117: Annotate file and current line
mrcrowl · Jan 8, 2022 · 923f511 · 923f511
2 parents cffcd0a + 001f8d7
commit 923f511
Show file tree

Hide file tree

Showing 12 changed files with 696 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,8 @@
 
 -   Rebase support.
 
+-   Show annotation for current line
+
 # Feedback & Contributing
 
 -   Please report any bugs, suggestions or documentation requests via the [Github issues](https://github.com/mrcrowl/vscode-hg/issues) (_yes_, I see the irony).
@@ -135,6 +137,10 @@
     `"cli"` &mdash; spawn a new `hg` process per command (default).
     `"server"` &mdash; run a command server process &nbsp;_i.e. `hg serve --cmdserve`_
 
+`hg.annotationEnabled`
+
+-   Enables annotation decorations at end of lines
+
 # Acknowledgements
 
 [ajansveld](https://github.com/ajansveld), [hoffmael](https://github.com/hoffmael), [nioh-wiki](https://github.com/nioh-wiki), [joaomoreno](https://github.com/joaomoreno), [nsgundy](https://github.com/nsgundy)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -342,10 +342,19 @@
                 "command": "hg.unshelveContinue",
                 "title": "%command.unshelveContinue%",
                 "category": "Hg"
+            },
+            {
+                "command": "hg.toggleAnnotations",
+                "title": "%command.toggleAnnotations%",
+                "category": "Hg"
             }
         ],
         "menus": {
             "commandPalette": [
+                {
+                    "command": "hg.toggleAnnotations",
+                    "when": "config.hg.enabled && !hg.missing && hgOpenRepositoryCount != 0"
+                },
                 {
                     "command": "hg.clone",
                     "when": "config.hg.enabled && !hg.missing"
@@ -966,6 +975,11 @@
                         "%config.pushPullScope.default%"
                     ],
                     "default": "all"
+                },
+                "hg.lineAnnotationEnabled": {
+                    "type": "boolean",
+                    "description": "%config.lineAnnotationEnabled%",
+                    "default": false
                 }
             }
         },
@@ -991,6 +1005,7 @@
     },
     "dependencies": {
         "tmp": "0.2.1",
+        "vscode-diff": "^2.0.2",
         "vscode-nls": "^2.0.1"
     },
     "devDependencies": {

diff --git a/package.nls.json b/package.nls.json
@@ -1,4 +1,5 @@
 {
+    "command.annotate": "Annotate",
     "command.clone": "Clone",
     "command.init": "Initialize Repository (Hg)",
     "command.close": "Close Repository",
@@ -53,6 +54,7 @@
     "command.unshelveKeep": "Unshelve and Keep",
     "command.unshelveAbort": "Abort unshelve",
     "command.unshelveContinue": "Continue unshelve",
+    "command.toggleAnnotations": "Toggle annotations for this file",
     "config.enabled": "Whether Hg is enabled",
     "config.path": "Path to the 'hg' executable (only required if auto-detection fails)",
     "config.autoInOut": "Whether auto-incoming/outgoing counts are enabled",
@@ -77,5 +79,6 @@
     "config.pushPullScope.all": "All branches / bookmarks",
     "config.pushPullScope.current": "Only the current branch / bookmark",
     "config.pushPullScope.default": "Only the default branch / bookmarks on the default branch",
-    "config.useBookmarks": "Use bookmarks instead of branches"
+    "config.useBookmarks": "Use bookmarks instead of branches",
+    "config.lineAnnotationEnabled": "Show hg annotation at the end of the line"
 }