Merge lp:~ian-clatworthy/bzr-builder/fix-find-branches into lp:~james-w/bzr-builder/trunk-old

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

This patch deletes the recursive symlink under plugins/builder. It causes pain and isn't needed. See the commit message for details.

[James Westby (james-w)]

Hi,

I have no problem with the symlink going away. However, I use
the code in the __init__.py in a pre_commit hook to test the
changes, and I don't want to use that.

After several times of trying to get this right this is the best
current approach, but clearly isn't there yet. Some way in bzr
to tell it to load a plugin from a particular directory with a
known name would allow us to avoid all of this.

Thanks,

James

review: Resubmit

[Robert Collins (lifeless)]

James, it would be nice if you could change the review status to 'in development' or some such when giving a review like this, otherwise it stays in the 'to review' list.

Also, please consider assigning ~bzr as a reviewer for the branch so that the whole team can help you out.

Unmerged revisions

55. By Ian Clatworthy on 2009-11-23

Delete the recursive symlink as it breaks anything relying on repo.find_branches(). For example, "bzr multi-pull" in my plugins directory goes into an endless loop because of this. Also, you can get easy testing via something like "bzr selftest bp.builder" IIUIC.

=== modified file '__init__.py'
--- __init__.py	2009-10-23 13:14:30 +0000
+++ __init__.py	2009-11-23 01:45:21 +0000
@@ -114,14 +114,6 @@
   0.2 - added "run" instruction.
 """
 
-if __name__ == '__main__':
-    import os
-    import subprocess
-    import sys
-    dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "plugins")
-    retcode = subprocess.call("bzr selftest -s bzrlib.plugins.builder",
-            shell=True, env={"BZR_PLUGIN_PATH": dir})
-    sys.exit(retcode)
 
 import datetime
 from email import utils

=== removed directory 'plugins'
=== removed symlink 'plugins/builder'
=== target was '..'