Rev 3245: Have info report on stacked branches. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

------------------------------------------------------------
revno: 3245
revision-id:robertc at robertcollins.net-20080227215612-a51clrry0172gbf8
parent: robertc at robertcollins.net-20080227215016-gn12tusha7cstpm3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: info.shallow
timestamp: Thu 2008-02-28 08:56:12 +1100
message:
  Have info report on stacked branches.
modified:
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
=== modified file 'bzrlib/info.py'
--- a/bzrlib/info.py	2008-01-06 20:04:22 +0000
+++ b/bzrlib/info.py	2008-02-27 21:56:12 +0000
@@ -143,6 +143,11 @@
     locs.add_url('push branch', branch.get_push_location())
     locs.add_url('parent branch', branch.get_parent())
     locs.add_url('submit branch', branch.get_submit_branch())
+    try:
+        locs.add_url('stacked on', branch.get_stacked_on())
+    except (errors.UnstackableBranchFormat, errors.UnstackableRepositoryFormat,
+        errors.NotStacked):
+        pass
     return locs
 
 

=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- a/bzrlib/tests/blackbox/test_info.py	2007-12-15 18:33:10 +0000
+++ b/bzrlib/tests/blackbox/test_info.py	2008-02-27 21:56:12 +0000
@@ -1444,3 +1444,23 @@
        ), out)
         self.assertEqual('', err)
         tree.unlock()
+
+    def test_info_shallow(self):
+        # We have a mainline
+        trunk_tree = self.make_branch_and_tree('mainline',
+            format='development1')
+        trunk_tree.commit('mainline')
+        # and make branch from it which is shallow
+        new_dir = trunk_tree.bzrdir.sprout('newbranch', shallow=True)
+        new_tree = new_dir.open_workingtree()
+        out, err = self.run_bzr('info newbranch')
+        self.assertEqual(
+"""Standalone tree (format: development1)
+Location:
+  branch root: newbranch
+
+Related branches:
+  parent branch: mainline
+     stacked on: mainline
+""", out)
+        self.assertEqual("", err)