14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from __future__ import absolute_import
20
22
delta as _mod_delta,
24
27
revision as _mod_revision,
26
import bzrlib.errors as errors
27
from bzrlib.trace import mutter, warning
29
from . import errors as errors
30
from .trace import mutter, warning
31
from .workingtree import ShelvingUnsupported
29
34
# TODO: when showing single-line logs, truncate to the width of the terminal
30
35
# if known, but only if really going to the terminal (not into a file)
33
def report_changes(to_file, old, new, specific_files,
34
show_short_reporter, show_long_callback,
35
short=False, want_unchanged=False,
36
want_unversioned=False, show_ids=False):
38
def report_changes(to_file, old, new, specific_files,
39
show_short_reporter, show_long_callback,
40
short=False, want_unchanged=False,
41
want_unversioned=False, show_ids=False, classify=True):
37
42
"""Display summary of changes.
39
This compares two trees with regards to a list of files, and delegates
44
This compares two trees with regards to a list of files, and delegates
40
45
the display to underlying elements.
42
47
For short output, it creates an iterator on all changes, and lets a given
116
123
:param verbose: If True, show all merged revisions, not just
118
125
:param versioned: If True, only shows versioned files.
119
:param show_long_callback: A callback: message = show_long_callback(to_file, delta,
126
:param classify: Add special symbols to indicate file kind.
127
:param show_long_callback: A callback: message = show_long_callback(to_file, delta,
120
128
show_ids, show_unchanged, indent, filter), only used with the long output
122
130
if show_unchanged is not None:
123
131
warn("show_tree_status with show_unchanged has been deprecated "
124
"since bzrlib 0.9", DeprecationWarning, stacklevel=2)
132
"since breezy 0.9", DeprecationWarning, stacklevel=2)
126
134
if to_file is None:
127
135
to_file = sys.stdout
131
139
new_is_working_tree = True
132
140
if revision is None:
133
141
if wt.last_revision() != wt.branch.last_revision():
134
warning("working tree is out of date, run 'bzr update'")
142
warning("working tree is out of date, run 'brz update'")
136
144
old = new.basis_tree()
137
145
elif len(revision) > 0:
139
147
old = revision[0].as_tree(wt.branch)
140
except errors.NoSuchRevision, e:
148
except errors.NoSuchRevision as e:
141
149
raise errors.BzrCommandError(str(e))
142
150
if (len(revision) > 1) and (revision[1].spec is not None):
144
152
new = revision[1].as_tree(wt.branch)
145
153
new_is_working_tree = False
146
except errors.NoSuchRevision, e:
154
except errors.NoSuchRevision as e:
147
155
raise errors.BzrCommandError(str(e))
161
for hook in hooks['pre_status']:
162
hook(StatusHookParams(old, new, to_file, versioned,
163
show_ids, short, verbose, specific_files=specific_files))
153
165
specific_files, nonexistents \
154
166
= _filter_nonexistent(specific_files, old, new)
155
167
want_unversioned = not versioned
157
169
# Reporter used for short outputs
158
170
reporter = _mod_delta._ChangeReporter(output_file=to_file,
159
unversioned_filter=new.is_ignored)
160
report_changes(to_file, old, new, specific_files,
161
reporter, show_long_callback,
162
short=short, want_unchanged=show_unchanged,
163
want_unversioned=want_unversioned, show_ids=show_ids)
171
unversioned_filter=new.is_ignored, classify=classify)
172
report_changes(to_file, old, new, specific_files,
173
reporter, show_long_callback,
174
short=short, want_unchanged=show_unchanged,
175
want_unversioned=want_unversioned, show_ids=show_ids,
165
178
# show the ignored files among specific files (i.e. show the files
166
# identified from input that we choose to ignore).
179
# identified from input that we choose to ignore).
167
180
if specific_files is not None:
168
181
# Ignored files is sorted because specific_files is already sorted
169
182
ignored_files = [specific for specific in
301
317
merge_extra.discard(_mod_revision.NULL_REVISION)
303
319
# Get a handle to all of the revisions we will need
305
revisions = dict((rev.revision_id, rev) for rev in
306
branch.repository.get_revisions(merge_extra))
307
except errors.NoSuchRevision:
308
# One of the sub nodes is a ghost, check each one
310
for revision_id in merge_extra:
312
rev = branch.repository.get_revisions([revision_id])[0]
313
except errors.NoSuchRevision:
314
revisions[revision_id] = None
316
revisions[revision_id] = rev
320
revisions = dict(branch.repository.iter_revisions(merge_extra))
318
322
# Display the revisions brought in by this merge.
319
323
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
320
324
branch.repository.get_parent_map(merge_extra))
321
325
# Skip the first node
322
num, first, depth, eom = rev_id_iterator.next()
326
num, first, depth, eom = next(rev_id_iterator)
323
327
if first != merge:
324
328
raise AssertionError('Somehow we misunderstood how'
325
329
' iter_topo_order works %s != %s' % (first, merge))
356
360
# their groups individually. But for consistency of this
357
361
# function's API, it's better to sort both than just 'nonexistent'.
358
362
return sorted(remaining), sorted(nonexistent)
365
class StatusHooks(_mod_hooks.Hooks):
366
"""A dictionary mapping hook name to a list of callables for status hooks.
368
e.g. ['post_status'] Is the list of items to be called when the
369
status command has finished printing the status.
373
"""Create the default hooks.
375
These are all empty initially, because by default nothing should get
378
_mod_hooks.Hooks.__init__(self, "breezy.status", "hooks")
379
self.add_hook('post_status',
380
"Called with argument StatusHookParams after Bazaar has "
381
"displayed the status. StatusHookParams has the attributes "
382
"(old_tree, new_tree, to_file, versioned, show_ids, short, "
383
"verbose). The last four arguments correspond to the command "
384
"line options specified by the user for the status command. "
385
"to_file is the output stream for writing.",
387
self.add_hook('pre_status',
388
"Called with argument StatusHookParams before Bazaar "
389
"displays the status. StatusHookParams has the attributes "
390
"(old_tree, new_tree, to_file, versioned, show_ids, short, "
391
"verbose). The last four arguments correspond to the command "
392
"line options specified by the user for the status command. "
393
"to_file is the output stream for writing.",
397
class StatusHookParams(object):
398
"""Object holding parameters passed to post_status hooks.
400
:ivar old_tree: Start tree (basis tree) for comparison.
401
:ivar new_tree: Working tree.
402
:ivar to_file: If set, write to this file.
403
:ivar versioned: Show only versioned files.
404
:ivar show_ids: Show internal object ids.
405
:ivar short: Use short status indicators.
406
:ivar verbose: Verbose flag.
409
def __init__(self, old_tree, new_tree, to_file, versioned, show_ids,
410
short, verbose, specific_files=None):
411
"""Create a group of post_status hook parameters.
413
:param old_tree: Start tree (basis tree) for comparison.
414
:param new_tree: Working tree.
415
:param to_file: If set, write to this file.
416
:param versioned: Show only versioned files.
417
:param show_ids: Show internal object ids.
418
:param short: Use short status indicators.
419
:param verbose: Verbose flag.
420
:param specific_files: If set, a list of filenames whose status should be
421
shown. It is an error to give a filename that is not in the working
422
tree, or in the working inventory or in the basis inventory.
424
self.old_tree = old_tree
425
self.new_tree = new_tree
426
self.to_file = to_file
427
self.versioned = versioned
428
self.show_ids = show_ids
430
self.verbose = verbose
431
self.specific_files = specific_files
433
def __eq__(self, other):
434
return self.__dict__ == other.__dict__
437
return "<%s(%s, %s, %s, %s, %s, %s, %s, %s)>" % (self.__class__.__name__,
438
self.old_tree, self.new_tree, self.to_file, self.versioned,
439
self.show_ids, self.short, self.verbose, self.specific_files)
442
def _show_shelve_summary(params):
443
"""post_status hook to display a summary of shelves.
445
:param params: StatusHookParams.
447
# Don't show shelves if status of specific files is being shown, only if
448
# no file arguments have been passed
449
if params.specific_files:
451
get_shelf_manager = getattr(params.new_tree, 'get_shelf_manager', None)
452
if get_shelf_manager is None:
455
manager = get_shelf_manager()
456
except ShelvingUnsupported:
457
mutter('shelving not supported by tree, not displaying shelves.')
459
shelves = manager.active_shelves()
461
singular = '%d shelf exists. '
462
plural = '%d shelves exist. '
463
if len(shelves) == 1:
467
params.to_file.write(fmt % len(shelves))
468
params.to_file.write('See "brz shelve --list" for details.\n')
471
hooks = StatusHooks()
474
hooks.install_named_hook('post_status', _show_shelve_summary,