~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/branch.py

Committer: Canonical.com Patch Queue Manager
Date: 2010-07-14 11:26:06 UTC
mfrom: (5050.7.6 405192-get_nick-recursion-2.2)
mto: (5050.17.1 2.2) (5339.2.4 progress) (5246.2.31 merge-into-merger) (5340.4.5 bzrw) (5362.1.1 merge-2.2-into-trunk) (5370.1.1 2.3b1-dev) (4360.10.22 smooth-upgrades) (5280.2.2 lazy-commands) (5377.2.1 merge-2.2-into-devel) (5418.1.1 merge-2.2-into-devel) (5430.1.1 merge-2.2-into-devel) (5432.3.1 prepare-2.3b1) (5439.1.1 merge-2.2-into-devel) (5447.1.1 trunk) (5473.1.1 trunk) (5540.4.1 checkout-tags-propagation-603395-2.3) (4597.12.2 646961-fix) (5523.1.1 trunk) (5530.1.1 trunk) (5535.1.1 merge-2.2-into-devel) (5551.1.1 trunk) (5552.1.1 583667-lp-no-edge-2.3) (5554.1.3 trunk) (5573.1.1 merge_2.2_to_dev) (5579.1.1 693880-ssl-readline) (5609.6.1 2.3.0-dev) (6024.3.1 integration) (6012.1.1 trunk) (4797.94.3 2.2-feature-flags)
mto: This revision was merged to the branch mainline in revision 5365.
Revision ID: pqm@pqm.ubuntu.com-20100714112606-5np7a19rr1t1pzm4

(Parth) Prevert _get_nick from dying with infinite recursion error
(bug #405192)

added added

removed removed

246

if not local and not config.has_explicit_nickname():

247

try:

248

master = self.get_master_branch(possible_transports)

249

if master and self.user_url == master.user_url:

250

raise errors.RecursiveBind(self.user_url)

249

251

if master is not None:

250

252

# return the master branch value

251

253

return master.nick

254

except errors.RecursiveBind, e:

255

raise e

252

256

except errors.BzrError, e:

253

257

# Silently fall back to local implicit nick if the master is

254

258

# unavailable