[WIP] Tags for commit messages

components/staging/staging.html

@@ -47,6 +47,17 @@
           </button>
           <span class="commit-message-title-counter" data-bind="text: commitMessageTitleCount" />
         </div>
+        <div data-bind="foreach: commitMessageTags">
+          <button class="tag-button btn btn-link" data-bind="click: toggle">
+            <div class="checkmark" data-bind="css: { checked: selected }">
+              <span
+                class="glyphicon"
+                data-bind="css: { 'glyphicon-check': selected, 'glyphicon-unchecked': !selected() }"
+              ></span>
+            </div>
+            <span data-bind="text: text"></span>
+          </button>
+        </div>
         <div class="btn-group commit-grp" data-bind="visible: isStageValid">
           <button
             class="btn btn-primary btn-lg commit-btn"

components/staging/staging.js

@@ -118,6 +118,18 @@ class StagingViewModel extends ComponentRoot {
     this.stashIcon = octicons.pin.toSVG({ height: 15 });
     this.discardIcon = octicons.x.toSVG({ height: 18 });
     this.ignoreIcon = octicons.skip.toSVG({ height: 18 });
+    this.commitMessageTags = [];
+
+    ungit.config.commitMessageTags.forEach((elt) => {
+      let selected = ko.observable(false);
+      this.commitMessageTags.push({
+        text: elt,
+        selected,
+        toggle() {
+          selected(!selected());
+        },
+      });
+    });
   }
 
   updateNode(parentElement) {
@@ -265,6 +277,21 @@ class StagingViewModel extends ComponentRoot {
     }
     this.amend(false);
     this.emptyCommit(false);
+    this.commitMessageTags.forEach(function (elt) {
+      elt.selected(false);
+    });
+  }
+
+  buildCommitMessage() {
+    var commitMessage = this.commitMessageTitle();
+    if (this.commitMessageBody()) commitMessage += '\n\n' + this.commitMessageBody();
+
+    this.commitMessageTags.forEach(function (elt) {
+      if (elt.selected()) {
+        commitMessage = elt.text + ' ' + commitMessage;
+      }
+    });
+    return commitMessage;
   }
 
   commit() {
@@ -274,8 +301,8 @@ class StagingViewModel extends ComponentRoot {
         name: file.name(),
         patchLineList: file.editState() === 'patched' ? file.patchLineList() : null,
       }));
-    let commitMessage = this.commitMessageTitle();
-    if (this.commitMessageBody()) commitMessage += `\n\n${this.commitMessageBody()}`;
+
+    let commitMessage = this.buildCommitMessage();
 
     this.server
       .postPromise('/commit', {
@@ -299,8 +326,8 @@ class StagingViewModel extends ComponentRoot {
         name: file.name(),
         patchLineList: file.editState() === 'patched' ? file.patchLineList() : null,
       }));
-    let commitMessage = this.commitMessageTitle();
-    if (this.commitMessageBody()) commitMessage += `\n\n${this.commitMessageBody()}`;
+
+    let commitMessage = this.buildCommitMessage();
 
     this.server
       .postPromise('/commit', {

components/staging/staging.less

@@ -239,6 +239,15 @@
   }
 }
 
+.tag-button {
+  padding: 0;
+  &:active,
+  &:focus,
+  &:hover {
+    text-decoration: none;
+  }
+}
+
 .checkmark {
   color: #ffffff;
   display: inline-block;

source/config.js

@@ -170,6 +170,9 @@ const defaultConfig = {
 
   // when false, disable numstats durin status for performance.  see #1193
   isEnableNumStat: true,
+
+  // tags prepended to the commit message when selected (e.g. [SKIP CI])
+  commitMessageTags: [],
 };
 
 // Works for now but should be moved to bin/ungit
@@ -324,7 +327,12 @@ const argv = yargs
     'isEnableNumStat',
     'when false, disables numstats during git status for performance.  see #1193'
   )
-  .boolean('isEnableNumStat');
+  .boolean('isEnableNumStat')
+  .describe(
+    'commitMessageTags',
+    'tags prepended to the commit message when selected (e.g. [SKIP CI])'
+  )
+  .array('commitMessageTags');
 const argvConfig = argv.argv;
 
 // When ungit is started normally, $0 == ungit, and non-hyphenated options exists, show help and exit.