1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import sys
from bzrlib import (
delta as _mod_delta,
log,
osutils,
tree,
tsort,
revision as _mod_revision,
)
import bzrlib.errors as errors
from bzrlib.osutils import is_inside_any
from bzrlib.symbol_versioning import (deprecated_function,
)
from bzrlib.trace import mutter, warning
# TODO: when showing single-line logs, truncate to the width of the terminal
# if known, but only if really going to the terminal (not into a file)
def show_tree_status(wt, show_unchanged=None,
specific_files=None,
show_ids=False,
to_file=None,
show_pending=True,
revision=None,
short=False,
verbose=False,
versioned=False):
"""Display summary of changes.
By default this compares the working tree to a previous revision.
If the revision argument is given, summarizes changes between the
working tree and another, or between two revisions.
The result is written out as Unicode and to_file should be able
to encode that.
If showing the status of a working tree, extra information is included
about unknown files, conflicts, and pending merges.
:param show_unchanged: Deprecated parameter. If set, includes unchanged
files.
:param specific_files: If set, a list of filenames whose status should be
shown. It is an error to give a filename that is not in the working
tree, or in the working inventory or in the basis inventory.
:param show_ids: If set, includes each file's id.
:param to_file: If set, write to this file (default stdout.)
:param show_pending: If set, write pending merges.
:param revision: If None, compare latest revision with working tree
If not None, it must be a RevisionSpec list.
If one revision, compare with working tree.
If two revisions, show status between first and second.
:param short: If True, gives short SVN-style status lines.
:param verbose: If True, show all merged revisions, not just
the merge tips
:param versioned: If True, only shows versioned files.
"""
if show_unchanged is not None:
warn("show_tree_status with show_unchanged has been deprecated "
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
if to_file is None:
to_file = sys.stdout
wt.lock_read()
try:
new_is_working_tree = True
if revision is None:
if wt.last_revision() != wt.branch.last_revision():
warning("working tree is out of date, run 'bzr update'")
new = wt
old = new.basis_tree()
elif len(revision) > 0:
try:
old = revision[0].as_tree(wt.branch)
except errors.NoSuchRevision, e:
raise errors.BzrCommandError(str(e))
if (len(revision) > 1) and (revision[1].spec is not None):
try:
new = revision[1].as_tree(wt.branch)
new_is_working_tree = False
except errors.NoSuchRevision, e:
raise errors.BzrCommandError(str(e))
else:
new = wt
old.lock_read()
new.lock_read()
try:
specific_files, nonexistents \
= _filter_nonexistent(specific_files, old, new)
want_unversioned = not versioned
if short:
changes = new.iter_changes(old, show_unchanged, specific_files,
require_versioned=False, want_unversioned=want_unversioned)
reporter = _mod_delta._ChangeReporter(output_file=to_file,
unversioned_filter=new.is_ignored)
_mod_delta.report_changes(changes, reporter)
else:
delta = new.changes_from(old, want_unchanged=show_unchanged,
specific_files=specific_files,
want_unversioned=want_unversioned)
# filter out unknown files. We may want a tree method for
# this
delta.unversioned = [unversioned for unversioned in
delta.unversioned if not new.is_ignored(unversioned[0])]
delta.show(to_file,
show_ids=show_ids,
show_unchanged=show_unchanged,
short_status=False)
# show the new conflicts only for now. XXX: get them from the
# delta.
conflicts = new.conflicts()
if specific_files is not None:
conflicts = conflicts.select_conflicts(new, specific_files,
ignore_misses=True, recurse=True)[1]
if len(conflicts) > 0 and not short:
to_file.write("conflicts:\n")
for conflict in conflicts:
if short:
prefix = 'C '
else:
prefix = ' '
to_file.write("%s %s\n" % (prefix, conflict))
# Show files that were requested but don't exist (and are
# not versioned). We don't involve delta in this; these
# paths are really the province of just the status
# command, since they have more to do with how it was
# invoked than with the tree it's operating on.
if nonexistents and not short:
to_file.write("nonexistent:\n")
for nonexistent in nonexistents:
# We could calculate prefix outside the loop but, given
# how rarely this ought to happen, it's OK and arguably
# slightly faster to do it here (ala conflicts above)
if short:
prefix = 'X '
else:
prefix = ' '
to_file.write("%s %s\n" % (prefix, nonexistent))
if (new_is_working_tree and show_pending):
show_pending_merges(new, to_file, short, verbose=verbose)
if nonexistents:
raise errors.PathsDoNotExist(nonexistents)
finally:
old.unlock()
new.unlock()
finally:
wt.unlock()
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
"""Get an iterator which will return the revisions in merge sorted order.
This will build up a list of all nodes, such that only nodes in the list
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
order.
:param revision_ids: A set of revision_ids
:param parent_map: The parent information for each node. Revisions which
are considered ghosts should not be present in the map.
:return: iterator from MergeSorter.iter_topo_order()
"""
# MergeSorter requires that all nodes be present in the graph, so get rid
# of any references pointing outside of this graph.
parent_graph = {}
for revision_id in revision_ids:
if revision_id not in parent_map: # ghost
parent_graph[revision_id] = []
else:
# Only include parents which are in this sub-graph
parent_graph[revision_id] = [p for p in parent_map[revision_id]
if p in revision_ids]
sorter = tsort.MergeSorter(parent_graph, tip_revision)
return sorter.iter_topo_order()
def show_pending_merges(new, to_file, short=False, verbose=False):
"""Write out a display of pending merges in a working tree."""
parents = new.get_parent_ids()
if len(parents) < 2:
return
term_width = osutils.terminal_width()
if term_width is not None:
# we need one extra space for terminals that wrap on last char
term_width = term_width - 1
if short:
first_prefix = 'P '
sub_prefix = 'P. '
else:
first_prefix = ' '
sub_prefix = ' '
def show_log_message(rev, prefix):
if term_width is None:
width = term_width
else:
width = term_width - len(prefix)
log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
to_file.write(log_message + '\n')
pending = parents[1:]
branch = new.branch
last_revision = parents[0]
if not short:
if verbose:
to_file.write('pending merges:\n')
else:
to_file.write('pending merge tips:'
' (use -v to see all merge revisions)\n')
graph = branch.repository.get_graph()
other_revisions = [last_revision]
log_formatter = log.LineLogFormatter(to_file)
for merge in pending:
try:
rev = branch.repository.get_revisions([merge])[0]
except errors.NoSuchRevision:
# If we are missing a revision, just print out the revision id
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
other_revisions.append(merge)
continue
# Log the merge, as it gets a slightly different formatting
show_log_message(rev, first_prefix)
if not verbose:
continue
# Find all of the revisions in the merge source, which are not in the
# last committed revision.
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
other_revisions.append(merge)
merge_extra.discard(_mod_revision.NULL_REVISION)
# Get a handle to all of the revisions we will need
try:
revisions = dict((rev.revision_id, rev) for rev in
branch.repository.get_revisions(merge_extra))
except errors.NoSuchRevision:
# One of the sub nodes is a ghost, check each one
revisions = {}
for revision_id in merge_extra:
try:
rev = branch.repository.get_revisions([revision_id])[0]
except errors.NoSuchRevision:
revisions[revision_id] = None
else:
revisions[revision_id] = rev
# Display the revisions brought in by this merge.
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
branch.repository.get_parent_map(merge_extra))
# Skip the first node
num, first, depth, eom = rev_id_iterator.next()
if first != merge:
raise AssertionError('Somehow we misunderstood how'
' iter_topo_order works %s != %s' % (first, merge))
for num, sub_merge, depth, eom in rev_id_iterator:
rev = revisions[sub_merge]
if rev is None:
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
continue
show_log_message(revisions[sub_merge], sub_prefix)
def _filter_nonexistent(orig_paths, old_tree, new_tree):
"""Convert orig_paths to two sorted lists and return them.
The first is orig_paths paths minus the items in the second list,
and the second list is paths that are not in either inventory or
tree (they don't qualify if they exist in the tree's inventory, or
if they exist in the tree but are not versioned.)
If either of the two lists is empty, return it as an empty list.
This can be used by operations such as bzr status that can accept
unknown or ignored files.
"""
mutter("check paths: %r", orig_paths)
if not orig_paths:
return orig_paths, []
s = old_tree.filter_unversioned_files(orig_paths)
s = new_tree.filter_unversioned_files(s)
nonexistent = [path for path in s if not new_tree.has_filename(path)]
remaining = [path for path in orig_paths if not path in nonexistent]
# Sorting the 'remaining' list doesn't have much effect in
# practice, since the various status output sections will sort
# their groups individually. But for consistency of this
# function's API, it's better to sort both than just 'nonexistent'.
return sorted(remaining), sorted(nonexistent)
|