Issue #128 Preserve Merges for rebase

build/bundle.js

@@ -9128,7 +9128,11 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation,
   });
 };
 
-GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
+GitEngine.prototype.filterRebaseCommits = function(
+  toRebaseRough,
+  stopSet,
+  options
+) {
   var changesAlreadyMade = {};
   _.each(stopSet, function(val, key) {
     changesAlreadyMade[this.scrapeBaseID(key)] = true;
@@ -9137,8 +9141,8 @@ GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
 
   // resolve the commits we will rebase
   return _.filter(toRebaseRough, function(commit) {
-    // no merge commits
+    // no merge commits, unless we preserve
-    if (commit.get('parents').length !== 1) {
+    if (commit.get('parents').length !== 1 && !options.preserveMerges) {
       return false;
     }
 
@@ -9159,6 +9163,15 @@ GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
   }, this);
 };
 
+GitEngine.prototype.getRebasePreserveMergesParents = function(oldCommit) {
+  var oldParents = oldCommit.get('parents');
+  return _.map(oldParents, function(parent) {
+    var oldID = parent.get('id');
+    var newID = this.getMostRecentBumpedID(oldID);
+    return this.refs[newID];
+  }, this);
+};
+
 GitEngine.prototype.rebaseFinish = function(
   toRebaseRough,
   stopSet,
@@ -9172,7 +9185,7 @@ GitEngine.prototype.rebaseFinish = function(
   var deferred = options.deferred || Q.defer();
   var chain = options.chain || deferred.promise;
 
-  var toRebase = this.filterRebaseCommits(toRebaseRough, stopSet);
+  var toRebase = this.filterRebaseCommits(toRebaseRough, stopSet, options);
   if (!toRebase.length) {
     throw new GitError({
       msg: intl.str('git-error-rebase-none')
@@ -9187,11 +9200,25 @@ GitEngine.prototype.rebaseFinish = function(
 
   // now pop all of these commits onto targetLocation
   var base = this.getCommitFromRef(targetSource);
+  var hasStartedChain = false;
   // each step makes a new commit
   var chainStep = _.bind(function(oldCommit) {
     var newId = this.rebaseAltID(oldCommit.get('id'));
-    var newCommit = this.makeCommit([base], newId);
+    var parents;
+    if (!options.preserveMerges || !hasStartedChain) {
+      // easy logic since we just have a straight line
+      parents = [base];
+    } else { // preserving merges
+      // we always define the parent for the first commit to plop,
+      // otherwise search for most recent parents
+      parents = (hasStartedChain) ?
+        this.getRebasePreserveMergesParents(oldCommit) :
+        [base];
+    }
+
+    var newCommit = this.makeCommit(parents, newId);
     base = newCommit;
+    hasStartedChain = true;
 
     return this.animationFactory.playCommitBirthPromiseAnimation(
       newCommit,
@@ -11216,7 +11243,9 @@ var commandConfig = {
     sc: /^gr($|\s)/,
     options: [
       '-i',
-      '--aboveAll'
+      '--aboveAll',
+      '-p',
+      '--preserve-merges'
     ],
     regex: /^git +rebase($|\s)/,
     execute: function(engine, command) {
@@ -11236,7 +11265,9 @@ var commandConfig = {
       }
 
       command.twoArgsImpliedHead(generalArgs);
-      engine.rebase(generalArgs[0], generalArgs[1]);
+      engine.rebase(generalArgs[0], generalArgs[1], {
+        preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']
+      });
     }
   },
 
@@ -26509,7 +26540,9 @@ var commandConfig = {
     sc: /^gr($|\s)/,
     options: [
       '-i',
-      '--aboveAll'
+      '--aboveAll',
+      '-p',
+      '--preserve-merges'
     ],
     regex: /^git +rebase($|\s)/,
     execute: function(engine, command) {
@@ -26529,7 +26562,9 @@ var commandConfig = {
       }
 
       command.twoArgsImpliedHead(generalArgs);
-      engine.rebase(generalArgs[0], generalArgs[1]);
+      engine.rebase(generalArgs[0], generalArgs[1], {
+        preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']
+      });
     }
   },
 
@@ -28799,7 +28834,11 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation,
   });
 };
 
-GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
+GitEngine.prototype.filterRebaseCommits = function(
+  toRebaseRough,
+  stopSet,
+  options
+) {
   var changesAlreadyMade = {};
   _.each(stopSet, function(val, key) {
     changesAlreadyMade[this.scrapeBaseID(key)] = true;
@@ -28808,8 +28847,8 @@ GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
 
   // resolve the commits we will rebase
   return _.filter(toRebaseRough, function(commit) {
-    // no merge commits
+    // no merge commits, unless we preserve
-    if (commit.get('parents').length !== 1) {
+    if (commit.get('parents').length !== 1 && !options.preserveMerges) {
       return false;
     }
 
@@ -28830,6 +28869,15 @@ GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
   }, this);
 };
 
+GitEngine.prototype.getRebasePreserveMergesParents = function(oldCommit) {
+  var oldParents = oldCommit.get('parents');
+  return _.map(oldParents, function(parent) {
+    var oldID = parent.get('id');
+    var newID = this.getMostRecentBumpedID(oldID);
+    return this.refs[newID];
+  }, this);
+};
+
 GitEngine.prototype.rebaseFinish = function(
   toRebaseRough,
   stopSet,
@@ -28843,7 +28891,7 @@ GitEngine.prototype.rebaseFinish = function(
   var deferred = options.deferred || Q.defer();
   var chain = options.chain || deferred.promise;
 
-  var toRebase = this.filterRebaseCommits(toRebaseRough, stopSet);
+  var toRebase = this.filterRebaseCommits(toRebaseRough, stopSet, options);
   if (!toRebase.length) {
     throw new GitError({
       msg: intl.str('git-error-rebase-none')
@@ -28858,11 +28906,25 @@ GitEngine.prototype.rebaseFinish = function(
 
   // now pop all of these commits onto targetLocation
   var base = this.getCommitFromRef(targetSource);
+  var hasStartedChain = false;
   // each step makes a new commit
   var chainStep = _.bind(function(oldCommit) {
     var newId = this.rebaseAltID(oldCommit.get('id'));
-    var newCommit = this.makeCommit([base], newId);
+    var parents;
+    if (!options.preserveMerges || !hasStartedChain) {
+      // easy logic since we just have a straight line
+      parents = [base];
+    } else { // preserving merges
+      // we always define the parent for the first commit to plop,
+      // otherwise search for most recent parents
+      parents = (hasStartedChain) ?
+        this.getRebasePreserveMergesParents(oldCommit) :
+        [base];
+    }
+
+    var newCommit = this.makeCommit(parents, newId);
     base = newCommit;
+    hasStartedChain = true;
 
     return this.animationFactory.playCommitBirthPromiseAnimation(
       newCommit,

index.html

@@ -445,7 +445,7 @@
        For a much easier time perusing the source, see the individual files at:
           https://github.com/pcottle/learnGitBranching
   -->
-  <script src="build/bundle.min.5f0940b6.js"></script>
+  <script src="build/bundle.min.e106148f.js"></script>
 
   <!-- The advantage of github pages: super-easy, simple, slick static hostic.
        The downside? No raw logs to parse for analytics, so I have to include

src/js/git/commands.js

@@ -444,7 +444,9 @@ var commandConfig = {
     sc: /^gr($|\s)/,
     options: [
       '-i',
-      '--aboveAll'
+      '--aboveAll',
+      '-p',
+      '--preserve-merges'
     ],
     regex: /^git +rebase($|\s)/,
     execute: function(engine, command) {
@@ -464,7 +466,9 @@ var commandConfig = {
       }
 
       command.twoArgsImpliedHead(generalArgs);
-      engine.rebase(generalArgs[0], generalArgs[1]);
+      engine.rebase(generalArgs[0], generalArgs[1], {
+        preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']
+      });
     }
   },
 

src/js/git/index.js

@@ -1902,7 +1902,11 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation,
   });
 };
 
-GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
+GitEngine.prototype.filterRebaseCommits = function(
+  toRebaseRough,
+  stopSet,
+  options
+) {
   var changesAlreadyMade = {};
   _.each(stopSet, function(val, key) {
     changesAlreadyMade[this.scrapeBaseID(key)] = true;
@@ -1911,8 +1915,8 @@ GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
 
   // resolve the commits we will rebase
   return _.filter(toRebaseRough, function(commit) {
-    // no merge commits
+    // no merge commits, unless we preserve
-    if (commit.get('parents').length !== 1) {
+    if (commit.get('parents').length !== 1 && !options.preserveMerges) {
       return false;
     }
 
@@ -1933,6 +1937,15 @@ GitEngine.prototype.filterRebaseCommits = function(toRebaseRough, stopSet) {
   }, this);
 };
 
+GitEngine.prototype.getRebasePreserveMergesParents = function(oldCommit) {
+  var oldParents = oldCommit.get('parents');
+  return _.map(oldParents, function(parent) {
+    var oldID = parent.get('id');
+    var newID = this.getMostRecentBumpedID(oldID);
+    return this.refs[newID];
+  }, this);
+};
+
 GitEngine.prototype.rebaseFinish = function(
   toRebaseRough,
   stopSet,
@@ -1946,7 +1959,7 @@ GitEngine.prototype.rebaseFinish = function(
   var deferred = options.deferred || Q.defer();
   var chain = options.chain || deferred.promise;
 
-  var toRebase = this.filterRebaseCommits(toRebaseRough, stopSet);
+  var toRebase = this.filterRebaseCommits(toRebaseRough, stopSet, options);
   if (!toRebase.length) {
     throw new GitError({
       msg: intl.str('git-error-rebase-none')
@@ -1961,11 +1974,25 @@ GitEngine.prototype.rebaseFinish = function(
 
   // now pop all of these commits onto targetLocation
   var base = this.getCommitFromRef(targetSource);
+  var hasStartedChain = false;
   // each step makes a new commit
   var chainStep = _.bind(function(oldCommit) {
     var newId = this.rebaseAltID(oldCommit.get('id'));
-    var newCommit = this.makeCommit([base], newId);
+    var parents;
+    if (!options.preserveMerges || !hasStartedChain) {
+      // easy logic since we just have a straight line
+      parents = [base];
+    } else { // preserving merges
+      // we always define the parent for the first commit to plop,
+      // otherwise search for most recent parents
+      parents = (hasStartedChain) ?
+        this.getRebasePreserveMergesParents(oldCommit) :
+        [base];
+    }
+
+    var newCommit = this.makeCommit(parents, newId);
     base = newCommit;
+    hasStartedChain = true;
 
     return this.animationFactory.playCommitBirthPromiseAnimation(
       newCommit,