/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 bzrlib/branch.py

  • Committer: Andrew Bennetts
  • Date: 2008-11-27 09:00:45 UTC
  • mfrom: (3865 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3866.
  • Revision ID: andrew.bennetts@canonical.com-20081127090045-qxatg46jzwrbh2lg
Merge bzr.dev, resolving NEWS conflict.  (And improve the wording of the new NEWS entry too.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
148
148
    def get_config(self):
149
149
        return BranchConfig(self)
150
150
 
151
 
    def _get_nick(self, possible_transports=None):
 
151
    def _get_nick(self, local=False, possible_transports=None):
152
152
        config = self.get_config()
153
 
        if not config.has_explicit_nickname(): # explicit overrides master
 
153
        # explicit overrides master, but don't look for master if local is True
 
154
        if not local and not config.has_explicit_nickname():
154
155
            try:
155
156
                master = self.get_master_branch(possible_transports)
156
157
                if master is not None: