Fix broken prepare-pristine, update docs and TODO.

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

diff --git a/TODO b/TODO
index 6499d7ab33d912432b1ca7d2894a8bfcc93eef68..b2ce6b9fd12be0596ee2d0bd133576f2b9e944c6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,6 +2,9 @@ The Git Autoinstaller
 
 TODO NOW:
 
+- Add support for mypristine workflow
+- Make a nicer backtrace if not in a Git working copy directory
+- Fix chdir to old directory errors
 - Symlinked rerere to get awesomeness. Consider permissions
 - Wordpress needs to get rid of the siteurl hack, so that it actually
   has a fully-qualified URL http://foo.scripts.mit.edu/blah.  This will
@@ -14,6 +17,12 @@ TODO NOW:
   scripts and start executing there?
 - Write the code to make Wordpress figure out its URL from the database
 
+- Plugin architecture
+     http://peak.telecommunity.com/DevCenter/setuptools#dynamic-discovery-of-services-and-plugins
+     http://peak.telecommunity.com/DevCenter/PkgResources#entry-points
+     https://xvm.mit.edu:1111/trunk/packages/invirt-base/python/invirt/authz.py
+     https://xvm.mit.edu:1111/trunk/packages/xvm-authz-locker/setup.py
+
 - Remerges aren't reflected in the parent files, so `git diff` output is
   spurious.  Not sure how to fix this w/o tree hackery.
 - Sometimes users remove files. Well, if those files change, they automatically

diff --git a/doc/create.rst b/doc/create.rst
index ed2337ef78462a9172cf1fadc8b2b6885717601e..6dc2754cd678d17758fd82ba234ec8f2b4a0aba7 100644 (file)
--- a/doc/create.rst
+++ b/doc/create.rst
@@ -79,9 +79,9 @@ add is the :term:`pristine` branch, which contains verbatim the code from upstre
     folder we store this information in: :file:`/mit/scripts/sec-tools/store/versions`.
 
 For the purposes of demonstration, we'll use Wordpress 2.0.2; in reality you
-should use the latest version.  Try running the following command in
-:file:`$WIZARD/srv/wordpress`::
+should use the latest version.  Try running the following commands::
 
+    cd "$WIZARD/srv/wordpress"
     wizard prepare-pristine wordpress-2.0.2
 
 You should get an error complaining about :meth:`wizard.app.Application.download`

diff --git a/wizard/command/prepare_pristine.py b/wizard/command/prepare_pristine.py
index 689067607769fe71e02167ae5c5fe8f144cc467b..729ebb6586f72ce035dd394ce62d28d0f3896e06 100644 (file)
--- a/wizard/command/prepare_pristine.py
+++ b/wizard/command/prepare_pristine.py
@@ -65,11 +65,8 @@ def check_directory(options):
         if not options.force:
             if ref != "refs/heads/pristine" and os.path.exists(os.path.join(".git", ref)):
                 raise Exception("Not on pristine branch (override with --force)")
-            try:
-                shell.call("git", "status")
+            if shell.eval("git", "ls-files", "-m").strip() != "":
                 raise Exception("Working copy is dirty (override with --force)")
-            except shell.CallError:
-                pass
         for f in os.listdir(os.getcwd()):
             if f == ".git": continue
             try: