remote-bzr: make bzr branches configurable per-repo
Different repositories have different branches, some are are even branches themselves. Reported-by: Peter Niederlag <netservice@niekom.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a8c0b74718
commit
a11b0ac9e1
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user