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
131
127
conflicts = conflicts.select_conflicts(new, specific_files,
132
128
ignore_misses=True, recurse=True)[1]
133
129
if len(conflicts) > 0 and not short:
134
to_file.write("conflicts:\n")
130
print >> to_file, "conflicts:"
135
131
for conflict in conflicts:
140
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)
136
print >> to_file, "%s %s" % (prefix, conflict)
137
if new_is_working_tree and show_pending:
138
show_pending_merges(new, to_file, short)
163
raise errors.PathsDoNotExist(nonexistents)
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):
145
def show_pending_merges(new, to_file, short=False):
195
146
"""Write out a display of pending merges in a working tree."""
196
147
parents = new.get_parent_ids()
197
148
if len(parents) < 2:
200
# we need one extra space for terminals that wrap on last char
201
term_width = osutils.terminal_width() - 1
209
150
pending = parents[1:]
210
151
branch = new.branch
211
152
last_revision = parents[0]
214
to_file.write('pending merges:\n')
216
to_file.write('pending merge tips: (use -v to see all merge revisions)\n')
217
graph = branch.repository.get_graph()
218
other_revisions = [last_revision]
219
log_formatter = log.LineLogFormatter(to_file)
154
print >>to_file, 'pending merges:'
155
if last_revision is not None:
157
ignore = set(branch.repository.get_ancestry(last_revision,
159
except errors.NoSuchRevision:
160
# the last revision is a ghost : assume everything is new
162
ignore = set([None, last_revision])
165
# TODO: this could be improved using merge_sorted - we'd get the same
166
# output rather than one level of indent.
220
167
for merge in pending:
222
rev = branch.repository.get_revisions([merge])[0]
223
except errors.NoSuchRevision:
224
# If we are missing a revision, just print out the revision id
225
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
226
other_revisions.append(merge)
229
# Log the merge, as it gets a slightly different formatting
230
log_message = log_formatter.log_string(None, rev,
231
term_width - len(first_prefix))
232
to_file.write(first_prefix + log_message + '\n')
236
# Find all of the revisions in the merge source, which are not in the
237
# last committed revision.
238
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
239
other_revisions.append(merge)
240
merge_extra.discard(_mod_revision.NULL_REVISION)
242
# Get a handle to all of the revisions we will need
244
revisions = dict((rev.revision_id, rev) for rev in
245
branch.repository.get_revisions(merge_extra))
246
except errors.NoSuchRevision:
247
# One of the sub nodes is a ghost, check each one
249
for revision_id in merge_extra:
251
rev = branch.repository.get_revisions([revision_id])[0]
252
except errors.NoSuchRevision:
253
revisions[revision_id] = None
170
from bzrlib.osutils import terminal_width
171
width = terminal_width()
172
m_revision = branch.repository.get_revision(merge)
177
print >> to_file, prefix, line_log(m_revision, width - 4)
178
inner_merges = branch.repository.get_ancestry(merge)
179
assert inner_merges[0] is None
181
inner_merges.reverse()
182
for mmerge in inner_merges:
185
mm_revision = branch.repository.get_revision(mmerge)
255
revisions[revision_id] = rev
257
# Display the revisions brought in by this merge.
258
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
259
branch.repository.get_parent_map(merge_extra))
260
# Skip the first node
261
num, first, depth, eom = rev_id_iterator.next()
263
raise AssertionError('Somehow we misunderstood how'
264
' iter_topo_order works %s != %s' % (first, merge))
265
for num, sub_merge, depth, eom in rev_id_iterator:
266
rev = revisions[sub_merge]
268
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
270
log_message = log_formatter.log_string(None,
271
revisions[sub_merge],
272
term_width - len(sub_prefix))
273
to_file.write(sub_prefix + log_message + '\n')
276
def _filter_nonexistent(orig_paths, old_tree, new_tree):
277
"""Convert orig_paths to two sorted lists and return them.
279
The first is orig_paths paths minus the items in the second list,
280
and the second list is paths that are not in either inventory or
281
tree (they don't qualify if they exist in the tree's inventory, or
282
if they exist in the tree but are not versioned.)
284
If either of the two lists is empty, return it as an empty list.
286
This can be used by operations such as bzr status that can accept
287
unknown or ignored files.
289
mutter("check paths: %r", orig_paths)
291
return orig_paths, []
292
s = old_tree.filter_unversioned_files(orig_paths)
293
s = new_tree.filter_unversioned_files(s)
294
nonexistent = [path for path in s if not new_tree.has_filename(path)]
295
remaining = [path for path in orig_paths if not path in nonexistent]
296
# Sorting the 'remaining' list doesn't have much effect in
297
# practice, since the various status output sections will sort
298
# their groups individually. But for consistency of this
299
# function's API, it's better to sort both than just 'nonexistent'.
300
return sorted(remaining), sorted(nonexistent)
190
print >> to_file, prefix, line_log(mm_revision, width - 5)
192
except errors.NoSuchRevision:
197
print >> to_file, prefix, merge
added
removed
bzrlib/status.py
