← Back to branch summary

~jelmer/bzr-git/merge-fetch

« back to all changes in this revision

Viewing changes to branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-26 17:20:22 UTC
  • Revision ID: jelmer@samba.org-20110326172022-9gux3nsuhhbm4yn7
https://launchpad.net/bugs/741760
Fix fetch from remote during merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
570
570
                not isinstance(target, GitBranch) and
571
571
                (getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None))
572
572
 
573
 
    def update_revisions(self, stop_revision=None, overwrite=False,
574
 
                         graph=None):
575
 
        """See InterBranch.update_revisions()."""
 
573
    def fetch(self, stop_revision=None, fetch_tags=True):
 
574
        self.fetch_objects(stop_revision, fetch_tags=fetch_tags)
 
575
 
 
576
    def fetch_objects(self, stop_revision, fetch_tags):
576
577
        interrepo = self._get_interrepo(self.source, self.target)
577
578
        def determine_wants(heads):
578
579
            if self.source.ref is not None and not self.source.ref in heads:
587
588
            else:
588
589
                self._last_revid = stop_revision
589
590
            real = interrepo.get_determine_wants_revids(
590
 
                [self._last_revid], include_tags=True)
 
591
                [self._last_revid], include_tags=fetch_tags)
591
592
            return real(heads)
592
593
        pack_hint, head, refs = interrepo.fetch_objects(
593
594
            determine_wants, self.source.mapping)
594
595
        if (pack_hint is not None and
595
596
            self.target.repository._format.pack_compresses):
596
597
            self.target.repository.pack(hint=pack_hint)
 
598
        return head, refs
 
599
 
 
600
    def update_revisions(self, stop_revision=None, overwrite=False,
 
601
                         graph=None):
 
602
        """See InterBranch.update_revisions()."""
 
603
        head, refs = self.fetch_objects(stop_revision, fetch_tags=True)
597
604
        if overwrite:
598
605
            prev_last_revid = None
599
606
        else: