Added --dir option to `be diff'.

Now you can compare two repositories:
  be -d branchA diff -d branchB
or
  branchA$ be diff -d ../branchB
which is helpful for VCSs like bzr that lack cross-branch revid
visibility.  Git users can still use
  branchA$ be diff REVID
where REVID is a commit from any branch in the repo.

This new functionality acts like a BE counterpart to `bzr missing DIR'.

diff --git a/becommands/diff.py b/becommands/diff.py
index 64779348065cc8f8a44ec239d6476777082b9abc..8e6c0f85dd02c2307c122eab2dabda5ca12432c5 100644 (file)
--- a/becommands/diff.py
+++ b/becommands/diff.py
@@ -65,9 +65,19 @@ def execute(args, manipulate_encodings=True, restrict_file_access=False):
     if bd.vcs.versioned == False:
         print "This directory is not revision-controlled."
     else:
-        if revision == None: # get the most recent revision
-            revision = bd.vcs.revision_id(-1)
-        old_bd = bd.duplicate_bugdir(revision)
+        if options.dir == None:
+            if revision == None: # get the most recent revision
+                revision = bd.vcs.revision_id(-1)
+            old_bd = bd.duplicate_bugdir(revision)
+        else:
+            cwd = os.getcwd()
+            os.chdir(options.dir)
+            old_bd_current = bugdir.BugDir(from_disk=True, manipulate_encodings=False)
+            if revision == None: # use the current working state
+                old_bd = old_bd_current
+            else:
+                old_bd = old_bd_current.duplicate_bugdir(revision)
+            os.chdir(cwd)
         d = diff.Diff(old_bd, bd)
         tree = d.report_tree()
 
@@ -87,6 +97,8 @@ def execute(args, manipulate_encodings=True, restrict_file_access=False):
             if rep != None:
                 print rep
         bd.remove_duplicate_bugdir()
+        if options.dir != None and revision != None:
+            old_bd_current.remove_duplicate_bugdir()
 
 def get_parser():
     parser = cmdutil.CmdOptionParser("be diff [options] REVISION")
@@ -102,6 +114,8 @@ def get_parser():
         help = s[2]
         parser.add_option(short, long, action="store_true",
                           default=False, dest=attr, help=help)
+    parser.add_option("-d", "--dir", dest="dir", metavar="DIR",
+                      help="Compare with repository in DIR instead of the current directory.")
     return parser
 
 longhelp="""