lp:~gagern/bzr/log_branch_from_revspec

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:bzr

John A Meinel: Needs Fixing on 2010-06-30

Diff: 34 lines (+14/-0)

2 files modified

bzrlib/builtins.py (+1/-0)
bzrlib/tests/blackbox/test_log.py (+13/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5320. By Martin von Gagern on 2010-06-28

Merge branch from bug 149270.

That branch has already been approved, and the blackbox tests from both
branches would conflict. Now they can both be merged into bzr.dev.

5319. By Martin von Gagern on 2010-06-25

Make the log command take its branch from the RevisionInfo.

This allows bzr log to operate with dwim revspecs that provide their own
branch although RevisionSpec_dwim doesn't override get_branch. Therefore
things like the "bzr log -r -1:some/branch" now start to work, as ensured by
the test case.

They will still fail if the current dir doesn't have an associated bzr
branch, though, as it will still attempt to open a branch for the current
directory to be passed to the dwim revspec. In those cases, specifying the
prefix as in "-r revno:-1:some/branch" would be a possible workaround.

5318. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-24

(lifeless) Make the interbranch test_no_get_parent_map_after_insert_stream
 test work for looms. (Robert Collins)

5317. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-23

(lifeless) Polish and adjust news for Martin's output_encoding branch.
 (Robert Collins)

5316. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-22

(gz) Skip test_wordpad on win32 when the win32api is not present. (Jason
 Spashett)

5315. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-22

(gz) Allow use of Python arguments preceding bzr script in Windows command
 lines (Jason Spashett)

5314. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-22

(lifeless) Make setup.py python 3.1 compatible. (Robert Collins)

5313. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-22

(lifeless) Cleanup add.py. (Robert Collins)

5312. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-21

(lifeless) Return self from the new context managers so that new objects
 used with with statements are usable. (Robert Collins)

5311. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-21

ObjectWithCleanup defines add_cleanup not addCleanup.