Merge stage and track into a single command in the browser context menu

Author: krassowski

src/commandsAndMenu.tsx

@@ -505,6 +505,21 @@ export function addCommands(
     icon: diffIcon
   });
 
+  commands.addCommand(ContextCommandIDs.gitFileAdd, {
+    label: 'Add',
+    caption: pluralizedContextLabel(
+      'Stage or track the changes to selected file',
+      'Stage or track the changes of selected files'
+    ),
+    execute: async args => {
+      const { files } = (args as any) as CommandArguments.IGitContextAction;
+      for (const file of files) {
+        await model.add(file.to);
+      }
+    },
+    icon: addIcon
+  });
+
   commands.addCommand(ContextCommandIDs.gitFileStage, {
     label: 'Stage',
     caption: pluralizedContextLabel(
@@ -869,6 +884,13 @@ export function addFileBrowserContextMenu(
               command !== ContextCommandIDs.gitFileDelete &&
               typeof command !== 'undefined'
           )
+          // replace stage and track with a single "add" operation
+          .map(command =>
+            command === ContextCommandIDs.gitFileStage ||
+            command === ContextCommandIDs.gitFileTrack
+              ? ContextCommandIDs.gitFileAdd
+              : command
+          )
       );
 
       // if looking at a tracked file with no changes,

src/tokens.ts

@@ -835,6 +835,7 @@ export interface ILogMessage {
  * The command IDs used in the git context menus.
  */
 export enum ContextCommandIDs {
+  gitFileAdd = 'git:context-add',
   gitFileDiff = 'git:context-diff',
   gitFileDiscard = 'git:context-discard',
   gitFileDelete = 'git:context-delete',