~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Lukáš Lalinský
  • Date: 2007-12-03 21:35:54 UTC
  • mto: (3298.2.1 get_rev_id)
  • mto: This revision was merged to the branch mainline in revision 3328.
  • Revision ID: lalinsky@gmail.com-20071203213554-8x1dsmlqdtm79ala
Add support for in_branch for the remaining RevisionSpec subclasses.

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_branch(wt.branch, False).rev_id
 
87
                rev_id = revision[0].in_branch(wt.branch,
 
88
                                               need_revno=False).rev_id
88
89
                old = wt.branch.repository.revision_tree(rev_id)
89
90
            except errors.NoSuchRevision, e:
90
91
                raise errors.BzrCommandError(str(e))
91
92
            if (len(revision) > 1) and (revision[1].spec is not None):
92
93
                try:
93
 
                    rev_id = revision[1].in_branch(wt.branch, False).rev_id
 
94
                    rev_id = revision[1].in_branch(wt.branch,
 
95
                                                   need_revno=False).rev_id
94
96
                    new = wt.branch.repository.revision_tree(rev_id)
95
97
                    new_is_working_tree = False
96
98
                except errors.NoSuchRevision, e: