/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2018-01-08 16:45:05 UTC
  • mfrom: (6842.1.2 move-add-reference)
  • Revision ID: jelmer@jelmer.uk-20180108164505-yz76bj6rgje62o5c
Merge lp:~jelmer/brz/move-add-reference.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
5640
5640
            ]
5641
5641
 
5642
5642
    def run(self, tree, reference=False):
 
5643
        from breezy.mutabletree import BadReferenceTarget
5643
5644
        sub_tree = WorkingTree.open(tree)
5644
5645
        parent_dir = osutils.dirname(sub_tree.basedir)
5645
5646
        containing_tree = WorkingTree.open_containing(parent_dir)[0]
5652
5653
        if reference:
5653
5654
            try:
5654
5655
                containing_tree.add_reference(sub_tree)
5655
 
            except errors.BadReferenceTarget as e:
 
5656
            except BadReferenceTarget as e:
5656
5657
                # XXX: Would be better to just raise a nicely printable
5657
5658
                # exception from the real origin.  Also below.  mbp 20070306
5658
5659
                raise errors.BzrCommandError(