13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
34
34
# if known, but only if really going to the terminal (not into a file)
37
def report_changes(to_file, old, new, specific_files,
38
show_short_reporter, show_long_callback,
39
short=False, want_unchanged=False,
40
want_unversioned=False, show_ids=False):
41
"""Display summary of changes.
43
This compares two trees with regards to a list of files, and delegates
44
the display to underlying elements.
46
For short output, it creates an iterator on all changes, and lets a given
47
reporter display these changes.
49
For stantard output, it creates a delta of the changes, and forwards it
52
:param to_file: If set, write to this file (default stdout.)
53
:param old: Start tree for the comparison
54
:param end: End tree for the comparison
55
:param specific_files: If set, a list of filenames whose status should be
56
shown. It is an error to give a filename that is not in the working
57
tree, or in the working inventory or in the basis inventory.
58
:param show_short_reporter: Reporter in charge of display for short output
59
:param show_long_callback: Callback in charge of display for normal output
60
:param short: If True, gives short SVN-style status lines.
61
:param want_unchanged: Deprecated parameter. If set, includes unchanged
63
:param show_ids: If set, includes each file's id.
64
:param want_unversioned: If False, only shows versioned files.
68
changes = new.iter_changes(old, want_unchanged, specific_files,
69
require_versioned=False, want_unversioned=want_unversioned)
70
_mod_delta.report_changes(changes, show_short_reporter)
73
delta = new.changes_from(old, want_unchanged=want_unchanged,
74
specific_files=specific_files,
75
want_unversioned=want_unversioned)
76
# filter out unknown files. We may want a tree method for
78
delta.unversioned = [unversioned for unversioned in
79
delta.unversioned if not new.is_ignored(unversioned[0])]
80
show_long_callback(to_file, delta,
82
show_unchanged=want_unchanged)
37
85
def show_tree_status(wt, show_unchanged=None,
38
86
specific_files=None,
94
show_long_callback=_mod_delta.report_delta):
45
95
"""Display summary of changes.
47
By default this compares the working tree to a previous revision.
48
If the revision argument is given, summarizes changes between the
97
By default this compares the working tree to a previous revision.
98
If the revision argument is given, summarizes changes between the
49
99
working tree and another, or between two revisions.
51
The result is written out as Unicode and to_file should be able
101
The result is written out as Unicode and to_file should be able
54
104
If showing the status of a working tree, extra information is included
55
105
about unknown files, conflicts, and pending merges.
57
:param show_unchanged: Deprecated parameter. If set, includes unchanged
107
:param show_unchanged: Deprecated parameter. If set, includes unchanged
59
109
:param specific_files: If set, a list of filenames whose status should be
60
shown. It is an error to give a filename that is not in the working
110
shown. It is an error to give a filename that is not in the working
61
111
tree, or in the working inventory or in the basis inventory.
62
112
:param show_ids: If set, includes each file's id.
63
113
:param to_file: If set, write to this file (default stdout.)
67
117
If one revision, compare with working tree.
68
118
If two revisions, show status between first and second.
69
119
:param short: If True, gives short SVN-style status lines.
120
:param verbose: If True, show all merged revisions, not just
70
122
:param versioned: If True, only shows versioned files.
123
:param show_long_callback: A callback: message = show_long_callback(to_file, delta,
124
show_ids, show_unchanged, indent, filter), only used with the long output
72
126
if show_unchanged is not None:
73
127
warn("show_tree_status with show_unchanged has been deprecated "
103
_raise_if_nonexistent(specific_files, old, new)
157
specific_files, nonexistents \
158
= _filter_nonexistent(specific_files, old, new)
104
159
want_unversioned = not versioned
106
changes = new.iter_changes(old, show_unchanged, specific_files,
107
require_versioned=False, want_unversioned=want_unversioned)
108
reporter = _mod_delta._ChangeReporter(output_file=to_file,
109
unversioned_filter=new.is_ignored)
110
_mod_delta.report_changes(changes, reporter)
112
delta = new.changes_from(old, want_unchanged=show_unchanged,
113
specific_files=specific_files,
114
want_unversioned=want_unversioned)
115
# filter out unknown files. We may want a tree method for
117
delta.unversioned = [unversioned for unversioned in
118
delta.unversioned if not new.is_ignored(unversioned[0])]
121
show_unchanged=show_unchanged,
161
# Reporter used for short outputs
162
reporter = _mod_delta._ChangeReporter(output_file=to_file,
163
unversioned_filter=new.is_ignored)
164
report_changes(to_file, old, new, specific_files,
165
reporter, show_long_callback,
166
short=short, want_unchanged=show_unchanged,
167
want_unversioned=want_unversioned, show_ids=show_ids)
123
169
# show the new conflicts only for now. XXX: get them from the
125
171
conflicts = new.conflicts()
136
182
to_file.write("%s %s\n" % (prefix, conflict))
183
# Show files that were requested but don't exist (and are
184
# not versioned). We don't involve delta in this; these
185
# paths are really the province of just the status
186
# command, since they have more to do with how it was
187
# invoked than with the tree it's operating on.
188
if nonexistents and not short:
189
to_file.write("nonexistent:\n")
190
for nonexistent in nonexistents:
191
# We could calculate prefix outside the loop but, given
192
# how rarely this ought to happen, it's OK and arguably
193
# slightly faster to do it here (ala conflicts above)
198
to_file.write("%s %s\n" % (prefix, nonexistent))
137
199
if (new_is_working_tree and show_pending):
138
show_pending_merges(new, to_file, short)
200
show_pending_merges(new, to_file, short, verbose=verbose)
202
raise errors.PathsDoNotExist(nonexistents)
169
233
return sorter.iter_topo_order()
172
def show_pending_merges(new, to_file, short=False):
236
def show_pending_merges(new, to_file, short=False, verbose=False):
173
237
"""Write out a display of pending merges in a working tree."""
174
238
parents = new.get_parent_ids()
175
239
if len(parents) < 2:
178
# we need one extra space for terminals that wrap on last char
179
term_width = osutils.terminal_width() - 1
242
term_width = osutils.terminal_width()
243
if term_width is not None:
244
# we need one extra space for terminals that wrap on last char
245
term_width = term_width - 1
181
247
first_prefix = 'P '
182
248
sub_prefix = 'P. '
184
250
first_prefix = ' '
253
def show_log_message(rev, prefix):
254
if term_width is None:
257
width = term_width - len(prefix)
258
log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
259
to_file.write(log_message + '\n')
187
261
pending = parents[1:]
188
262
branch = new.branch
189
263
last_revision = parents[0]
191
to_file.write('pending merges:\n')
266
to_file.write('pending merges:\n')
268
to_file.write('pending merge tips:'
269
' (use -v to see all merge revisions)\n')
192
270
graph = branch.repository.get_graph()
193
271
other_revisions = [last_revision]
194
272
log_formatter = log.LineLogFormatter(to_file)
204
282
# Log the merge, as it gets a slightly different formatting
205
log_message = log_formatter.log_string(None, rev,
206
term_width - len(first_prefix))
207
to_file.write(first_prefix + log_message + '\n')
283
show_log_message(rev, first_prefix)
208
287
# Find all of the revisions in the merge source, which are not in the
209
288
# last committed revision.
210
289
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
240
319
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
242
log_message = log_formatter.log_string(None,
243
revisions[sub_merge],
244
term_width - len(sub_prefix))
245
to_file.write(sub_prefix + log_message + '\n')
248
def _raise_if_nonexistent(paths, old_tree, new_tree):
249
"""Complain if paths are not in either inventory or tree.
251
It's OK with the files exist in either tree's inventory, or
252
if they exist in the tree but are not versioned.
321
show_log_message(revisions[sub_merge], sub_prefix)
324
def _filter_nonexistent(orig_paths, old_tree, new_tree):
325
"""Convert orig_paths to two sorted lists and return them.
327
The first is orig_paths paths minus the items in the second list,
328
and the second list is paths that are not in either inventory or
329
tree (they don't qualify if they exist in the tree's inventory, or
330
if they exist in the tree but are not versioned.)
332
If either of the two lists is empty, return it as an empty list.
254
334
This can be used by operations such as bzr status that can accept
255
335
unknown or ignored files.
257
mutter("check paths: %r", paths)
260
s = old_tree.filter_unversioned_files(paths)
337
mutter("check paths: %r", orig_paths)
339
return orig_paths, []
340
s = old_tree.filter_unversioned_files(orig_paths)
261
341
s = new_tree.filter_unversioned_files(s)
262
s = [path for path in s if not new_tree.has_filename(path)]
264
raise errors.PathsDoNotExist(sorted(s))
342
nonexistent = [path for path in s if not new_tree.has_filename(path)]
343
remaining = [path for path in orig_paths if not path in nonexistent]
344
# Sorting the 'remaining' list doesn't have much effect in
345
# practice, since the various status output sections will sort
346
# their groups individually. But for consistency of this
347
# function's API, it's better to sort both than just 'nonexistent'.
348
return sorted(remaining), sorted(nonexistent)
added
removed
bzrlib/status.py
