lp:~mbp/bzr/687653-notbrancherror

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:bzr/2.2

bzr-core: Pending requested 2010-12-10

Diff: 259 lines (+44/-79)

4 files modified

NEWS (+7/-0)
bzrlib/branch.py (+19/-5)
bzrlib/errors.py (+16/-40)
bzrlib/tests/test_errors.py (+2/-34)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #687653: infinite recursion trying to format NotBranchError

Critical

Fix Released

Link a bug report

Related blueprints

5119. By Martin Pool on 2010-12-10

Import urlutils just once into errors.py

5118. By Martin Pool on 2010-12-10

Smooth off handling of details and bzrdir in NotBranchError and update tests

5117. By Martin Pool on 2010-12-10

Remove misleading unused variables

5116. By Martin Pool on 2010-12-10

Trim unused import

5115. By Martin Pool on 2010-12-10

Don't probe for a repository from within formatting of a `NotBranchError`,
because this can cause knock-on errors. Instead, in cases where it would be
useful to tell the users that a directory contains a repository but not a
branch, check for it when raising the error.

5114. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-02

(vila) Merge 2.1 into 2.2 including fix for bug #583667 (Vincent
 Ladeuil)

5113. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-01

(abentley) RT.is_executable returns False not None for dirs and
 symlinks.

5112. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-26

(vila) Open 2.2.3 for bug fixes (Vincent Ladeuil)

5111. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-25

(vila) Release 2.2.2. (Vincent Ladeuil)

5110. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-11

(vila) Close leaked socket to SSH subprocesses (Max Bowsher)