← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Robert Collins
  • Date: 2006-02-11 11:58:06 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060211115806-732dabc1e35714ed
Give format3 working trees their own last-revision marker.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
20
20
from bzrlib.errors import NoSuchRevision
21
21
from bzrlib.log import line_log
22
22
from bzrlib.osutils import is_inside_any
23
 
from bzrlib.workingtree import WorkingTree
24
23
 
25
24
# TODO: when showing single-line logs, truncate to the width of the terminal
26
25
# if known, but only if really going to the terminal (not into a file)
68
67
    try:
69
68
        new_is_working_tree = True
70
69
        if revision is None:
71
 
            new = WorkingTree(branch.base, branch)
 
70
            new = branch.bzrdir.open_workingtree()
72
71
            old = new.basis_tree()
73
72
        elif len(revision) > 0:
74
73
            try:
84
83
                except NoSuchRevision, e:
85
84
                    raise BzrCommandError(str(e))
86
85
            else:
87
 
                new = WorkingTree(branch.base, branch)
 
86
                new = branch.bzrdir.open_workingtree()
88
87
                
89
88
        delta = compare_trees(old, new, want_unchanged=show_unchanged,
90
89
                              specific_files=specific_files)