1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
25
revision as _mod_revision,
27
import bzrlib.errors as errors
28
from bzrlib.osutils import is_inside_any
29
from bzrlib.symbol_versioning import (deprecated_function,
31
from bzrlib.trace import mutter, warning
33
# TODO: when showing single-line logs, truncate to the width of the terminal
34
# if known, but only if really going to the terminal (not into a file)
37
def show_tree_status(wt, show_unchanged=None,
46
"""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
50
working tree and another, or between two revisions.
52
The result is written out as Unicode and to_file should be able
55
If showing the status of a working tree, extra information is included
56
about unknown files, conflicts, and pending merges.
58
:param show_unchanged: Deprecated parameter. If set, includes unchanged
60
: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
62
tree, or in the working inventory or in the basis inventory.
63
:param show_ids: If set, includes each file's id.
64
:param to_file: If set, write to this file (default stdout.)
65
: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.
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.
75
if show_unchanged is not None:
76
warn("show_tree_status with show_unchanged has been deprecated "
77
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
84
new_is_working_tree = True
86
if wt.last_revision() != wt.branch.last_revision():
87
warning("working tree is out of date, run 'bzr update'")
89
old = new.basis_tree()
90
elif len(revision) > 0:
92
old = revision[0].as_tree(wt.branch)
93
except errors.NoSuchRevision, e:
94
raise errors.BzrCommandError(str(e))
95
if (len(revision) > 1) and (revision[1].spec is not None):
97
new = revision[1].as_tree(wt.branch)
98
new_is_working_tree = False
99
except errors.NoSuchRevision, e:
100
raise errors.BzrCommandError(str(e))
106
specific_files, nonexistents \
107
= _filter_nonexistent(specific_files, old, new)
108
want_unversioned = not versioned
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)
114
_mod_delta.report_changes(changes, reporter)
116
delta = new.changes_from(old, want_unchanged=show_unchanged,
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])]
125
show_unchanged=show_unchanged,
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:
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:
153
to_file.write("%s %s\n" % (prefix, nonexistent))
154
if (new_is_working_tree and show_pending):
155
show_pending_merges(new, to_file, short, verbose=verbose)
160
raise errors.PathsDoNotExist(nonexistents)
165
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
166
"""Get an iterator which will return the revisions in merge sorted order.
168
This will build up a list of all nodes, such that only nodes in the list
169
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
172
:param revision_ids: A set of revision_ids
173
:param parent_map: The parent information for each node. Revisions which
174
are considered ghosts should not be present in the map.
175
:return: iterator from MergeSorter.iter_topo_order()
177
# MergeSorter requires that all nodes be present in the graph, so get rid
178
# of any references pointing outside of this graph.
180
for revision_id in revision_ids:
181
if revision_id not in parent_map: # ghost
182
parent_graph[revision_id] = []
184
# Only include parents which are in this sub-graph
185
parent_graph[revision_id] = [p for p in parent_map[revision_id]
186
if p in revision_ids]
187
sorter = tsort.MergeSorter(parent_graph, tip_revision)
188
return sorter.iter_topo_order()
191
def show_pending_merges(new, to_file, short=False, verbose=False):
192
"""Write out a display of pending merges in a working tree."""
193
parents = new.get_parent_ids()
197
# we need one extra space for terminals that wrap on last char
198
term_width = osutils.terminal_width() - 1
206
pending = parents[1:]
208
last_revision = parents[0]
211
to_file.write('pending merges:\n')
213
to_file.write('pending merge tips: (use -v to see all merge revisions)\n')
214
graph = branch.repository.get_graph()
215
other_revisions = [last_revision]
216
log_formatter = log.LineLogFormatter(to_file)
217
for merge in pending:
219
rev = branch.repository.get_revisions([merge])[0]
220
except errors.NoSuchRevision:
221
# If we are missing a revision, just print out the revision id
222
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
223
other_revisions.append(merge)
226
# Log the merge, as it gets a slightly different formatting
227
log_message = log_formatter.log_string(None, rev,
228
term_width - len(first_prefix))
229
to_file.write(first_prefix + log_message + '\n')
233
# Find all of the revisions in the merge source, which are not in the
234
# last committed revision.
235
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
236
other_revisions.append(merge)
237
merge_extra.discard(_mod_revision.NULL_REVISION)
239
# Get a handle to all of the revisions we will need
241
revisions = dict((rev.revision_id, rev) for rev in
242
branch.repository.get_revisions(merge_extra))
243
except errors.NoSuchRevision:
244
# One of the sub nodes is a ghost, check each one
246
for revision_id in merge_extra:
248
rev = branch.repository.get_revisions([revision_id])[0]
249
except errors.NoSuchRevision:
250
revisions[revision_id] = None
252
revisions[revision_id] = rev
254
# Display the revisions brought in by this merge.
255
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
256
branch.repository.get_parent_map(merge_extra))
257
# Skip the first node
258
num, first, depth, eom = rev_id_iterator.next()
260
raise AssertionError('Somehow we misunderstood how'
261
' iter_topo_order works %s != %s' % (first, merge))
262
for num, sub_merge, depth, eom in rev_id_iterator:
263
rev = revisions[sub_merge]
265
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
267
log_message = log_formatter.log_string(None,
268
revisions[sub_merge],
269
term_width - len(sub_prefix))
270
to_file.write(sub_prefix + log_message + '\n')
273
def _filter_nonexistent(orig_paths, old_tree, new_tree):
274
"""Convert orig_paths to two sorted lists and return them.
276
The first is orig_paths paths minus the items in the second list,
277
and the second list is paths that are not in either inventory or
278
tree (they don't qualify if they exist in the tree's inventory, or
279
if they exist in the tree but are not versioned.)
281
If either of the two lists is empty, return it as an empty list.
283
This can be used by operations such as bzr status that can accept
284
unknown or ignored files.
286
mutter("check paths: %r", orig_paths)
288
return orig_paths, []
289
s = old_tree.filter_unversioned_files(orig_paths)
290
s = new_tree.filter_unversioned_files(s)
291
nonexistent = [path for path in s if not new_tree.has_filename(path)]
292
remaining = [path for path in orig_paths if not path in nonexistent]
293
# Sorting the 'remaining' list doesn't have much effect in
294
# practice, since the various status output sections will sort
295
# their groups individually. But for consistency of this
296
# function's API, it's better to sort both than just 'nonexistent'.
297
return sorted(remaining), sorted(nonexistent)
added
removed
bzrlib/status.py
