Rev 4622: Fix imports in bzrlib/conflicts.py. in file:///home/vila/src/bzr/experimental/conflict-manager/

Vincent Ladeuil v.ladeuil+lp at free.fr
Fri Oct 16 14:25:37 BST 2009


At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4622
revision-id: v.ladeuil+lp at free.fr-20091016132537-c70i3b2uxyoth0hc
parent: v.ladeuil+lp at free.fr-20091016132213-otik44uv0nfpvr4z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Fri 2009-10-16 15:25:37 +0200
message:
  Fix imports in  bzrlib/conflicts.py.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-10-16 13:22:13 +0000
+++ b/bzrlib/conflicts.py	2009-10-16 13:25:37 +0000
@@ -32,6 +32,7 @@
     osutils,
     rio,
     trace,
+    workingtree,
     )
 """)
 from bzrlib.option import Option
@@ -62,8 +63,7 @@
         ]
 
     def run(self, text=False):
-        from bzrlib.workingtree import WorkingTree
-        wt = WorkingTree.open_containing(u'.')[0]
+        wt = workingtree.WorkingTree.open_containing(u'.')[0]
         for conflict in wt.conflicts():
             if text:
                 if conflict.typestring != 'text conflict':
@@ -94,12 +94,11 @@
             Option('interactive', help='Dialog-based resolution'),
             ]
     def run(self, file_list=None, all=False, interactive=False):
-        from bzrlib.workingtree import WorkingTree
         if all:
             if file_list:
                 raise errors.BzrCommandError("If --all is specified,"
                                              " no FILE may be provided")
-            tree = WorkingTree.open_containing('.')[0]
+            tree = workingtree.WorkingTree.open_containing('.')[0]
             resolve(tree)
         else:
             tree, file_list = builtins.tree_files(file_list)



More information about the bazaar-commits mailing list