46
43
"""Display summary of changes.
48
By default this compares the working tree to a previous revision.
49
If the revision argument is given, summarizes changes between the
45
By default this compares the working tree to a previous revision.
46
If the revision argument is given, summarizes changes between the
50
47
working tree and another, or between two revisions.
52
The result is written out as Unicode and to_file should be able
49
The result is written out as Unicode and to_file should be able
55
52
If showing the status of a working tree, extra information is included
56
53
about unknown files, conflicts, and pending merges.
58
:param show_unchanged: Deprecated parameter. If set, includes unchanged
55
:param show_unchanged: Deprecated parameter. If set, includes unchanged
60
57
:param specific_files: If set, a list of filenames whose status should be
61
shown. It is an error to give a filename that is not in the working
58
shown. It is an error to give a filename that is not in the working
62
59
tree, or in the working inventory or in the basis inventory.
63
60
:param show_ids: If set, includes each file's id.
64
61
:param to_file: If set, write to this file (default stdout.)
65
62
:param show_pending: If set, write pending merges.
66
:param revision: If None, compare latest revision with working tree
67
If not None, it must be a RevisionSpec list.
68
If one revision, compare with working tree.
69
If two revisions, show status between first and second.
63
:param revision: If None the compare latest revision with working tree
64
If not None it must be a RevisionSpec list.
65
If one revision show compared it with working tree.
66
If two revisions show status between first and second.
70
67
:param short: If True, gives short SVN-style status lines.
71
:param verbose: If True, show all merged revisions, not just
73
68
:param versioned: If True, only shows versioned files.
75
70
if show_unchanged is not None:
76
warn("show_tree_status with show_unchanged has been deprecated "
71
warn("show_status_trees with show_unchanged has been deprecated "
77
72
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
79
74
if to_file is None:
80
75
to_file = sys.stdout
84
79
new_is_working_tree = True
140
136
to_file.write("%s %s\n" % (prefix, conflict))
141
# Show files that were requested but don't exist (and are
142
# not versioned). We don't involve delta in this; these
143
# paths are really the province of just the status
144
# command, since they have more to do with how it was
145
# invoked than with the tree it's operating on.
146
if nonexistents and not short:
147
to_file.write("nonexistent:\n")
148
for nonexistent in nonexistents:
149
# We could calculate prefix outside the loop but, given
150
# how rarely this ought to happen, it's OK and arguably
151
# slightly faster to do it here (ala conflicts above)
156
to_file.write("%s %s\n" % (prefix, nonexistent))
157
if (new_is_working_tree and show_pending):
158
show_pending_merges(new, to_file, short, verbose=verbose)
160
raise errors.PathsDoNotExist(nonexistents)
137
if (new_is_working_tree and show_pending
138
and specific_files is None):
139
show_pending_merges(new, to_file, short)
168
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
169
"""Get an iterator which will return the revisions in merge sorted order.
171
This will build up a list of all nodes, such that only nodes in the list
172
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
175
:param revision_ids: A set of revision_ids
176
:param parent_map: The parent information for each node. Revisions which
177
are considered ghosts should not be present in the map.
178
:return: iterator from MergeSorter.iter_topo_order()
180
# MergeSorter requires that all nodes be present in the graph, so get rid
181
# of any references pointing outside of this graph.
183
for revision_id in revision_ids:
184
if revision_id not in parent_map: # ghost
185
parent_graph[revision_id] = []
187
# Only include parents which are in this sub-graph
188
parent_graph[revision_id] = [p for p in parent_map[revision_id]
189
if p in revision_ids]
190
sorter = tsort.MergeSorter(parent_graph, tip_revision)
191
return sorter.iter_topo_order()
194
def show_pending_merges(new, to_file, short=False, verbose=False):
146
def show_pending_merges(new, to_file, short=False):
195
147
"""Write out a display of pending merges in a working tree."""
196
148
parents = new.get_parent_ids()
197
149
if len(parents) < 2:
200
term_width = osutils.terminal_width()
201
if term_width is not None:
202
# we need one extra space for terminals that wrap on last char
203
term_width = term_width - 1
211
def show_log_message(rev, prefix):
212
if term_width is None:
215
width = term_width - len(prefix)
216
log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
217
to_file.write(log_message + '\n')
219
151
pending = parents[1:]
220
152
branch = new.branch
221
153
last_revision = parents[0]
224
to_file.write('pending merges:\n')
226
to_file.write('pending merge tips:'
227
' (use -v to see all merge revisions)\n')
228
graph = branch.repository.get_graph()
229
other_revisions = [last_revision]
230
log_formatter = log.LineLogFormatter(to_file)
155
to_file.write('pending merges:\n')
156
if last_revision is not None:
158
ignore = set(branch.repository.get_ancestry(last_revision,
160
except errors.NoSuchRevision:
161
# the last revision is a ghost : assume everything is new
163
ignore = set([None, last_revision])
166
# TODO: this could be improved using merge_sorted - we'd get the same
167
# output rather than one level of indent.
231
168
for merge in pending:
233
rev = branch.repository.get_revisions([merge])[0]
234
except errors.NoSuchRevision:
235
# If we are missing a revision, just print out the revision id
236
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
237
other_revisions.append(merge)
240
# Log the merge, as it gets a slightly different formatting
241
show_log_message(rev, first_prefix)
245
# Find all of the revisions in the merge source, which are not in the
246
# last committed revision.
247
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
248
other_revisions.append(merge)
249
merge_extra.discard(_mod_revision.NULL_REVISION)
251
# Get a handle to all of the revisions we will need
253
revisions = dict((rev.revision_id, rev) for rev in
254
branch.repository.get_revisions(merge_extra))
255
except errors.NoSuchRevision:
256
# One of the sub nodes is a ghost, check each one
258
for revision_id in merge_extra:
260
rev = branch.repository.get_revisions([revision_id])[0]
261
except errors.NoSuchRevision:
262
revisions[revision_id] = None
171
from bzrlib.osutils import terminal_width
172
width = terminal_width() - 1 # we need one extra space to avoid
174
m_revision = branch.repository.get_revision(merge)
179
to_file.write(prefix)
180
to_file.write(line_log(m_revision, width - len(prefix)))
182
inner_merges = branch.repository.get_ancestry(merge)
183
assert inner_merges[0] is None
185
inner_merges.reverse()
186
for mmerge in inner_merges:
189
mm_revision = branch.repository.get_revision(mmerge)
264
revisions[revision_id] = rev
266
# Display the revisions brought in by this merge.
267
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
268
branch.repository.get_parent_map(merge_extra))
269
# Skip the first node
270
num, first, depth, eom = rev_id_iterator.next()
272
raise AssertionError('Somehow we misunderstood how'
273
' iter_topo_order works %s != %s' % (first, merge))
274
for num, sub_merge, depth, eom in rev_id_iterator:
275
rev = revisions[sub_merge]
277
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
279
show_log_message(revisions[sub_merge], sub_prefix)
282
def _filter_nonexistent(orig_paths, old_tree, new_tree):
283
"""Convert orig_paths to two sorted lists and return them.
285
The first is orig_paths paths minus the items in the second list,
286
and the second list is paths that are not in either inventory or
287
tree (they don't qualify if they exist in the tree's inventory, or
288
if they exist in the tree but are not versioned.)
290
If either of the two lists is empty, return it as an empty list.
292
This can be used by operations such as bzr status that can accept
293
unknown or ignored files.
295
mutter("check paths: %r", orig_paths)
297
return orig_paths, []
298
s = old_tree.filter_unversioned_files(orig_paths)
299
s = new_tree.filter_unversioned_files(s)
300
nonexistent = [path for path in s if not new_tree.has_filename(path)]
301
remaining = [path for path in orig_paths if not path in nonexistent]
302
# Sorting the 'remaining' list doesn't have much effect in
303
# practice, since the various status output sections will sort
304
# their groups individually. But for consistency of this
305
# function's API, it's better to sort both than just 'nonexistent'.
306
return sorted(remaining), sorted(nonexistent)
194
to_file.write(prefix)
195
to_file.write(line_log(mm_revision, width - len(prefix)))
198
except errors.NoSuchRevision:
203
to_file.write(prefix + ' ' + merge)
added
removed
bzrlib/status.py
