← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2010-06-17 06:30:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5301.
  • Revision ID: robertc@robertcollins.net-20100617063022-kb68pzdohhw9ezi8
Fixup tests in per_interbranch not being strict about making the from format the configured one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1023
1023
            self._extend_partial_history(distance_from_last)
1024
1024
        return self._partial_revision_history_cache[distance_from_last]
1025
1025
 
1026
 
    @needs_write_lock
1027
1026
    def pull(self, source, overwrite=False, stop_revision=None,
1028
1027
             possible_transports=None, *args, **kwargs):
1029
1028
        """Mirror source into this branch.
3195
3194
        """
3196
3195
        raise NotImplementedError(klass._get_branch_formats_to_test)
3197
3196
 
 
3197
    @needs_write_lock
3198
3198
    def pull(self, overwrite=False, stop_revision=None,
3199
3199
             possible_transports=None, local=False):
3200
3200
        """Mirror source into target branch.
3205
3205
        """
3206
3206
        raise NotImplementedError(self.pull)
3207
3207
 
 
3208
    @needs_write_lock
3208
3209
    def update_revisions(self, stop_revision=None, overwrite=False,
3209
3210
                         graph=None):
3210
3211
        """Pull in new perfect-fit revisions.
3218
3219
        """
3219
3220
        raise NotImplementedError(self.update_revisions)
3220
3221
 
 
3222
    @needs_write_lock
3221
3223
    def push(self, overwrite=False, stop_revision=None,
3222
3224
             _override_hook_source_branch=None):
3223
3225
        """Mirror the source branch into the target branch.
3305
3307
                             (this_last_revision, this_revno)])
3306
3308
        self.target.set_last_revision_info(stop_revno, stop_revision)
3307
3309
 
 
3310
    @needs_write_lock
3308
3311
    def pull(self, overwrite=False, stop_revision=None,
3309
3312
             possible_transports=None, run_hooks=True,
3310
3313
             _override_hook_target=None, local=False):