19
19
from bzrlib import (
20
20
delta as _mod_delta,
25
revision as _mod_revision,
23
from bzrlib.diff import _raise_if_nonexistent
24
27
import bzrlib.errors as errors
25
from bzrlib.log import line_log
26
28
from bzrlib.osutils import is_inside_any
27
29
from bzrlib.symbol_versioning import (deprecated_function,
30
from bzrlib.trace import warning
31
from bzrlib.trace import mutter, warning
32
33
# TODO: when showing single-line logs, truncate to the width of the terminal
33
34
# if known, but only if really going to the terminal (not into a file)
36
@deprecated_function(zero_eight)
37
def show_status(branch, show_unchanged=None,
43
"""Display summary of changes.
45
Please use show_tree_status instead.
47
By default this compares the working tree to a previous revision.
48
If the revision argument is given, summarizes changes between the
49
working tree and another, or between two revisions.
51
The result is written out as Unicode and to_file should be able
55
If set, includes unchanged files.
58
If set, only show the status of files in this list.
61
If set, includes each file's id.
64
If set, write to this file (default stdout.)
67
If set, write pending merges.
70
If None the compare latest revision with working tree
71
If one revision show compared it with working tree.
72
If two revisions show status between first and second.
74
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
75
specific_files, show_ids, to_file, show_pending, revision)
78
37
def show_tree_status(wt, show_unchanged=None,
79
38
specific_files=None,
85
46
"""Display summary of changes.
87
48
By default this compares the working tree to a previous revision.
144
106
_raise_if_nonexistent(specific_files, old, new)
107
want_unversioned = not versioned
146
changes = new._iter_changes(old, show_unchanged, specific_files,
147
require_versioned=False)
148
reporter = _mod_delta.ChangeReporter(old.inventory,
109
changes = new.iter_changes(old, show_unchanged, specific_files,
110
require_versioned=False, want_unversioned=want_unversioned)
111
reporter = _mod_delta._ChangeReporter(output_file=to_file,
112
unversioned_filter=new.is_ignored)
150
113
_mod_delta.report_changes(changes, reporter)
152
115
delta = new.changes_from(old, want_unchanged=show_unchanged,
153
specific_files=specific_files)
116
specific_files=specific_files,
117
want_unversioned=want_unversioned)
118
# filter out unknown files. We may want a tree method for
120
delta.unversioned = [unversioned for unversioned in
121
delta.unversioned if not new.is_ignored(unversioned[0])]
154
122
delta.show(to_file,
155
123
show_ids=show_ids,
156
124
show_unchanged=show_unchanged,
158
short_status_letter = '? '
160
short_status_letter = ''
161
list_paths('unknown', new.unknowns(), specific_files, to_file,
163
conflict_title = False
164
# show the new conflicts only for now. XXX: get them from the delta.
165
for conflict in new.conflicts():
166
if not short and conflict_title is False:
167
print >> to_file, "conflicts:"
168
conflict_title = True
126
# show the new conflicts only for now. XXX: get them from the
128
conflicts = new.conflicts()
129
if specific_files is not None:
130
conflicts = conflicts.select_conflicts(new, specific_files,
131
ignore_misses=True, recurse=True)[1]
132
if len(conflicts) > 0 and not short:
133
to_file.write("conflicts:\n")
134
for conflict in conflicts:
173
print >> to_file, "%s %s" % (prefix, conflict)
174
if new_is_working_tree and show_pending:
175
show_pending_merges(new, to_file, short)
139
to_file.write("%s %s\n" % (prefix, conflict))
140
if (new_is_working_tree and show_pending):
141
show_pending_merges(new, to_file, short, verbose=verbose)
182
def show_pending_merges(new, to_file, short=False):
149
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
150
"""Get an iterator which will return the revisions in merge sorted order.
152
This will build up a list of all nodes, such that only nodes in the list
153
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
156
:param revision_ids: A set of revision_ids
157
:param parent_map: The parent information for each node. Revisions which
158
are considered ghosts should not be present in the map.
159
:return: iterator from MergeSorter.iter_topo_order()
161
# MergeSorter requires that all nodes be present in the graph, so get rid
162
# of any references pointing outside of this graph.
164
for revision_id in revision_ids:
165
if revision_id not in parent_map: # ghost
166
parent_graph[revision_id] = []
168
# Only include parents which are in this sub-graph
169
parent_graph[revision_id] = [p for p in parent_map[revision_id]
170
if p in revision_ids]
171
sorter = tsort.MergeSorter(parent_graph, tip_revision)
172
return sorter.iter_topo_order()
175
def show_pending_merges(new, to_file, short=False, verbose=False):
183
176
"""Write out a display of pending merges in a working tree."""
184
177
parents = new.get_parent_ids()
185
178
if len(parents) < 2:
181
# we need one extra space for terminals that wrap on last char
182
term_width = osutils.terminal_width() - 1
187
190
pending = parents[1:]
188
191
branch = new.branch
189
192
last_revision = parents[0]
191
print >>to_file, 'pending merges:'
192
if last_revision is not None:
194
ignore = set(branch.repository.get_ancestry(last_revision))
195
except errors.NoSuchRevision:
196
# the last revision is a ghost : assume everything is new
198
ignore = set([None, last_revision])
201
# TODO: this could be improved using merge_sorted - we'd get the same
202
# output rather than one level of indent.
195
to_file.write('pending merges:\n')
197
to_file.write('pending merge tips: (use -v to see all merge revisions)\n')
198
graph = branch.repository.get_graph()
199
other_revisions = [last_revision]
200
log_formatter = log.LineLogFormatter(to_file)
203
201
for merge in pending:
206
from bzrlib.osutils import terminal_width
207
width = terminal_width()
208
m_revision = branch.repository.get_revision(merge)
213
print >> to_file, prefix, line_log(m_revision, width - 4)
214
inner_merges = branch.repository.get_ancestry(merge)
215
assert inner_merges[0] is None
217
inner_merges.reverse()
218
for mmerge in inner_merges:
221
mm_revision = branch.repository.get_revision(mmerge)
203
rev = branch.repository.get_revisions([merge])[0]
204
except errors.NoSuchRevision:
205
# If we are missing a revision, just print out the revision id
206
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
207
other_revisions.append(merge)
210
# Log the merge, as it gets a slightly different formatting
211
log_message = log_formatter.log_string(None, rev,
212
term_width - len(first_prefix))
213
to_file.write(first_prefix + log_message + '\n')
217
# Find all of the revisions in the merge source, which are not in the
218
# last committed revision.
219
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
220
other_revisions.append(merge)
221
merge_extra.discard(_mod_revision.NULL_REVISION)
223
# Get a handle to all of the revisions we will need
225
revisions = dict((rev.revision_id, rev) for rev in
226
branch.repository.get_revisions(merge_extra))
227
except errors.NoSuchRevision:
228
# One of the sub nodes is a ghost, check each one
230
for revision_id in merge_extra:
232
rev = branch.repository.get_revisions([revision_id])[0]
233
except errors.NoSuchRevision:
234
revisions[revision_id] = None
226
print >> to_file, prefix, line_log(mm_revision, width - 5)
228
except errors.NoSuchRevision:
233
print >> to_file, prefix, merge
235
def list_paths(header, paths, specific_files, to_file, short_status_letter=''):
238
if specific_files and not is_inside_any(specific_files, path):
240
if not short_status_letter and not done_header:
241
print >>to_file, '%s:' % header
243
print >>to_file, '%s %s' % (short_status_letter, path)
236
revisions[revision_id] = rev
238
# Display the revisions brought in by this merge.
239
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
240
branch.repository.get_parent_map(merge_extra))
241
# Skip the first node
242
num, first, depth, eom = rev_id_iterator.next()
244
raise AssertionError('Somehow we misunderstood how'
245
' iter_topo_order works %s != %s' % (first, merge))
246
for num, sub_merge, depth, eom in rev_id_iterator:
247
rev = revisions[sub_merge]
249
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
251
log_message = log_formatter.log_string(None,
252
revisions[sub_merge],
253
term_width - len(sub_prefix))
254
to_file.write(sub_prefix + log_message + '\n')
257
def _raise_if_nonexistent(paths, old_tree, new_tree):
258
"""Complain if paths are not in either inventory or tree.
260
It's OK with the files exist in either tree's inventory, or
261
if they exist in the tree but are not versioned.
263
This can be used by operations such as bzr status that can accept
264
unknown or ignored files.
266
mutter("check paths: %r", paths)
269
s = old_tree.filter_unversioned_files(paths)
270
s = new_tree.filter_unversioned_files(s)
271
s = [path for path in s if not new_tree.has_filename(path)]
273
raise errors.PathsDoNotExist(sorted(s))
added
removed
bzrlib/status.py
