19
from bzrlib.delta import compare_trees
25
revision as _mod_revision,
20
27
from bzrlib.diff import _raise_if_nonexistent
21
from bzrlib.errors import NoSuchRevision
22
from bzrlib.log import line_log
28
import bzrlib.errors as errors
23
29
from bzrlib.osutils import is_inside_any
24
from bzrlib.symbol_versioning import *
30
from bzrlib.symbol_versioning import (deprecated_function,
32
from bzrlib.trace import warning
26
34
# TODO: when showing single-line logs, truncate to the width of the terminal
27
35
# if known, but only if really going to the terminal (not into a file)
30
@deprecated_function(zero_eight)
31
def show_status(branch, show_unchanged=False,
37
"""Display summary of changes.
39
Please use show_tree_status instead.
41
By default this compares the working tree to a previous revision.
42
If the revision argument is given, summarizes changes between the
43
working tree and another, or between two revisions.
45
The result is written out as Unicode and to_file should be able
49
If set, includes unchanged files.
52
If set, only show the status of files in this list.
55
If set, includes each file's id.
58
If set, write to this file (default stdout.)
61
If set, write pending merges.
64
If None the compare latest revision with working tree
65
If one revision show compared it with working tree.
66
If two revisions show status between first and second.
68
show_tree_status(branch.bzrdir.open_workingtree(), show_unchanged,
69
specific_files, show_ids, to_file, show_pending, revision)
72
def show_tree_status(wt, show_unchanged=False,
38
def show_tree_status(wt, show_unchanged=None,
73
39
specific_files=None,
78
46
"""Display summary of changes.
80
48
By default this compares the working tree to a previous revision.
87
55
If showing the status of a working tree, extra information is included
88
56
about unknown files, conflicts, and pending merges.
91
If set, includes unchanged files.
94
If set, a list of filenames whose status should be shown.
95
It is an error to give a filename that is not in the working
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
96
62
tree, or in the working inventory or in the basis inventory.
99
If set, includes each file's id.
102
If set, write to this file (default stdout.)
105
If set, write pending merges.
108
If None the compare latest revision with working tree
109
If one revision show compared it with working tree.
110
If two revisions show status between first and second.
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 versioned: If True, only shows versioned files.
73
if show_unchanged is not None:
74
warn("show_tree_status with show_unchanged has been deprecated "
75
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
113
78
to_file = sys.stdout
117
82
new_is_working_tree = True
118
83
if revision is None:
84
if wt.last_revision() != wt.branch.last_revision():
85
warning("working tree is out of date, run 'bzr update'")
120
87
old = new.basis_tree()
121
88
elif len(revision) > 0:
123
rev_id = revision[0].in_history(wt.branch).rev_id
90
rev_id = revision[0].as_revision_id(wt.branch)
124
91
old = wt.branch.repository.revision_tree(rev_id)
125
except NoSuchRevision, e:
126
raise BzrCommandError(str(e))
92
except errors.NoSuchRevision, e:
93
raise errors.BzrCommandError(str(e))
127
94
if (len(revision) > 1) and (revision[1].spec is not None):
129
rev_id = revision[1].in_history(wt.branch).rev_id
96
rev_id = revision[1].as_revision_id(wt.branch)
130
97
new = wt.branch.repository.revision_tree(rev_id)
131
98
new_is_working_tree = False
132
except NoSuchRevision, e:
133
raise BzrCommandError(str(e))
99
except errors.NoSuchRevision, e:
100
raise errors.BzrCommandError(str(e))
136
_raise_if_nonexistent(specific_files, old, new)
137
delta = compare_trees(old, new, want_unchanged=show_unchanged,
138
specific_files=specific_files)
141
show_unchanged=show_unchanged)
143
if new_is_working_tree:
144
list_paths('unknown', new.unknowns(), specific_files, to_file)
145
conflict_title = False
146
for conflict in wt.conflicts():
147
if conflict_title is False:
148
print >> to_file, "conflicts:"
149
conflict_title = True
150
print >> to_file, " %s" % conflict
151
if new_is_working_tree and show_pending:
152
show_pending_merges(new, to_file)
106
_raise_if_nonexistent(specific_files, old, new)
107
want_unversioned = not versioned
109
changes = new.iter_changes(old, show_unchanged, specific_files,
110
require_versioned=False, want_unversioned=want_unversioned)
111
reporter = _mod_delta._ChangeReporter(output_file=to_file,
112
unversioned_filter=new.is_ignored)
113
_mod_delta.report_changes(changes, reporter)
115
delta = new.changes_from(old, want_unchanged=show_unchanged,
116
specific_files=specific_files,
117
want_unversioned=want_unversioned)
118
# filter out unknown files. We may want a tree method for
120
delta.unversioned = [unversioned for unversioned in
121
delta.unversioned if not new.is_ignored(unversioned[0])]
124
show_unchanged=show_unchanged,
126
# show the new conflicts only for now. XXX: get them from the
128
conflicts = new.conflicts()
129
if specific_files is not None:
130
conflicts = conflicts.select_conflicts(new, specific_files,
131
ignore_misses=True, recurse=True)[1]
132
if len(conflicts) > 0 and not short:
133
to_file.write("conflicts:\n")
134
for conflict in conflicts:
139
to_file.write("%s %s\n" % (prefix, conflict))
140
if (new_is_working_tree and show_pending):
141
show_pending_merges(new, to_file, short)
156
def show_pending_merges(new, to_file):
149
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
150
"""Get an iterator which will return the revisions in merge sorted order.
152
This will build up a list of all nodes, such that only nodes in the list
153
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
156
:param revision_ids: A set of revision_ids
157
:param parent_map: The parent information for each node. Revisions which
158
are considered ghosts should not be present in the map.
159
:return: iterator from MergeSorter.iter_topo_order()
161
# MergeSorter requires that all nodes be present in the graph, so get rid
162
# of any references pointing outside of this graph.
164
for revision_id in revision_ids:
165
if revision_id not in parent_map: # ghost
166
parent_graph[revision_id] = []
168
# Only include parents which are in this sub-graph
169
parent_graph[revision_id] = [p for p in parent_map[revision_id]
170
if p in revision_ids]
171
sorter = tsort.MergeSorter(parent_graph, tip_revision)
172
return sorter.iter_topo_order()
175
def show_pending_merges(new, to_file, short=False):
157
176
"""Write out a display of pending merges in a working tree."""
158
pending = new.pending_merges()
160
if len(pending) == 0:
177
parents = new.get_parent_ids()
162
print >>to_file, 'pending merges:'
163
last_revision = branch.last_revision()
164
if last_revision is not None:
165
ignore = set(branch.repository.get_ancestry(last_revision))
181
# we need one extra space for terminals that wrap on last char
182
term_width = osutils.terminal_width() - 1
168
for merge in new.pending_merges():
190
pending = parents[1:]
192
last_revision = parents[0]
194
to_file.write('pending merges:\n')
195
graph = branch.repository.get_graph()
196
other_revisions = [last_revision]
197
log_formatter = log.LineLogFormatter(to_file)
198
for merge in pending:
171
m_revision = branch.repository.get_revision(merge)
172
print >> to_file, ' ', line_log(m_revision, 77)
173
inner_merges = branch.repository.get_ancestry(merge)
174
assert inner_merges[0] == None
176
inner_merges.reverse()
177
for mmerge in inner_merges:
180
mm_revision = branch.repository.get_revision(mmerge)
181
print >> to_file, ' ', line_log(mm_revision, 75)
183
except NoSuchRevision:
184
print >> to_file, ' ', merge
186
def list_paths(header, paths, specific_files, to_file):
189
if specific_files and not is_inside_any(specific_files, path):
200
rev = branch.repository.get_revisions([merge])[0]
201
except errors.NoSuchRevision:
202
# If we are missing a revision, just print out the revision id
203
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
204
other_revisions.append(merge)
192
print >>to_file, '%s:' % header
194
print >>to_file, ' ', path
207
# Log the merge, as it gets a slightly different formatting
208
log_message = log_formatter.log_string(None, rev,
209
term_width - len(first_prefix))
210
to_file.write(first_prefix + log_message + '\n')
211
# Find all of the revisions in the merge source, which are not in the
212
# last committed revision.
213
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
214
other_revisions.append(merge)
215
merge_extra.discard(_mod_revision.NULL_REVISION)
217
# Get a handle to all of the revisions we will need
219
revisions = dict((rev.revision_id, rev) for rev in
220
branch.repository.get_revisions(merge_extra))
221
except errors.NoSuchRevision:
222
# One of the sub nodes is a ghost, check each one
224
for revision_id in merge_extra:
226
rev = branch.repository.get_revisions([revision_id])[0]
227
except errors.NoSuchRevision:
228
revisions[revision_id] = None
230
revisions[revision_id] = rev
232
# Display the revisions brought in by this merge.
233
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
234
branch.repository.get_parent_map(merge_extra))
235
# Skip the first node
236
num, first, depth, eom = rev_id_iterator.next()
238
raise AssertionError('Somehow we misunderstood how'
239
' iter_topo_order works %s != %s' % (first, merge))
240
for num, sub_merge, depth, eom in rev_id_iterator:
241
rev = revisions[sub_merge]
243
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
245
log_message = log_formatter.log_string(None,
246
revisions[sub_merge],
247
term_width - len(sub_prefix))
248
to_file.write(sub_prefix + log_message + '\n')
added
removed
bzrlib/status.py
