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

  • Committer: John Arbash Meinel
  • Date: 2008-05-29 20:17:37 UTC
  • mto: This revision was merged to the branch mainline in revision 3460.
  • Revision ID: john@arbash-meinel.com-20080529201737-4y4md0w6u6cuvrpo
Clarity tweaks recommended by Ian

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
447
447
                raise errors.NoSuchRevision(self, stop_revision)
448
448
        return other_history[self_len:stop_revision]
449
449
 
450
 
    def update_revisions(self, other, stop_revision=None):
 
450
    def update_revisions(self, other, stop_revision=None, overwrite=False,
 
451
                         graph=None):
451
452
        """Pull in new perfect-fit revisions.
452
453
 
453
454
        :param other: Another Branch to pull from
454
455
        :param stop_revision: Updated until the given revision
 
456
        :param overwrite: Always set the branch pointer, rather than checking
 
457
            to see if it is a proper descendant.
 
458
        :param graph: A Graph object that can be used to query history
 
459
            information. This can be None.
455
460
        :return: None
456
461
        """
457
462
        raise NotImplementedError(self.update_revisions)
1515
1520
                    return
1516
1521
                stop_revno = other_revno
1517
1522
 
1518
 
            # whats the current last revision, before we fetch [and change it
 
1523
            # what's the current last revision, before we fetch [and change it
1519
1524
            # possibly]
1520
1525
            last_rev = _mod_revision.ensure_null(self.last_revision())
1521
1526
            # we fetch here so that we don't process data twice in the common
1677
1682
        result.target_branch = target
1678
1683
        result.old_revno, result.old_revid = target.last_revision_info()
1679
1684
 
 
1685
        # We assume that during 'push' this repository is closer than
 
1686
        # the target.
1680
1687
        graph = self.repository.get_graph(target.repository)
1681
1688
        target.update_revisions(self, stop_revision, overwrite=overwrite,
1682
1689
                                graph=graph)