← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1650
1650
    def run(self, dir=u'.'):
1651
1651
        tree = WorkingTree.open_containing(dir)[0]
1652
1652
        self.add_cleanup(tree.lock_read().unlock)
 
1653
        new_inv = tree.root_inventory
1653
1654
        old_tree = tree.basis_tree()
1654
1655
        self.add_cleanup(old_tree.lock_read().unlock)
 
1656
        old_inv = old_tree.root_inventory
1655
1657
        renames = []
1656
1658
        iterator = tree.iter_changes(old_tree, include_unchanged=True)
1657
1659
        for f, paths, c, v, p, n, k, e in iterator:
3872
3874
class cmd_nick(Command):
3873
3875
    __doc__ = """Print or set the branch nickname.
3874
3876
 
3875
 
    If unset, the colocated branch name is used for colocated branches, and
3876
 
    the branch directory name is used for other branches.  To print the
3877
 
    current nickname, execute with no argument.
 
3877
    If unset, the tree root directory name is used as the nickname.
 
3878
    To print the current nickname, execute with no argument.
3878
3879
 
3879
3880
    Bound branches use the nickname of its master branch unless it is set
3880
3881
    locally.