[Pkg-bazaar-commits] ./bzr/unstable r547: - bzr diff finds a branch from the first parameter,

[Martin Pool]

------------------------------------------------------------
revno: 547
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-05-20 12:16:01 +1000
message:
  - bzr diff finds a branch from the first parameter,
    if any are given
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-05-20 02:12:28 +0000
+++ b/bzrlib/commands.py	2005-05-20 02:16:01 +0000
@@ -493,8 +493,18 @@
 
     def run(self, revision=None, file_list=None):
         from bzrlib.diff import show_diff
+        from bzrlib import find_branch
+
+        if file_list:
+            b = find_branch(file_list[0], lock_mode='r')
+            file_list = [b.relpath(f) for f in file_list]
+            if file_list == ['']:
+                # just pointing to top-of-tree
+                file_list = None
+        else:
+            b = Branch('.', lock_mode='r')
     
-        show_diff(Branch('.', lock_mode='r'), revision, specific_files=file_list)
+        show_diff(b, revision, specific_files=file_list)