Merge lp:~amanica/bzr-externals/ecmd_revert_infinite_recursion into lp:bzr-externals

[Marius Kruger]

when doing bzr ecmd revert it goes into an infinite recursion.
Also I've been using ligthweight checkouts and I think half of this patch makes that work.

This is not threadsafe but it works, and I have been using it for a long time.
It may be possible to do this in a better way, but the way we recurse makes it difficult.

[Eugene Tarasenko (etarasenko)]

I can't reproduce this bug, please write steps for repeat and what version bzr, bzr-externals your use?

=== modified file 'commands.py'
--- commands.py	2010-07-13 06:12:49 +0000
+++ commands.py	2011-07-12 23:21:06 +0000
@@ -128,6 +128,7 @@
         finally:
             f.close()
 
+ran_for = [] # not thread safe!!
 class cmd_externals_command(Command):
     """Run some command(s) for this and external branches.
 
@@ -159,9 +160,12 @@
         global _main_base
         if _main_base is None:
             _main_base = branch.base
-            
+
+        root = None
+        if tree is not None:
+            root=tree.basedir
         ex = externals.Externals(branch, branch.last_revision(),
-            root=tree.basedir)
+            root=root)
         if ex.read_config():
             # run ecmd command in each externals for multilevel
             ecmd = ['ecmd']
@@ -172,6 +176,9 @@
             ex.adjust_verbosity(ecmd)
 
             for location, rel_path, revision in ex.branch_iterator(): #@UnusedVariable
+                if location in ran_for:
+                    continue # don't recurse infinitely on ecmd revert
+                ran_for.append(location)
                 os.chdir(os.path.join(ex.cwd, rel_path))
                 run_bzr_catch_user_errors(ecmd + ['--'] + command_list)