← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-21 20:32:16 UTC
  • mfrom: (5809.1.2 pwit1)
  • mto: This revision was merged to the branch mainline in revision 5821.
  • Revision ID: jelmer@samba.org-20110421203216-r04j4x5vugrup6u9
Merge per-wt-inventory-tests-pt1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
2919
2919
            raise errors.UnexpectedSmartServerResponse(response)
2920
2920
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2921
2921
 
 
2922
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2922
2923
    @needs_write_lock
2923
2924
    def set_revision_history(self, rev_history):
 
2925
        """See Branch.set_revision_history."""
 
2926
        self._set_revision_history(rev_history)
 
2927
 
 
2928
    @needs_write_lock
 
2929
    def _set_revision_history(self, rev_history):
2924
2930
        # Send just the tip revision of the history; the server will generate
2925
2931
        # the full history from that.  If the revision doesn't exist in this
2926
2932
        # branch, NoSuchRevision will be raised.
3039
3045
            except errors.UnknownSmartMethod:
3040
3046
                medium._remember_remote_is_before((1, 6))
3041
3047
        self._clear_cached_state_of_remote_branch_only()
3042
 
        self.set_revision_history(self._lefthand_history(revision_id,
 
3048
        self._set_revision_history(self._lefthand_history(revision_id,
3043
3049
            last_rev=last_rev,other_branch=other_branch))
3044
3050
 
3045
3051
    def set_push_location(self, location):