Merge pull request git-school#80 from git-school/ku-changes

Implement force-push, add scenario for rewritten history on remote

Author: kuychaco

js/controlbox.js

@@ -733,15 +733,20 @@ function(_yargs, d3, demos) {
       }.bind(this), 750);
     },
 
-    push: function(args) {
+    push: function(args, opts, cmdStr) {
+      var opt = yargs(cmdStr, {
+        alias: { force: ['f'] },
+        boolean: ['f']
+      })
+
       if (this.mode !== 'local') {
         throw new Error('can only push from local')
       }
       var control = this,
         local = this.historyView,
-        remoteName = args.shift() || 'origin',
+        remoteName = opt._[0] || 'origin',
         remote = this[remoteName + 'View'],
-        branchArgs = args.pop(),
+        branchArgs = opt._[1],
         localRef = local.currentBranch,
         remoteRef = local.currentBranch,
         localCommit, remoteCommit,
@@ -794,7 +799,7 @@ function(_yargs, d3, demos) {
 
       // push to an existing branch on the remote
       if (remoteCommit && remote.branches.indexOf(remoteRef) > -1) {
-        if (!local.isAncestorOf(remoteCommit.id, localCommit.id)) {
+        if (!local.isAncestorOf(remoteCommit.id, localCommit.id) && !opt.f) {
           throw new Error('Push rejected. Non fast-forward.');
         }
 
@@ -804,9 +809,21 @@ function(_yargs, d3, demos) {
           return this.info('Everything up-to-date.');
         }
 
-        findCommitsToPush(localCommit);
+        if (!opt.f) {
+          findCommitsToPush(localCommit);
+          remote.commitData = remote.commitData.concat(toPush);
+        } else {
+          var localData = JSON.parse(JSON.stringify(local.commitData))
+          localData.forEach(function(commit) {
+            var originTagIndex = commit.tags.indexOf('origin/' + localRef)
+            if (originTagIndex > -1) {
+              commit.tags.splice(originTagIndex, 1)
+            }
+          })
+          remote.commitData = localData
+          this.info('forced update')
+        }
 
-        remote.commitData = remote.commitData.concat(toPush);
         remote.moveTag(remoteRef, localCommit.id);
         local.moveTag('origin/' + localRef, localRef)
         remote.renderCommits();

js/demos.js

@@ -69,6 +69,112 @@ define([], function () {
     ]
   }
 
+  var rewrittenHistory = {
+    title: 'Rewritten Remote History',
+    key: 'rewritten-history',
+    message: 'Someone force-pushed and re-wrote history on the remote!',
+    currentBranch: "feature",
+    commitData: [
+      {
+        "id": "e137e9b",
+        "tags": [],
+        "message": "first commit",
+        "parent": "initial",
+        "cx": 50,
+        "cy": 330,
+        "branchless": false
+      },
+      {
+        "id": "84c98fe",
+        "parent": "e137e9b",
+        "tags": [
+          "master",
+          "origin/master"
+        ],
+        "cx": 140,
+        "cy": 330,
+        "branchless": false
+      },
+      {
+        "id": "1c016b6",
+        "parent": "e137e9b",
+        "tags": [],
+        "cx": 140,
+        "cy": 240,
+        "branchless": false
+      },
+      {
+        "id": "fd0af32",
+        "parent": "1c016b6",
+        "tags": [],
+        "cx": 230,
+        "cy": 240,
+        "branchless": false
+      },
+      {
+        "id": "5041e4c",
+        "tags": [
+          "feature",
+          "origin/feature",
+          "HEAD"
+        ],
+        "parent": "fd0af32",
+        "cx": 320,
+        "cy": 240,
+        "branchless": false
+      }
+    ],
+    originData: [
+      {
+        "id": "e137e9b",
+        "tags": [],
+        "message": "first commit",
+        "parent": "initial",
+        "cx": 50,
+        "cy": 360,
+        "branchless": false
+      },
+      {
+        "id": "84c98fe",
+        "parent": "e137e9b",
+        "tags": [
+          "master"
+        ],
+        "cx": 140,
+        "cy": 360,
+        "branchless": false
+      },
+      {
+        "id": "1c016b6",
+        "parent": "e137e9b",
+        "tags": [],
+        "cx": 140,
+        "cy": 270,
+        "branchless": false
+      },
+      {
+        "id": "fd0af32",
+        "tags": [
+          "feature",
+          "HEAD"
+        ],
+        "parent": "1c016b6",
+        "cx": 230,
+        "cy": 270,
+        "branchless": false
+      },
+      {
+        "id": "5041e4c",
+        "tags": [],
+        "parent": "fd0af32",
+        "cx": 320,
+        "cy": 270,
+        "branchless": true
+      }
+    ]
+
+  }
+
   var cherryPick = {
     title: 'Cherry Picking',
     key: 'cherry',
@@ -145,6 +251,6 @@ define([], function () {
   }
 
   return [
-    free, freeWithRemote, upstreamChanges, cherryPick
+    free, freeWithRemote, upstreamChanges, rewrittenHistory, cherryPick
   ]
 })

js/explaingit.js

@@ -26,7 +26,7 @@ define(['historyview', 'controlbox', 'd3'], function(HistoryView, ControlBox, d3
         name: name + '-Origin',
         width: 300,
         height: 400,
-        commitRadius: 15,
+        commitRadius: args.commitRadius,
         remoteName: 'origin',
         commitData: args.originData,
         savedState: args.ovSavedState