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

[Aaron Bentley]

Show uncommitted changes in branches.

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.

[Richard Wilbur (richard-wilbur)]

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

review: Approve

[John A Meinel (jameinel)]

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.

=== modified file 'bzrlib/branch.py'
--- bzrlib/branch.py	2012-07-19 18:28:25 +0000
+++ bzrlib/branch.py	2013-05-08 04:37:28 +0000
@@ -261,6 +261,9 @@
         """
         raise NotImplementedError(self.store_uncommitted)
 
+    def has_uncommitted(self):
+        return False
+
     def get_unshelver(self, tree):
         """Return a shelf.Unshelver for this branch and tree.
 
@@ -2412,6 +2415,10 @@
         else:
             return self
 
+    @staticmethod
+    def _has_uncommitted(branch):
+        return branch._transport.has('stored-transform')
+
     def store_uncommitted(self, creator):
         """Store uncommitted changes from a ShelfCreator.
 
@@ -2423,13 +2430,17 @@
         if creator is None:
             branch._transport.delete('stored-transform')
             return
-        if branch._transport.has('stored-transform'):
+        if self._has_uncommitted(branch):
             raise errors.ChangesAlreadyStored
         transform = StringIO()
         creator.write_shelf(transform)
         transform.seek(0)
         branch._transport.put_file('stored-transform', transform)
 
+    def has_uncommitted(self):
+        branch = self._uncommitted_branch()
+        return self._has_uncommitted(branch)
+
     def get_unshelver(self, tree):
         """Return a shelf.Unshelver for this branch and tree.
 
 
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2012-09-27 17:41:19 +0000
+++ bzrlib/builtins.py	2013-05-08 04:37:28 +0000
@@ -1578,17 +1578,20 @@
                     continue
                 active = (active_branch is not None and
                           active_branch.base == branch.base)
-                names[name] = active
+                names[name] = active, branch.has_uncommitted()
+            branch_list = sorted(names.items())
             # Only mention the current branch explicitly if it's not
             # one of the colocated branches
             if not any(names.values()) and active_branch is not None:
-                self.outf.write("* %s\n" % gettext("(default)"))
-            for name in sorted(names.keys()):
-                active = names[name]
+                branch_list.insert(0,
+                    (gettext("(default)"),
+                        (True, active_branch.has_uncommitted())))
+            for name, (active, uncommitted) in branch_list:
                 if active:
                     prefix = "*"
                 else:
                     prefix = " "
+                prefix += 'U' if uncommitted else ' '
                 self.outf.write("%s %s\n" % (
                     prefix, name.encode(self.outf.encoding)))
 
 
=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2012-09-19 07:58:27 +0000
+++ bzrlib/remote.py	2013-05-08 04:37:28 +0000
@@ -3403,6 +3403,10 @@
         self._ensure_real()
         return self._real_branch.store_uncommitted(creator)
 
+    def has_uncommitted(self):
+        self._ensure_real()
+        return self._real_branch.has_uncommitted()
+
     def get_unshelver(self, tree):
         self._ensure_real()
         return self._real_branch.get_unshelver(tree)
 
=== modified file 'bzrlib/tests/blackbox/test_branches.py'
--- bzrlib/tests/blackbox/test_branches.py	2012-02-13 17:34:46 +0000
+++ bzrlib/tests/blackbox/test_branches.py	2013-05-08 04:37:28 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Canonical Ltd
+# Copyright (C) 2011-2013 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 from bzrlib.bzrdir import BzrDir
 from bzrlib.tests import TestCaseWithTransport
+from bzrlib.tests.per_branch.test_branch import FakeShelfCreator
 
 
 class TestBranches(TestCaseWithTransport):
@@ -28,7 +29,7 @@
         # support.
         self.run_bzr('init a')
         out, err = self.run_bzr('branches a')
-        self.assertEquals(out, "* (default)\n")
+        self.assertEquals(out, "*  (default)\n")
 
     def test_no_branch(self):
         # Listing the branches in a control directory without branches.
@@ -65,9 +66,9 @@
         t.bzrdir.create_branch(name='another')
         t.bzrdir.create_branch(name='colocated')
         out, err = self.run_bzr('branches a')
-        self.assertEquals(out, "* (default)\n"
-                               "  another\n"
-                               "  colocated\n")
+        self.assertEquals(out, "*  (default)\n"
+                               "   another\n"
+                               "   colocated\n")
 
     def test_indicates_branch(self):
         t = self.make_repository('a', format='development-colo')
@@ -75,8 +76,18 @@
         branch = t.bzrdir.create_branch(name='colocated')
         t.bzrdir.set_branch_reference(target_branch=branch)
         out, err = self.run_bzr('branches a')
-        self.assertEquals(out, "  another\n"
-                               "* colocated\n")
+        self.assertEquals(out, "   another\n"
+                               "*  colocated\n")
+
+    def test_indicates_uncommitted(self):
+        t = self.make_repository('a', format='development-colo')
+        t.bzrdir.create_branch(name='another')
+        branch = t.bzrdir.create_branch(name='colocated')
+        branch.store_uncommitted(FakeShelfCreator(branch))
+        t.bzrdir.set_branch_reference(target_branch=branch)
+        out, err = self.run_bzr('branches a')
+        self.assertEquals(out, "   another\n"
+                               "*U colocated\n")
 
     def test_shared_repos(self):
         self.make_repository('a', shared=True)
@@ -84,10 +95,26 @@
         b = BzrDir.create_branch_convenience('a/branch2')
         b.create_checkout(lightweight=True, to_location='b')
         out, err = self.run_bzr('branches b')
-        self.assertEquals(out, "  branch1\n"
-                               "* branch2\n")
+        self.assertEquals(out, "   branch1\n"
+                               "*  branch2\n")
+
+    def test_shared_repos_uncommitted(self):
+        self.make_repository('a', shared=True)
+        BzrDir.create_branch_convenience('a/branch1')
+        b = BzrDir.create_branch_convenience('a/branch2')
+        b.create_checkout(lightweight=True, to_location='b')
+        b.store_uncommitted(FakeShelfCreator(b))
+        out, err = self.run_bzr('branches b')
+        self.assertEquals(out, "   branch1\n"
+                               "*U branch2\n")
 
     def test_standalone_branch(self):
         self.make_branch('a')
         out, err = self.run_bzr('branches a')
-        self.assertEquals(out, "* (default)\n")
+        self.assertEquals(out, "*  (default)\n")
+
+    def test_standalone_branch_uncommitted(self):
+        b = self.make_branch('a')
+        b.store_uncommitted(FakeShelfCreator(b))
+        out, err = self.run_bzr('branches a')
+        self.assertEquals(out, "*U (default)\n")
 
=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- bzrlib/tests/per_branch/test_branch.py	2012-07-19 19:27:22 +0000
+++ bzrlib/tests/per_branch/test_branch.py	2013-05-08 04:37:28 +0000
@@ -1125,6 +1125,15 @@
         branch.store_uncommitted(None)
         self.assertIs(None, branch.get_unshelver(None))
 
+    def test_has_uncommitted(self):
+        branch = self.make_branch('b')
+        self.assertFalse(branch.has_uncommitted())
+        with skip_if_storing_uncommitted_unsupported():
+            branch.store_uncommitted(FakeShelfCreator(branch))
+        self.assertTrue(branch.has_uncommitted())
+        branch.store_uncommitted(None)
+        self.assertFalse(branch.has_uncommitted())
+
     def test_get_unshelver(self):
         tree = self.make_branch_and_tree('tree')
         tree.commit('')