/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 branch.py

  • Committer: Michael Hudson
  • Date: 2010-02-17 02:28:59 UTC
  • mto: (0.200.721 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: michael.hudson@canonical.com-20100217022859-qfbff4o9tl3pkypp
oh, so it wasn't (particularly) wrong, but it was a bit obscure

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
376
376
        graph=None, limit=None):
377
377
        """See InterBranch.update_revisions()."""
378
378
        interrepo = self._get_interrepo(self.source, self.target)
379
 
        self._head = None
380
 
        self._last_revid = None
381
379
        def determine_wants(heads):
382
380
            if not self.source.name in heads:
383
381
                raise NoSuchRef(self.source.name, heads.keys())
384
382
            if stop_revision is not None:
385
 
                self._last_revid = stop_revision
386
 
                self._head, mapping = self.source.repository.lookup_bzr_revision_id(
 
383
                _last_revid = stop_revision
 
384
                _head, mapping = self.source.repository.lookup_bzr_revision_id(
387
385
                    stop_revision)
388
386
            else:
389
 
                self._head = heads[self.source.name]
390
 
                self._last_revid = \
391
 
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
392
 
            if self.target.repository.has_revision(self._last_revid):
 
387
                _head = heads[self.source.name]
 
388
                _last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
389
                    _head)
 
390
            if self.target.repository.has_revision(_last_revid):
393
391
                return []
394
 
            return [self._head]
395
 
        _, r = interrepo.fetch_objects(
 
392
            return [_head]
 
393
        _, _head = interrepo.fetch_objects(
396
394
            determine_wants, self.source.mapping, limit=limit)
397
 
        self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(r)
 
395
        _last_revid = self.source.mapping.revision_id_foreign_to_bzr(_head)
398
396
        if overwrite:
399
397
            prev_last_revid = None
400
398
        else:
401
399
            prev_last_revid = self.target.last_revision()
402
 
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
 
400
        self.target.generate_revision_history(_last_revid, prev_last_revid)
 
401
        return _head
403
402
 
404
403
    def pull(self, overwrite=False, stop_revision=None,
405
404
             possible_transports=None, _hook_master=None, run_hooks=True,
432
431
            graph = self.target.repository.get_graph(self.source.repository)
433
432
            result.old_revno, result.old_revid = \
434
433
                self.target.last_revision_info()
435
 
            self.update_revisions(stop_revision, overwrite=overwrite,
 
434
            _head = self.update_revisions(stop_revision, overwrite=overwrite,
436
435
                graph=graph, limit=limit)
437
 
            result.new_git_head = self._head
 
436
            result.new_git_head = _head
438
437
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
439
438
                overwrite)
440
439
            result.new_revno, result.new_revid = self.target.last_revision_info()
457
456
        result.target_branch = self.target
458
457
        graph = self.target.repository.get_graph(self.source.repository)
459
458
        result.old_revno, result.old_revid = self.target.last_revision_info()
460
 
        self.update_revisions(stop_revision, overwrite=overwrite, graph=graph)
461
 
        result.new_git_head = self._head
 
459
        _head = self.update_revisions(
 
460
            stop_revision, overwrite=overwrite, graph=graph)
 
461
        result.new_git_head = _head
462
462
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
463
463
            overwrite)
464
464
        result.new_revno, result.new_revid = self.target.last_revision_info()