25
25
revision as _mod_revision,
27
from bzrlib.diff import _raise_if_nonexistent
28
27
import bzrlib.errors as errors
29
28
from bzrlib.osutils import is_inside_any
30
29
from bzrlib.symbol_versioning import (deprecated_function,
32
from bzrlib.trace import warning
31
from bzrlib.trace import mutter, warning
34
33
# TODO: when showing single-line logs, truncate to the width of the terminal
35
34
# if known, but only if really going to the terminal (not into a file)
46
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
48
By default this compares the working tree to a previous revision.
49
If the revision argument is given, summarizes changes between the
50
50
working tree and another, or between two revisions.
52
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
55
55
If showing the status of a working tree, extra information is included
56
56
about unknown files, conflicts, and pending merges.
58
:param show_unchanged: Deprecated parameter. If set, includes unchanged
58
:param show_unchanged: Deprecated parameter. If set, includes unchanged
60
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
61
shown. It is an error to give a filename that is not in the working
62
62
tree, or in the working inventory or in the basis inventory.
63
63
:param show_ids: If set, includes each file's id.
64
64
:param to_file: If set, write to this file (default stdout.)
68
68
If one revision, compare with working tree.
69
69
If two revisions, show status between first and second.
70
70
:param short: If True, gives short SVN-style status lines.
71
:param verbose: If True, show all merged revisions, not just
71
73
:param versioned: If True, only shows versioned files.
73
75
if show_unchanged is not None:
87
89
old = new.basis_tree()
88
90
elif len(revision) > 0:
90
rev_id = revision[0].as_revision_id(wt.branch)
91
old = wt.branch.repository.revision_tree(rev_id)
92
old = revision[0].as_tree(wt.branch)
92
93
except errors.NoSuchRevision, e:
93
94
raise errors.BzrCommandError(str(e))
94
95
if (len(revision) > 1) and (revision[1].spec is not None):
96
rev_id = revision[1].as_revision_id(wt.branch)
97
new = wt.branch.repository.revision_tree(rev_id)
97
new = revision[1].as_tree(wt.branch)
98
98
new_is_working_tree = False
99
99
except errors.NoSuchRevision, e:
100
100
raise errors.BzrCommandError(str(e))
106
_raise_if_nonexistent(specific_files, old, new)
106
specific_files, nonexistents \
107
= _filter_nonexistent(specific_files, old, new)
107
108
want_unversioned = not versioned
109
110
changes = new.iter_changes(old, show_unchanged, specific_files,
139
140
to_file.write("%s %s\n" % (prefix, conflict))
140
if (new_is_working_tree and show_pending
141
and specific_files is None):
142
show_pending_merges(new, to_file, short)
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)
163
raise errors.PathsDoNotExist(nonexistents)
173
191
return sorter.iter_topo_order()
176
def show_pending_merges(new, to_file, short=False):
194
def show_pending_merges(new, to_file, short=False, verbose=False):
177
195
"""Write out a display of pending merges in a working tree."""
178
196
parents = new.get_parent_ids()
179
197
if len(parents) < 2:
192
210
branch = new.branch
193
211
last_revision = parents[0]
195
to_file.write('pending merges:\n')
214
to_file.write('pending merges:\n')
216
to_file.write('pending merge tips: (use -v to see all merge revisions)\n')
196
217
graph = branch.repository.get_graph()
197
218
other_revisions = [last_revision]
198
219
log_formatter = log.LineLogFormatter(to_file)
209
230
log_message = log_formatter.log_string(None, rev,
210
231
term_width - len(first_prefix))
211
232
to_file.write(first_prefix + log_message + '\n')
212
236
# Find all of the revisions in the merge source, which are not in the
213
237
# last committed revision.
214
238
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
247
271
revisions[sub_merge],
248
272
term_width - len(sub_prefix))
249
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
