← 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-07 12:03:14 UTC
  • mto: (2483.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2484.
  • Revision ID: mbp@sourcefrog.net-20070507120314-a2h78bjezemwyl17
Review cleanups from John, mostly docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
997
997
 
998
998
    @needs_write_lock
999
999
    def pull(self, source, overwrite=False, stop_revision=None,
1000
 
            **kwargs):
1001
 
        # FIXME: This lets the real branch run the hooks, so they'll be called
1002
 
        # with the wrong branch parameters -- mbp 20070405
 
1000
             **kwargs):
 
1001
        # FIXME: This asks the real branch to run the hooks, which means
 
1002
        # they're called with the wrong target branch parameter. 
 
1003
        # The test suite specifically allows this at present but it should be
 
1004
        # fixed.  It should get a _override_hook_target branch,
 
1005
        # as push does.  -- mbp 20070405
1003
1006
        self._ensure_real()
1004
1007
        self._real_branch.pull(
1005
1008
            source, overwrite=overwrite, stop_revision=stop_revision,
1007
1010
 
1008
1011
    @needs_read_lock
1009
1012
    def push(self, target, overwrite=False, stop_revision=None):
1010
 
        # FIXME: This lets the real branch run the hooks, so they'll be called
1011
 
        # with the wrong branch parameters -- mbp 20070405
1012
1013
        self._ensure_real()
1013
1014
        return self._real_branch.push(
1014
1015
            target, overwrite=overwrite, stop_revision=stop_revision,