[PATCH 2/8] remote-bzr: make bzr branches configurable per-repo
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:58:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
Different repositories have different branches, some are are even branches themselves. Reported-by: Peter Niederlag <redacted> Signed-off-by: Felipe Contreras <redacted> --- contrib/remote-helpers/git-remote-bzr | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 08b0b61..a7d2ac9 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr@@ -13,8 +13,11 @@ # or # % git clone bzr::lp:myrepo # -# If you want to specify which branches you want track (per repo): -# git config remote-bzr.branches 'trunk, devel, test' +# If you want to specify which branches you want to track (per repo): +# % git config remote.origin.bzr-branches 'trunk, devel, test' +# +# Where 'origin' is the name of the repository you want to specify the +# branches. # import sys
@@ -852,9 +855,13 @@ def get_repo(url, alias): except bzrlib.errors.NoRepositoryPresent: pass - wanted = get_config('remote-bzr.branches').rstrip().split(', ') + wanted = get_config('remote.%s.bzr-branches' % alias).rstrip().split(', ') # stupid python wanted = [e for e in wanted if e] + if not wanted: + wanted = get_config('remote-bzr.branches').rstrip().split(', ') + # stupid python + wanted = [e for e in wanted if e] if not wanted: try:
--
1.8.4-fc