/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Andrew Bennetts
  • Date: 2011-06-02 07:25:33 UTC
  • mfrom: (5952 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5955.
  • Revision ID: andrew.bennetts@canonical.com-20110602072533-v0pe1ivh27cp0pd8
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1081
1081
    def find_text_key_references(self):
1082
1082
        """Find the text key references within the repository.
1083
1083
 
1084
 
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
1085
 
        revision_ids. Each altered file-ids has the exact revision_ids that
1086
 
        altered it listed explicitly.
1087
1084
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1088
1085
            to whether they were referred to by the inventory of the
1089
1086
            revision_id that they contain. The inventory texts from all present
1609
1606
    @needs_read_lock
1610
1607
    def search_missing_revision_ids(self, other,
1611
1608
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
1612
 
            find_ghosts=True, revision_ids=None, if_present_ids=None):
 
1609
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
1610
            limit=None):
1613
1611
        """Return the revision ids that other has that this does not.
1614
1612
 
1615
1613
        These are returned in topological order.
1629
1627
        inter_repo = _mod_repository.InterRepository.get(other, self)
1630
1628
        return inter_repo.search_missing_revision_ids(
1631
1629
            find_ghosts=find_ghosts, revision_ids=revision_ids,
1632
 
            if_present_ids=if_present_ids)
 
1630
            if_present_ids=if_present_ids, limit=limit)
1633
1631
 
1634
1632
    def fetch(self, source, revision_id=None, find_ghosts=False,
1635
1633
            fetch_spec=None):
2995
2993
            _override_hook_target=self, **kwargs)
2996
2994
 
2997
2995
    @needs_read_lock
2998
 
    def push(self, target, overwrite=False, stop_revision=None):
 
2996
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2999
2997
        self._ensure_real()
3000
2998
        return self._real_branch.push(
3001
 
            target, overwrite=overwrite, stop_revision=stop_revision,
 
2999
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
3002
3000
            _override_hook_source_branch=self)
3003
3001
 
3004
3002
    def is_locked(self):