← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2007-05-04 10:01:17 UTC
  • mto: (2483.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2484.
  • Revision ID: mbp@sourcefrog.net-20070504100117-p3bksdrvjjnoz6qi
More cleanups of Branch.push to get the right behaviour with RemoteBranches

Pass in an _override_hook_source_branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
20
20
from cStringIO import StringIO
21
21
 
22
22
from bzrlib import branch, errors, lockdir, repository
23
 
from bzrlib.branch import BranchReferenceFormat
 
23
from bzrlib.branch import Branch, BranchReferenceFormat
24
24
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
25
25
from bzrlib.config import BranchConfig, TreeConfig
26
26
from bzrlib.decorators import needs_read_lock, needs_write_lock
1011
1011
        # with the wrong branch parameters -- mbp 20070405
1012
1012
        self._ensure_real()
1013
1013
        return self._real_branch.push(
1014
 
            target, overwrite=overwrite, stop_revision=stop_revision)
 
1014
            target, overwrite=overwrite, stop_revision=stop_revision,
 
1015
            _override_hook_source_branch=self)
1015
1016
 
1016
1017
    def is_locked(self):
1017
1018
        return self._lock_count >= 1