[MERGE] Stacked branches UI part 3 - info

[Jelmer Vernooij]

On Tue, Jun 10, 2008 at 05:31:09PM +1000, Ian Clatworthy wrote:
> Ian Clatworthy wrote:
> > Ian Clatworthy wrote:
> >> All good here bar a comment I tweaked in the tests.

> > Here's an updated version which uses "stacked" instead of
> > "shallow" in the API and UI.

> === modified file 'bzrlib/tests/blackbox/test_info.py'
> --- bzrlib/tests/blackbox/test_info.py	2007-12-15 18:33:10 +0000
> +++ bzrlib/tests/blackbox/test_info.py	2008-06-10 05:16:33 +0000
> @@ -1444,3 +1444,22 @@
>         ), out)
>          self.assertEqual('', err)
>          tree.unlock()
> +
> +    def test_info_stacked(self):
> +        # We have a mainline
> +        trunk_tree = self.make_branch_and_tree('mainline',
> +            format='development1')
> +        trunk_tree.commit('mainline')
> +        # and a branch from it which is stacked
> +        new_dir = trunk_tree.bzrdir.sprout('newbranch', stacked=True)
> +        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)

Any particular reason for not using self.check_output() here rather
than self.run_bzr() ?

Other than that, looks fine to me.

bb:tweak

Cheers,

Jelmer