15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25
revision as _mod_revision,
27
from bzrlib.diff import _raise_if_nonexistent
28
import bzrlib.errors as errors
29
18
from bzrlib.osutils import is_inside_any
30
from bzrlib.symbol_versioning import (deprecated_function,
32
from bzrlib.trace import warning
34
# TODO: when showing single-line logs, truncate to the width of the terminal
35
# if known, but only if really going to the terminal (not into a file)
38
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 versioned: If True, only shows versioned files.
19
from bzrlib.delta import compare_trees
20
from bzrlib.log import line_log
21
from bzrlib.errors import NoSuchRevision
24
def show_status(branch, show_unchanged=False,
30
"""Display status for non-ignored working files.
33
If set, includes unchanged files.
36
If set, only show the status of files in this list.
39
If set, includes each file's id.
42
If set, write to this file (default stdout.)
45
If set, write pending merges.
48
If None the compare latest revision with working tree
49
If one revision show compared it with working tree.
50
If two revisions show status between first and second.
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)
78
53
to_file = sys.stdout
82
57
new_is_working_tree = True
83
58
if revision is None:
84
if wt.last_revision() != wt.branch.last_revision():
85
warning("working tree is out of date, run 'bzr update'")
87
old = new.basis_tree()
59
old = branch.basis_tree()
60
new = branch.working_tree()
88
61
elif len(revision) > 0:
90
rev_id = revision[0].as_revision_id(wt.branch)
91
old = wt.branch.repository.revision_tree(rev_id)
92
except errors.NoSuchRevision, e:
93
raise errors.BzrCommandError(str(e))
94
if (len(revision) > 1) and (revision[1].spec is not None):
63
rev_id = revision[0].in_history(branch).rev_id
64
old = branch.revision_tree(rev_id)
65
except NoSuchRevision, e:
66
raise BzrCommandError(str(e))
96
rev_id = revision[1].as_revision_id(wt.branch)
97
new = wt.branch.repository.revision_tree(rev_id)
69
rev_id = revision[1].in_history(branch).rev_id
70
new = branch.revision_tree(rev_id)
98
71
new_is_working_tree = False
99
except errors.NoSuchRevision, e:
100
raise errors.BzrCommandError(str(e))
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:
72
except NoSuchRevision, e:
73
raise BzrCommandError(str(e))
75
new = branch.working_tree()
78
delta = compare_trees(old, new, want_unchanged=show_unchanged,
79
specific_files=specific_files)
83
show_unchanged=show_unchanged)
85
if new_is_working_tree:
86
conflicts = new.iter_conflicts()
87
unknowns = new.unknowns()
88
list_paths('unknown', unknowns, specific_files, to_file)
89
list_paths('conflicts', conflicts, specific_files, to_file)
90
if show_pending and len(new.pending_merges()) > 0:
91
print >>to_file, 'pending merges:'
92
last_revision = branch.last_revision()
93
if last_revision is not None:
94
ignore = set(branch.get_ancestry(last_revision))
139
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)
97
for merge in new.pending_merges():
100
m_revision = branch.get_revision(merge)
101
print >> to_file, ' ', line_log(m_revision, 77)
102
inner_merges = branch.get_ancestry(merge)
103
inner_merges.reverse()
104
for mmerge in inner_merges:
107
mm_revision = branch.get_revision(mmerge)
108
print >> to_file, ' ', line_log(mm_revision, 75)
111
except NoSuchRevision:
112
print >> to_file, ' ', merge
150
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
151
"""Get an iterator which will return the revisions in merge sorted order.
153
This will build up a list of all nodes, such that only nodes in the list
154
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
157
:param revision_ids: A set of revision_ids
158
:param parent_map: The parent information for each node. Revisions which
159
are considered ghosts should not be present in the map.
160
:return: iterator from MergeSorter.iter_topo_order()
162
# MergeSorter requires that all nodes be present in the graph, so get rid
163
# of any references pointing outside of this graph.
165
for revision_id in revision_ids:
166
if revision_id not in parent_map: # ghost
167
parent_graph[revision_id] = []
169
# Only include parents which are in this sub-graph
170
parent_graph[revision_id] = [p for p in parent_map[revision_id]
171
if p in revision_ids]
172
sorter = tsort.MergeSorter(parent_graph, tip_revision)
173
return sorter.iter_topo_order()
176
def show_pending_merges(new, to_file, short=False):
177
"""Write out a display of pending merges in a working tree."""
178
parents = new.get_parent_ids()
182
# we need one extra space for terminals that wrap on last char
183
term_width = osutils.terminal_width() - 1
191
pending = parents[1:]
193
last_revision = parents[0]
195
to_file.write('pending merges:\n')
196
graph = branch.repository.get_graph()
197
other_revisions = [last_revision]
198
log_formatter = log.LineLogFormatter(to_file)
199
for merge in pending:
201
rev = branch.repository.get_revisions([merge])[0]
202
except errors.NoSuchRevision:
203
# If we are missing a revision, just print out the revision id
204
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
205
other_revisions.append(merge)
117
def list_paths(header, paths, specific_files, to_file):
120
if specific_files and not is_inside_any(specific_files, path):
208
# Log the merge, as it gets a slightly different formatting
209
log_message = log_formatter.log_string(None, rev,
210
term_width - len(first_prefix))
211
to_file.write(first_prefix + log_message + '\n')
212
# Find all of the revisions in the merge source, which are not in the
213
# last committed revision.
214
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
215
other_revisions.append(merge)
216
merge_extra.discard(_mod_revision.NULL_REVISION)
218
# Get a handle to all of the revisions we will need
220
revisions = dict((rev.revision_id, rev) for rev in
221
branch.repository.get_revisions(merge_extra))
222
except errors.NoSuchRevision:
223
# One of the sub nodes is a ghost, check each one
225
for revision_id in merge_extra:
227
rev = branch.repository.get_revisions([revision_id])[0]
228
except errors.NoSuchRevision:
229
revisions[revision_id] = None
231
revisions[revision_id] = rev
233
# Display the revisions brought in by this merge.
234
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
235
branch.repository.get_parent_map(merge_extra))
236
# Skip the first node
237
num, first, depth, eom = rev_id_iterator.next()
239
raise AssertionError('Somehow we misunderstood how'
240
' iter_topo_order works %s != %s' % (first, merge))
241
for num, sub_merge, depth, eom in rev_id_iterator:
242
rev = revisions[sub_merge]
244
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
246
log_message = log_formatter.log_string(None,
247
revisions[sub_merge],
248
term_width - len(sub_prefix))
249
to_file.write(sub_prefix + log_message + '\n')
123
print >>to_file, '%s:' % header
125
print >>to_file, ' ', path
added
removed
bzrlib/status.py
