Bazaar

Merge lp://staging/~abentley/bzr/branches-uncommitted into lp://staging/bzr

branches-uncommitted
Merge into bzr.dev

Proposed by Aaron Bentley on 2013-05-08

Status:	Needs review
Proposed branch:	lp://staging/~abentley/bzr/branches-uncommitted
Merge into:	lp://staging/bzr
Diff against target:	198 lines (+69/-15) 5 files modified bzrlib/branch.py (+12/-1) bzrlib/builtins.py (+7/-4) bzrlib/remote.py (+4/-0) bzrlib/tests/blackbox/test_branches.py (+37/-10) bzrlib/tests/per_branch/test_branch.py (+9/-0)
To merge this branch:	bzr merge lp://staging/~abentley/bzr/branches-uncommitted
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
John A Meinel		Approve on 2013-05-09
Richard Wilbur	2013-05-08	Approve on 2013-05-08
Review via email: mp+162925@code.staging.launchpad.net

Commit message

Show uncommitted changes in branches.

Description of the change

This branch enables showing uncommitted changes for colocated branches, similar to the display in the 'pipeline' plugin. Uncommitted changes in branches are created with switch --store, and are a good reminder of which branches are works-in-progress.

Branch.has_uncommitted is implemented because the other way of determining uncommitted changes is convoluted: call get_unshelver, providing a tree, and see whether it returns None.

Revision history for this message

Richard Wilbur (richard-wilbur) wrote on 2013-05-08:

Looks like a very good thing to have. Thanks for implementing it the less convoluted way.
+1

review: Approve

Revision history for this message

John A Meinel (jameinel) wrote on 2013-05-09:

69 + prefix += 'U' if uncommitted else ' '

Given the line just before this is:

if active:
prefix =
else:
prefix =

I would probably follow suite here. (or change the other one to be consistent).

Otherwise seems good.

review: Approve

Unmerged revisions

6578. By Aaron Bentley on 2013-05-07: Add tests for branches command.
6577. By Aaron Bentley on 2013-05-05: Test has_uncommitted, add RemoteBranch implementation.
6576. By Aaron Bentley on 2013-05-05: Indent default branch the same as other branches.
6575. By Aaron Bentley on 2013-05-05: Fix failing tests.
6574. By Aaron Bentley on 2013-05-05: List uncommitted branches.