13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25
25
revision as _mod_revision,
27
from bzrlib.diff import _raise_if_nonexistent
27
28
import bzrlib.errors as errors
28
29
from bzrlib.osutils import is_inside_any
29
30
from bzrlib.symbol_versioning import (deprecated_function,
31
from bzrlib.trace import mutter, warning
32
from bzrlib.trace import warning
33
34
# TODO: when showing single-line logs, truncate to the width of the terminal
34
35
# 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
73
71
:param versioned: If True, only shows versioned files.
75
73
if show_unchanged is not None:
89
87
old = new.basis_tree()
90
88
elif len(revision) > 0:
92
old = revision[0].as_tree(wt.branch)
90
rev_id = revision[0].as_revision_id(wt.branch)
91
old = wt.branch.repository.revision_tree(rev_id)
93
92
except errors.NoSuchRevision, e:
94
93
raise errors.BzrCommandError(str(e))
95
94
if (len(revision) > 1) and (revision[1].spec is not None):
97
new = revision[1].as_tree(wt.branch)
96
rev_id = revision[1].as_revision_id(wt.branch)
97
new = wt.branch.repository.revision_tree(rev_id)
98
98
new_is_working_tree = False
99
99
except errors.NoSuchRevision, e:
100
100
raise errors.BzrCommandError(str(e))
106
specific_files, nonexistents \
107
= _filter_nonexistent(specific_files, old, new)
106
_raise_if_nonexistent(specific_files, old, new)
108
107
want_unversioned = not versioned
110
109
changes = new.iter_changes(old, show_unchanged, specific_files,
140
139
to_file.write("%s %s\n" % (prefix, conflict))
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)
160
raise errors.PathsDoNotExist(nonexistents)
140
if (new_is_working_tree and show_pending
141
and specific_files is None):
142
show_pending_merges(new, to_file, short)
191
173
return sorter.iter_topo_order()
194
def show_pending_merges(new, to_file, short=False, verbose=False):
176
def show_pending_merges(new, to_file, short=False):
195
177
"""Write out a display of pending merges in a working tree."""
196
178
parents = new.get_parent_ids()
197
179
if len(parents) < 2:
200
term_width = osutils.terminal_width()
201
if term_width is not None:
202
# we need one extra space for terminals that wrap on last char
203
term_width = term_width - 1
182
# we need one extra space for terminals that wrap on last char
183
term_width = osutils.terminal_width() - 1
205
185
first_prefix = 'P '
206
186
sub_prefix = 'P. '
208
188
first_prefix = ' '
211
def show_log_message(rev, prefix):
212
if term_width is None:
215
width = term_width - len(prefix)
216
log_message = log_formatter.log_string(None, rev, width, prefix=prefix)
217
to_file.write(log_message + '\n')
219
191
pending = parents[1:]
220
192
branch = new.branch
221
193
last_revision = parents[0]
224
to_file.write('pending merges:\n')
226
to_file.write('pending merge tips:'
227
' (use -v to see all merge revisions)\n')
195
to_file.write('pending merges:\n')
228
196
graph = branch.repository.get_graph()
229
197
other_revisions = [last_revision]
230
198
log_formatter = log.LineLogFormatter(to_file)
240
208
# Log the merge, as it gets a slightly different formatting
241
show_log_message(rev, first_prefix)
209
log_message = log_formatter.log_string(None, rev,
210
term_width - len(first_prefix))
211
to_file.write(first_prefix + log_message + '\n')
245
212
# Find all of the revisions in the merge source, which are not in the
246
213
# last committed revision.
247
214
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
277
244
to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
279
show_log_message(revisions[sub_merge], sub_prefix)
282
def _filter_nonexistent(orig_paths, old_tree, new_tree):
283
"""Convert orig_paths to two sorted lists and return them.
285
The first is orig_paths paths minus the items in the second list,
286
and the second list is paths that are not in either inventory or
287
tree (they don't qualify if they exist in the tree's inventory, or
288
if they exist in the tree but are not versioned.)
290
If either of the two lists is empty, return it as an empty list.
292
This can be used by operations such as bzr status that can accept
293
unknown or ignored files.
295
mutter("check paths: %r", orig_paths)
297
return orig_paths, []
298
s = old_tree.filter_unversioned_files(orig_paths)
299
s = new_tree.filter_unversioned_files(s)
300
nonexistent = [path for path in s if not new_tree.has_filename(path)]
301
remaining = [path for path in orig_paths if not path in nonexistent]
302
# Sorting the 'remaining' list doesn't have much effect in
303
# practice, since the various status output sections will sort
304
# their groups individually. But for consistency of this
305
# function's API, it's better to sort both than just 'nonexistent'.
306
return sorted(remaining), sorted(nonexistent)
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')
added
removed
bzrlib/status.py
