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

Proposed by Ian Clatworthy on 2009-11-23
Status: Work in progress
Proposed branch: lp:~ian-clatworthy/bzr-builder/fix-find-branches
Merge into: lp:~james-w/bzr-builder/trunk-old
Diff against target: 22 lines (+0/-8)
1 file modified
__init__.py (+0/-8)
To merge this branch: bzr merge lp:~ian-clatworthy/bzr-builder/fix-find-branches
Reviewer Review Type Date Requested Status
James Westby 2009-11-23 Resubmit on 2009-11-23
Review via email: mp+15137@code.launchpad.net
To post a comment you must log in.
Ian Clatworthy (ian-clatworthy) wrote :

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) wrote :

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) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2009-10-23 13:14:30 +0000
3+++ __init__.py 2009-11-23 01:45:21 +0000
4@@ -114,14 +114,6 @@
5 0.2 - added "run" instruction.
6 """
7
8-if __name__ == '__main__':
9- import os
10- import subprocess
11- import sys
12- dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "plugins")
13- retcode = subprocess.call("bzr selftest -s bzrlib.plugins.builder",
14- shell=True, env={"BZR_PLUGIN_PATH": dir})
15- sys.exit(retcode)
16
17 import datetime
18 from email import utils
19
20=== removed directory 'plugins'
21=== removed symlink 'plugins/builder'
22=== target was '..'

Subscribers

People subscribed via source and target branches