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
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
By default this compares the working tree to a previous revision.
88
If the revision argument is given, summarizes changes between the
48
By default this compares the working tree to a previous revision.
49
If the revision argument is given, summarizes changes between the
89
50
working tree and another, or between two revisions.
91
The result is written out as Unicode and to_file should be able
52
The result is written out as Unicode and to_file should be able
94
55
If showing the status of a working tree, extra information is included
95
56
about unknown files, conflicts, and pending merges.
97
:param show_unchanged: Deprecated parameter. If set, includes unchanged
58
:param show_unchanged: Deprecated parameter. If set, includes unchanged
99
60
:param specific_files: If set, a list of filenames whose status should be
100
shown. It is an error to give a filename that is not in the working
61
shown. It is an error to give a filename that is not in the working
101
62
tree, or in the working inventory or in the basis inventory.
102
63
:param show_ids: If set, includes each file's id.
103
64
:param to_file: If set, write to this file (default stdout.)
104
65
:param show_pending: If set, write pending merges.
105
:param revision: If None the compare latest revision with working tree
106
If not None it must be a RevisionSpec list.
107
If one revision show compared it with working tree.
108
If two revisions show status between first and second.
109
:param short: If True, gives short SVN-style status lines
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.
70
:param short: If True, gives short SVN-style status lines.
71
:param verbose: If True, show all merged revisions, not just
73
:param versioned: If True, only shows versioned files.
111
75
if show_unchanged is not None:
112
warn("show_status_trees with show_unchanged has been deprecated "
76
warn("show_tree_status with show_unchanged has been deprecated "
113
77
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
115
79
if to_file is None:
116
80
to_file = sys.stdout
120
84
new_is_working_tree = True
144
_raise_if_nonexistent(specific_files, old, new)
106
specific_files, nonexistents \
107
= _filter_nonexistent(specific_files, old, new)
108
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,
110
changes = new.iter_changes(old, show_unchanged, specific_files,
111
require_versioned=False, want_unversioned=want_unversioned)
112
reporter = _mod_delta._ChangeReporter(output_file=to_file,
113
unversioned_filter=new.is_ignored)
150
114
_mod_delta.report_changes(changes, reporter)
152
116
delta = new.changes_from(old, want_unchanged=show_unchanged,
153
specific_files=specific_files)
117
specific_files=specific_files,
118
want_unversioned=want_unversioned)
119
# filter out unknown files. We may want a tree method for
121
delta.unversioned = [unversioned for unversioned in
122
delta.unversioned if not new.is_ignored(unversioned[0])]
154
123
delta.show(to_file,
155
124
show_ids=show_ids,
156
125
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
127
# show the new conflicts only for now. XXX: get them from the
129
conflicts = new.conflicts()
130
if specific_files is not None:
131
conflicts = conflicts.select_conflicts(new, specific_files,
132
ignore_misses=True, recurse=True)[1]
133
if len(conflicts) > 0 and not short:
134
to_file.write("conflicts:\n")
135
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)
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)
160
raise errors.PathsDoNotExist(nonexistents)
182
def show_pending_merges(new, to_file, short=False):
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):
183
195
"""Write out a display of pending merges in a working tree."""
184
196
parents = new.get_parent_ids()
185
197
if len(parents) < 2:
200
# we need one extra space for terminals that wrap on last char
201
term_width = osutils.terminal_width() - 1
187
209
pending = parents[1:]
188
210
branch = new.branch
189
211
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.
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)
203
220
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)
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
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)
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)
added
removed
bzrlib/status.py
