1
# (C) 2005 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
from bzrlib.delta import compare_trees
20
from bzrlib.errors import NoSuchRevision
21
from bzrlib.log import line_log
22
from bzrlib.osutils import is_inside_any
24
# TODO: when showing single-line logs, truncate to the width of the terminal
25
# if known, but only if really going to the terminal (not into a file)
28
def show_status(branch, show_unchanged=False,
34
"""Display summary of changes.
36
By default this compares the working tree to a previous revision.
37
If the revision argument is given, summarizes changes between the
38
working tree and another, or between two revisions.
40
The result is written out as Unicode and to_file should be able
44
If set, includes unchanged files.
47
If set, only show the status of files in this list.
50
If set, includes each file's id.
53
If set, write to this file (default stdout.)
56
If set, write pending merges.
59
If None the compare latest revision with working tree
60
If one revision show compared it with working tree.
61
If two revisions show status between first and second.
68
new_is_working_tree = True
70
new = branch.bzrdir.open_workingtree()
71
old = new.basis_tree()
72
elif len(revision) > 0:
74
rev_id = revision[0].in_history(branch).rev_id
75
old = branch.repository.revision_tree(rev_id)
76
except NoSuchRevision, e:
77
raise BzrCommandError(str(e))
78
if (len(revision) > 1) and (revision[1].spec is not None):
80
rev_id = revision[1].in_history(branch).rev_id
81
new = branch.repository.revision_tree(rev_id)
82
new_is_working_tree = False
83
except NoSuchRevision, e:
84
raise BzrCommandError(str(e))
86
new = branch.bzrdir.open_workingtree()
88
delta = compare_trees(old, new, want_unchanged=show_unchanged,
89
specific_files=specific_files)
92
show_unchanged=show_unchanged)
94
if new_is_working_tree:
95
list_paths('unknown', new.unknowns(), specific_files, to_file)
96
list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
97
if new_is_working_tree and show_pending:
98
show_pending_merges(new, to_file)
102
def show_pending_merges(new, to_file):
103
"""Write out a display of pending merges in a working tree."""
104
pending = new.pending_merges()
106
if len(pending) == 0:
108
print >>to_file, 'pending merges:'
109
last_revision = branch.last_revision()
110
if last_revision is not None:
111
ignore = set(branch.repository.get_ancestry(last_revision))
114
for merge in new.pending_merges():
117
m_revision = branch.repository.get_revision(merge)
118
print >> to_file, ' ', line_log(m_revision, 77)
119
inner_merges = branch.repository.get_ancestry(merge)
120
inner_merges.reverse()
121
for mmerge in inner_merges:
124
mm_revision = branch.repository.get_revision(mmerge)
125
print >> to_file, ' ', line_log(mm_revision, 75)
127
except NoSuchRevision:
128
print >> to_file, ' ', merge
130
def list_paths(header, paths, specific_files, to_file):
133
if specific_files and not is_inside_any(specific_files, path):
136
print >>to_file, '%s:' % header
138
print >>to_file, ' ', path
added
removed
bzrlib/status.py
