19
19
def show_status(branch, show_unchanged=False,
20
20
specific_files=None,
25
"""Display status for non-ignored working files.
22
"""Display single-line status for non-ignored working files.
28
If set, includes unchanged files.
25
If true, show unmodified files too.
31
28
If set, only show the status of files in this list.
34
If set, includes each file's id.
37
If set, write to this file (default stdout.)
40
If set, write pending merges.
43
If None the compare latest revision with working tree
44
If one revision show compared it with working tree.
45
If two revisions show status between first and second.
48
from bzrlib.osutils import is_inside_any
49
from bzrlib.delta import compare_trees
31
from bzrlib.diff import compare_trees
56
new_is_working_tree = True
58
old = branch.basis_tree()
59
new = branch.working_tree()
60
elif len(revision) > 0:
62
rev_id = revision[0].in_history(branch).rev_id
63
old = branch.revision_tree(rev_id)
64
except NoSuchRevision, e:
65
raise BzrCommandError(str(e))
68
rev_id = revision[1].in_history(branch).rev_id
69
new = branch.revision_tree(rev_id)
70
new_is_working_tree = False
71
except NoSuchRevision, e:
72
raise BzrCommandError(str(e))
74
new = branch.working_tree()
36
old = branch.basis_tree()
37
new = branch.working_tree()
77
39
delta = compare_trees(old, new, want_unchanged=show_unchanged,
78
40
specific_files=specific_files)
42
delta.show(sys.stdout, show_ids=show_ids,
82
43
show_unchanged=show_unchanged)
84
if new_is_working_tree:
85
unknowns = new.unknowns()
88
if specific_files and not is_inside_any(specific_files, path):
45
unknowns = new.unknowns()
48
# FIXME: Should also match if the unknown file is within a
49
# specified directory.
51
if path not in specific_files:
91
print >>to_file, 'unknown:'
93
print >>to_file, ' ', path
94
if show_pending and len(branch.pending_merges()) > 0:
95
print >>to_file, 'pending merges:'
96
for merge in branch.pending_merges():
97
print >> to_file, ' ', merge
added
removed
bzrlib/status.py
