← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Marius Kruger
  • Date: 2008-10-03 23:42:56 UTC
  • mto: This revision was merged to the branch mainline in revision 3809.
  • Revision ID: amanic@gmail.com-20081003234256-jucpuwwgak728l3z
Jump through hoops not to open multiple connections when committing to a bound branch.

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):
 
151
    def _get_nick(self, possible_transports=None):
152
152
        config = self.get_config()
153
153
        if not config.has_explicit_nickname(): # explicit overrides master
154
 
            master = self.get_master_branch()
 
154
            master = self.get_master_branch(possible_transports)
155
155
            if master is not None:
156
156
                # return the master branch value
157
157
                config = master.get_config()