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,
45
"""Display summary of changes.
47
By default this compares the working tree to a previous revision.
48
If the revision argument is given, summarizes changes between the
49
working tree and another, or between two revisions.
51
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.
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)
81
new_is_working_tree = True
83
if wt.last_revision() != wt.branch.last_revision():
84
warning("working tree is out of date, run 'bzr update'")
86
old = new.basis_tree()
87
elif len(revision) > 0:
89
rev_id = revision[0].as_revision_id(wt.branch)
90
old = wt.branch.repository.revision_tree(rev_id)
91
except errors.NoSuchRevision, e:
92
raise errors.BzrCommandError(str(e))
93
if (len(revision) > 1) and (revision[1].spec is not None):
95
rev_id = revision[1].as_revision_id(wt.branch)
96
new = wt.branch.repository.revision_tree(rev_id)
97
new_is_working_tree = False
98
except errors.NoSuchRevision, e:
99
raise errors.BzrCommandError(str(e))
105
_raise_if_nonexistent(specific_files, old, new)
106
want_unversioned = not versioned
108
changes = new.iter_changes(old, show_unchanged, specific_files,
109
require_versioned=False, want_unversioned=want_unversioned)
110
reporter = _mod_delta._ChangeReporter(output_file=to_file,
111
unversioned_filter=new.is_ignored)
112
_mod_delta.report_changes(changes, reporter)
114
delta = new.changes_from(old, want_unchanged=show_unchanged,
115
specific_files=specific_files,
116
want_unversioned=want_unversioned)
117
# filter out unknown files. We may want a tree method for
119
delta.unversioned = [unversioned for unversioned in
120
delta.unversioned if not new.is_ignored(unversioned[0])]
123
show_unchanged=show_unchanged,
125
# show the new conflicts only for now. XXX: get them from the
127
conflicts = new.conflicts()
128
if specific_files is not None:
129
conflicts = conflicts.select_conflicts(new, specific_files,
130
ignore_misses=True, recurse=True)[1]
131
if len(conflicts) > 0 and not short:
132
to_file.write("conflicts:\n")
133
for conflict in conflicts:
138
to_file.write("%s %s\n" % (prefix, conflict))
139
if (new_is_working_tree and show_pending):
140
show_pending_merges(new, to_file, short)
148
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
149
"""Get an iterator which will return the revisions in merge sorted order.
151
This will build up a list of all nodes, such that only nodes in the list
152
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
155
:param revision_ids: A set of revision_ids
156
:param parent_map: The parent information for each node. Revisions which
157
are considered ghosts should not be present in the map.
158
:return: iterator from MergeSorter.iter_topo_order()
160
# MergeSorter requires that all nodes be present in the graph, so get rid
161
# of any references pointing outside of this graph.
163
for revision_id in revision_ids:
164
if revision_id not in parent_map: # ghost
165
parent_graph[revision_id] = []
167
# Only include parents which are in this sub-graph
168
parent_graph[revision_id] = [p for p in parent_map[revision_id]
169
if p in revision_ids]
170
sorter = tsort.MergeSorter(parent_graph, tip_revision)
171
return sorter.iter_topo_order()
174
def show_pending_merges(new, to_file, short=False):
175
"""Write out a display of pending merges in a working tree."""
176
parents = new.get_parent_ids()
180
# we need one extra space for terminals that wrap on last char
181
term_width = osutils.terminal_width() - 1
189
pending = parents[1:]
191
last_revision = parents[0]
193
to_file.write('pending merges:\n')
194
graph = branch.repository.get_graph()
195
other_revisions = [last_revision]
196
log_formatter = log.LineLogFormatter(to_file)
197
for merge in pending:
199
rev = branch.repository.get_revisions([merge])[0]
200
except errors.NoSuchRevision:
201
# If we are missing a revision, just print out the revision id
202
to_file.write(first_prefix + '(ghost) ' + merge + '\n')
203
other_revisions.append(merge)
206
# Log the merge, as it gets a slightly different formatting
207
log_message = log_formatter.log_string(None, rev,
208
term_width - len(first_prefix))
209
to_file.write(first_prefix + log_message + '\n')
210
# Find all of the revisions in the merge source, which are not in the
211
# last committed revision.
212
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
213
other_revisions.append(merge)
214
merge_extra.discard(_mod_revision.NULL_REVISION)
216
# Get a handle to all of the revisions we will need
218
revisions = dict((rev.revision_id, rev) for rev in
219
branch.repository.get_revisions(merge_extra))
220
except errors.NoSuchRevision:
221
# One of the sub nodes is a ghost, check each one
223
for revision_id in merge_extra:
225
rev = branch.repository.get_revisions([revision_id])[0]
226
except errors.NoSuchRevision:
227
revisions[revision_id] = None
229
revisions[revision_id] = rev
231
# Display the revisions brought in by this merge.
232
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
233
branch.repository.get_parent_map(merge_extra))
234
# Skip the first node
235
num, first, depth, eom = rev_id_iterator.next()
237
raise AssertionError('Somehow we misunderstood how'
238
' iter_topo_order works %s != %s' % (first, merge))
239
for num, sub_merge, depth, eom in rev_id_iterator:
240
rev = revisions[sub_merge]
242
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
244
log_message = log_formatter.log_string(None,
245
revisions[sub_merge],
246
term_width - len(sub_prefix))
247
to_file.write(sub_prefix + log_message + '\n')
250
def _raise_if_nonexistent(paths, old_tree, new_tree):
251
"""Complain if paths are not in either inventory or tree.
253
It's OK with the files exist in either tree's inventory, or
254
if they exist in the tree but are not versioned.
256
This can be used by operations such as bzr status that can accept
257
unknown or ignored files.
259
mutter("check paths: %r", paths)
262
s = old_tree.filter_unversioned_files(paths)
263
s = new_tree.filter_unversioned_files(s)
264
s = [path for path in s if not new_tree.has_filename(path)]
266
raise errors.PathsDoNotExist(sorted(s))
added
removed
bzrlib/status.py
