Enable rerere and add plan, add missing docs.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/TODO b/TODO
index 939bb38c64e6d9fdd7e46de0cf9f8d10e9232a94..830738202b3ec98bdfd9d6e37209b0197be8817d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,6 +2,20 @@ The Git Autoinstaller
 
 TODO NOW:
 
+- Symlinked rerere to get awesomeness. Problems:
+    - Permissions
+    - Might not make a huge difference; how does it handle empty file
+      and removed file cases?
+    - Need to manually run git rerere subsequently to reap benefits
+    - Majority of resolutions have to happen pre-merge (see below)
+- Create 'wizard merge' command
+    - Uses application specific hinting to prematurely resolve
+      conflicts.
+    - Newline resolution gets done prior-merge (presently is done
+      post merge).
+    - Classes of disappeared files made ok.
+    - Make this general utility(?)
+
 - Wizard needs a correct arch/ setup
 - The wizard command, when not on scripts, should automatically SSH to
   scripts and start executing there?

diff --git a/bin/wizard b/bin/wizard
index 55730a73c22709d5695ea4514de042f8b958c1f1..acdf9df4e7a1e3999e93d31c4a10f18069f4fec0 100755 (executable)
--- a/bin/wizard
+++ b/bin/wizard
@@ -23,6 +23,7 @@ User commands:
     backup          Backup data not on filesystem (database, etc)
     install         Installs an application
     migrate         Migrate autoinstalls from old format to Git-based format
+    remove          Removes an autoinstall, databases and other files
     restore         Restores files and database to previous version
     upgrade         Upgrades an autoinstall to the latest version
 

diff --git a/wizard/command/upgrade.py b/wizard/command/upgrade.py
index 475ddd700660abb72773219d5fb3fe82f642ef18..0672700771397b8e2cf89c52fd62be6922a32a19 100644 (file)
--- a/wizard/command/upgrade.py
+++ b/wizard/command/upgrade.py
@@ -268,6 +268,7 @@ class Upgrade(object):
         except shell.CallError as e:
             pass
         shell.call("git", "config", "merge.conflictstyle", "diff3")
+        shell.call("git", "config", "rerere.enabled", "true")
         try:
             shell.call("git", "merge", next_virtual_commit)
         except shell.CallError as e: