← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Aaron Bentley
  • Date: 2012-02-15 22:43:50 UTC
  • mto: (6437.23.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6469.
  • Revision ID: aaron@aaronbentley.com-20120215224350-d1rpvmhti0wgk0aj
Use colocated branch names as nicknames.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
1482
1482
        value = self._get_explicit_nickname()
1483
1483
        if value is not None:
1484
1484
            return value
 
1485
        if self.branch.name:
 
1486
            return self.branch.name
1485
1487
        return urlutils.unescape(self.branch.base.split('/')[-2])
1486
1488
 
1487
1489
    def has_explicit_nickname(self):