~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-04-03 02:22:55 UTC
  • mfrom: (3298.2.18 revision_id_to_revno)
  • Revision ID: pqm@pqm.ubuntu.com-20080403022255-5l0yelvi9m74mq24
Faster Branch and revspec operations (jam, abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
84
84
            old = new.basis_tree()
85
85
        elif len(revision) > 0:
86
86
            try:
87
 
                rev_id = revision[0].in_history(wt.branch).rev_id
 
87
                rev_id = revision[0].as_revision_id(wt.branch)
88
88
                old = wt.branch.repository.revision_tree(rev_id)
89
89
            except errors.NoSuchRevision, e:
90
90
                raise errors.BzrCommandError(str(e))
91
91
            if (len(revision) > 1) and (revision[1].spec is not None):
92
92
                try:
93
 
                    rev_id = revision[1].in_history(wt.branch).rev_id
 
93
                    rev_id = revision[1].as_revision_id(wt.branch)
94
94
                    new = wt.branch.repository.revision_tree(rev_id)
95
95
                    new_is_working_tree = False
96
96
                except errors.NoSuchRevision, e: