← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-18 17:24:52 UTC
  • mfrom: (6468.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120218172452-x7mk642v7mwxtyo1
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
1471
1471
        value = self._get_explicit_nickname()
1472
1472
        if value is not None:
1473
1473
            return value
 
1474
        if self.branch.name:
 
1475
            return self.branch.name
1474
1476
        return urlutils.unescape(self.branch.base.split('/')[-2])
1475
1477
 
1476
1478
    def has_explicit_nickname(self):