← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Martin von Gagern
  • Date: 2010-04-20 08:47:38 UTC
  • mfrom: (5167 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5195.
  • Revision ID: martin.vgagern@gmx.net-20100420084738-ygymnqmdllzrhpfn
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
813
813
        revision_b = other_branch.last_revision()
814
814
        if revision_b in (None, revision.NULL_REVISION):
815
815
            raise errors.NoCommits(other_branch)
816
 
        if branch is None:
817
 
            branch = other_branch
818
 
        else:
819
 
            try:
820
 
                # pull in the remote revisions so we can diff
821
 
                branch.fetch(other_branch, revision_b)
822
 
            except errors.ReadOnlyError:
823
 
                branch = other_branch
 
816
        # pull in the remote revisions so we can diff
 
817
        branch.fetch(other_branch, revision_b)
824
818
        try:
825
819
            revno = branch.revision_id_to_revno(revision_b)
826
820
        except errors.NoSuchRevision:
846
840
            raise errors.NoCommits(other_branch)
847
841
        return other_branch.repository.revision_tree(last_revision)
848
842
 
849
 
    def needs_branch(self):
850
 
        return False
851
 
 
852
 
    def get_branch(self):
853
 
        return self.spec
854
 
 
855
843
 
856
844
 
857
845
class RevisionSpec_submit(RevisionSpec_ancestor):