~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Patch Queue Manager
Date: 2012-02-16 18:01:57 UTC
mfrom: (6437.32.2 name-nick)
mto: (6468.1.1 merge-2.5) (6437.54.1 2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6469.
Revision ID: pqm@pqm.ubuntu.com-20120216180157-yegt0ppjq6tvfu7w

(abentley) Use colocated branch names as nicknames. (Aaron Bentley)

added added

removed removed

3872

class cmd_nick(Command):

3873

__doc__ = """Print or set the branch nickname.

3874

3875

If unset, the tree root directory name is used as the nickname.

3876

To print the current nickname, execute with no argument.

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

3878

3879

Bound branches use the nickname of its master branch unless it is set

3879

3880

locally.