Merge pull request onlywei#32 from JakeGinnivan/NoFastForwardMerge

No fast forward merge
jxlxj · Mar 30, 2015 · 16931b5 · 16931b5
2 parents 5320480 + 1594d9f
commit 16931b5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/js/controlbox.js b/js/controlbox.js
@@ -181,7 +181,7 @@ define(['d3'], function () {
                     this.historyView.deleteBranch(name);
                     break;
                 default:
-                    if (arg.charAt(0) == '-') {
+                    if (arg.charAt(0) === '-') {
                         this.error();
                     } else {
                         var remainingArgs = [arg].concat(args);
@@ -279,8 +279,18 @@ define(['d3'], function () {
         },
 
         merge: function (args) {
+            var noFF = false;
+            if (args.length === 2)
+            {
+                var mergeSwitch = args.pop();
+                if (mergeSwitch === '--no-ff') {
+                    noFF = true;
+                } else {
+                    this.info('This demo only supports the --no-ff switch..');
+                }
+            }
             var ref = args.shift(),
-                result = this.historyView.merge(ref);
+                result = this.historyView.merge(ref, noFF);
 
             if (result === 'Fast-Forward') {
                 this.info('You have performed a fast-forward merge.');

diff --git a/js/historyview.js b/js/historyview.js
@@ -93,6 +93,13 @@ define(['d3'], function () {
 
         branchIndex = branches.indexOf(commit.id);
 
+        if (commit.isNoFFBranch === true) {
+            branchIndex++;
+        }
+        if (commit.isNoFFCommit === true) {
+            branchIndex--;
+        }
+
         if (parentCY === baseLine) {
             var direction = 1;
             for (var bi = 0; bi < branchIndex; bi++) {
@@ -939,7 +946,7 @@ define(['d3'], function () {
             }
         },
 
-        merge: function (ref) {
+        merge: function (ref, noFF) {
             var mergeTarget = this.getCommit(ref),
                 currentCommit = this.getCommit('HEAD');
 
@@ -951,6 +958,15 @@ define(['d3'], function () {
                 throw new Error('Already up-to-date.');
             } else if (currentCommit.parent2 === mergeTarget.id) {
                 throw new Error('Already up-to-date.');
+            } else if (noFF === true) {
+                var branchStartCommit = this.getCommit(mergeTarget.parent);
+                while (branchStartCommit.parent !== currentCommit.id) {
+                    branchStartCommit = this.getCommit(branchStartCommit.parent);
+                }
+
+                branchStartCommit.isNoFFBranch = true;
+
+                this.commit({parent2: mergeTarget.id, isNoFFCommit: true});
             } else if (this.isAncestor(currentCommit, mergeTarget)) {
                 this.fastForward(mergeTarget);
                 return 'Fast-Forward';