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

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 06:10:17 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3755.
  • Revision ID: andrew.bennetts@canonical.com-20081001061017-z97p3m0n9qqjzklf
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

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