25
revision as _mod_revision,
27
import bzrlib.errors as errors
19
from bzrlib.delta import compare_trees
20
from bzrlib.errors import NoSuchRevision
21
from bzrlib.log import line_log
28
22
from bzrlib.osutils import is_inside_any
29
from bzrlib.symbol_versioning import (deprecated_function,
31
from bzrlib.trace import mutter, warning
23
from bzrlib.symbol_versioning import *
33
25
# TODO: when showing single-line logs, truncate to the width of the terminal
34
26
# if known, but only if really going to the terminal (not into a file)
37
def show_tree_status(wt, show_unchanged=None,
29
@deprecated_function(zero_eight)
30
def show_status(branch, show_unchanged=False,
36
"""Display summary of changes.
38
Please use show_tree_status instead.
40
By default this compares the working tree to a previous revision.
41
If the revision argument is given, summarizes changes between the
42
working tree and another, or between two revisions.
44
The result is written out as Unicode and to_file should be able
48
If set, includes unchanged files.
51
If set, only show the status of files in this list.
54
If set, includes each file's id.
57
If set, write to this file (default stdout.)
60
If set, write pending merges.
63
If None the compare latest revision with working tree
64
If one revision show compared it with working tree.
65
If two revisions show status between first and second.
67
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
68
specific_files, show_ids, to_file, show_pending, revision)
71
def show_tree_status(wt, show_unchanged=False,
38
72
specific_files=None,
45
77
"""Display summary of changes.
47
79
By default this compares the working tree to a previous revision.
51
83
The result is written out as Unicode and to_file should be able
54
If showing the status of a working tree, extra information is included
55
about unknown files, conflicts, and pending merges.
57
:param show_unchanged: Deprecated parameter. If set, includes unchanged
59
:param specific_files: If set, a list of filenames whose status should be
60
shown. It is an error to give a filename that is not in the working
61
tree, or in the working inventory or in the basis inventory.
62
:param show_ids: If set, includes each file's id.
63
:param to_file: If set, write to this file (default stdout.)
64
:param show_pending: If set, write pending merges.
65
:param revision: If None, compare latest revision with working tree
66
If not None, it must be a RevisionSpec list.
67
If one revision, compare with working tree.
68
If two revisions, show status between first and second.
69
:param short: If True, gives short SVN-style status lines.
70
:param versioned: If True, only shows versioned files.
87
If set, includes unchanged files.
90
If set, only show the status of files in this list.
93
If set, includes each file's id.
96
If set, write to this file (default stdout.)
99
If set, write pending merges.
102
If None the compare latest revision with working tree
103
If one revision show compared it with working tree.
104
If two revisions show status between first and second.
72
if show_unchanged is not None:
73
warn("show_tree_status with show_unchanged has been deprecated "
74
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
77
107
to_file = sys.stdout
81
111
new_is_working_tree = True
82
112
if revision is None:
83
if wt.last_revision() != wt.branch.last_revision():
84
warning("working tree is out of date, run 'bzr update'")
86
114
old = new.basis_tree()
87
115
elif len(revision) > 0:
89
old = revision[0].as_tree(wt.branch)
90
except errors.NoSuchRevision, e:
91
raise errors.BzrCommandError(str(e))
117
rev_id = revision[0].in_history(wt.branch).rev_id
118
old = wt.branch.repository.revision_tree(rev_id)
119
except NoSuchRevision, e:
120
raise BzrCommandError(str(e))
92
121
if (len(revision) > 1) and (revision[1].spec is not None):
94
new = revision[1].as_tree(wt.branch)
123
rev_id = revision[1].in_history(wt.branch).rev_id
124
new = wt.branch.repository.revision_tree(rev_id)
95
125
new_is_working_tree = False
96
except errors.NoSuchRevision, e:
97
raise errors.BzrCommandError(str(e))
126
except NoSuchRevision, e:
127
raise BzrCommandError(str(e))
103
_raise_if_nonexistent(specific_files, old, new)
104
want_unversioned = not versioned
106
changes = new.iter_changes(old, show_unchanged, specific_files,
107
require_versioned=False, want_unversioned=want_unversioned)
108
reporter = _mod_delta._ChangeReporter(output_file=to_file,
109
unversioned_filter=new.is_ignored)
110
_mod_delta.report_changes(changes, reporter)
112
delta = new.changes_from(old, want_unchanged=show_unchanged,
113
specific_files=specific_files,
114
want_unversioned=want_unversioned)
115
# filter out unknown files. We may want a tree method for
117
delta.unversioned = [unversioned for unversioned in
118
delta.unversioned if not new.is_ignored(unversioned[0])]
121
show_unchanged=show_unchanged,
123
# show the new conflicts only for now. XXX: get them from the
125
conflicts = new.conflicts()
126
if specific_files is not None:
127
conflicts = conflicts.select_conflicts(new, specific_files,
128
ignore_misses=True, recurse=True)[1]
129
if len(conflicts) > 0 and not short:
130
to_file.write("conflicts:\n")
131
for conflict in conflicts:
136
to_file.write("%s %s\n" % (prefix, conflict))
137
if (new_is_working_tree and show_pending):
138
show_pending_merges(new, to_file, short)
131
delta = compare_trees(old, new, want_unchanged=show_unchanged,
132
specific_files=specific_files)
135
show_unchanged=show_unchanged)
137
if new_is_working_tree:
138
list_paths('unknown', new.unknowns(), specific_files, to_file)
139
list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
140
if new_is_working_tree and show_pending:
141
show_pending_merges(new, to_file)
146
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
147
"""Get an iterator which will return the revisions in merge sorted order.
149
This will build up a list of all nodes, such that only nodes in the list
150
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
153
:param revision_ids: A set of revision_ids
154
:param parent_map: The parent information for each node. Revisions which
155
are considered ghosts should not be present in the map.
156
:return: iterator from MergeSorter.iter_topo_order()
158
# MergeSorter requires that all nodes be present in the graph, so get rid
159
# of any references pointing outside of this graph.
161
for revision_id in revision_ids:
162
if revision_id not in parent_map: # ghost
163
parent_graph[revision_id] = []
165
# Only include parents which are in this sub-graph
166
parent_graph[revision_id] = [p for p in parent_map[revision_id]
167
if p in revision_ids]
168
sorter = tsort.MergeSorter(parent_graph, tip_revision)
169
return sorter.iter_topo_order()
172
def show_pending_merges(new, to_file, short=False):
145
def show_pending_merges(new, to_file):
173
146
"""Write out a display of pending merges in a working tree."""
174
parents = new.get_parent_ids()
147
pending = new.pending_merges()
149
if len(pending) == 0:
178
# we need one extra space for terminals that wrap on last char
179
term_width = osutils.terminal_width() - 1
151
print >>to_file, 'pending merges:'
152
last_revision = branch.last_revision()
153
if last_revision is not None:
154
ignore = set(branch.repository.get_ancestry(last_revision))
187
pending = parents[1:]
189
last_revision = parents[0]
191
to_file.write('pending merges:\n')
192
graph = branch.repository.get_graph()
193
other_revisions = [last_revision]
194
log_formatter = log.LineLogFormatter(to_file)
195
for merge in pending:
157
for merge in new.pending_merges():
197
rev = branch.repository.get_revisions([merge])[0]
198
except errors.NoSuchRevision:
199
# If we are missing a revision, just print out the revision id
200
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
201
other_revisions.append(merge)
160
m_revision = branch.repository.get_revision(merge)
161
print >> to_file, ' ', line_log(m_revision, 77)
162
inner_merges = branch.repository.get_ancestry(merge)
163
inner_merges.reverse()
164
for mmerge in inner_merges:
167
mm_revision = branch.repository.get_revision(mmerge)
168
print >> to_file, ' ', line_log(mm_revision, 75)
170
except NoSuchRevision:
171
print >> to_file, ' ', merge
173
def list_paths(header, paths, specific_files, to_file):
176
if specific_files and not is_inside_any(specific_files, path):
204
# Log the merge, as it gets a slightly different formatting
205
log_message = log_formatter.log_string(None, rev,
206
term_width - len(first_prefix))
207
to_file.write(first_prefix + log_message + '\n')
208
# Find all of the revisions in the merge source, which are not in the
209
# last committed revision.
210
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
211
other_revisions.append(merge)
212
merge_extra.discard(_mod_revision.NULL_REVISION)
214
# Get a handle to all of the revisions we will need
216
revisions = dict((rev.revision_id, rev) for rev in
217
branch.repository.get_revisions(merge_extra))
218
except errors.NoSuchRevision:
219
# One of the sub nodes is a ghost, check each one
221
for revision_id in merge_extra:
223
rev = branch.repository.get_revisions([revision_id])[0]
224
except errors.NoSuchRevision:
225
revisions[revision_id] = None
227
revisions[revision_id] = rev
229
# Display the revisions brought in by this merge.
230
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
231
branch.repository.get_parent_map(merge_extra))
232
# Skip the first node
233
num, first, depth, eom = rev_id_iterator.next()
235
raise AssertionError('Somehow we misunderstood how'
236
' iter_topo_order works %s != %s' % (first, merge))
237
for num, sub_merge, depth, eom in rev_id_iterator:
238
rev = revisions[sub_merge]
240
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
242
log_message = log_formatter.log_string(None,
243
revisions[sub_merge],
244
term_width - len(sub_prefix))
245
to_file.write(sub_prefix + log_message + '\n')
248
def _raise_if_nonexistent(paths, old_tree, new_tree):
249
"""Complain if paths are not in either inventory or tree.
251
It's OK with the files exist in either tree's inventory, or
252
if they exist in the tree but are not versioned.
254
This can be used by operations such as bzr status that can accept
255
unknown or ignored files.
257
mutter("check paths: %r", paths)
260
s = old_tree.filter_unversioned_files(paths)
261
s = new_tree.filter_unversioned_files(s)
262
s = [path for path in s if not new_tree.has_filename(path)]
264
raise errors.PathsDoNotExist(sorted(s))
179
print >>to_file, '%s:' % header
181
print >>to_file, ' ', path
added
removed
bzrlib/status.py
