19
19
from bzrlib import (
20
20
delta as _mod_delta,
25
25
revision as _mod_revision,
27
27
import bzrlib.errors as errors
28
from bzrlib.osutils import is_inside_any
29
from bzrlib.symbol_versioning import (deprecated_function,
28
31
from bzrlib.trace import mutter, warning
30
33
# TODO: when showing single-line logs, truncate to the width of the terminal
31
34
# if known, but only if really going to the terminal (not into a file)
34
def report_changes(to_file, old, new, specific_files,
35
show_short_reporter, show_long_callback,
36
short=False, want_unchanged=False,
37
want_unversioned=False, show_ids=False):
38
"""Display summary of changes.
40
This compares two trees with regards to a list of files, and delegates
41
the display to underlying elements.
43
For short output, it creates an iterator on all changes, and lets a given
44
reporter display these changes.
46
For stantard output, it creates a delta of the changes, and forwards it
49
:param to_file: If set, write to this file (default stdout.)
50
:param old: Start tree for the comparison
51
:param end: End tree for the comparison
52
:param specific_files: If set, a list of filenames whose status should be
53
shown. It is an error to give a filename that is not in the working
54
tree, or in the working inventory or in the basis inventory.
55
:param show_short_reporter: Reporter in charge of display for short output
56
:param show_long_callback: Callback in charge of display for normal output
57
:param short: If True, gives short SVN-style status lines.
58
:param want_unchanged: Deprecated parameter. If set, includes unchanged
60
:param show_ids: If set, includes each file's id.
61
:param want_unversioned: If False, only shows versioned files.
65
changes = new.iter_changes(old, want_unchanged, specific_files,
66
require_versioned=False, want_unversioned=want_unversioned)
67
_mod_delta.report_changes(changes, show_short_reporter)
70
delta = new.changes_from(old, want_unchanged=want_unchanged,
71
specific_files=specific_files,
72
want_unversioned=want_unversioned)
73
# filter out unknown files. We may want a tree method for
75
delta.unversioned = [unversioned for unversioned in
76
delta.unversioned if not new.is_ignored(unversioned[0])]
77
show_long_callback(to_file, delta,
79
show_unchanged=want_unchanged)
82
37
def show_tree_status(wt, show_unchanged=None,
83
38
specific_files=None,
154
for hook in hooks['pre_status']:
155
hook(StatusHookParams(old, new, to_file, versioned,
156
show_ids, short, verbose))
158
106
specific_files, nonexistents \
159
107
= _filter_nonexistent(specific_files, old, new)
160
108
want_unversioned = not versioned
162
# Reporter used for short outputs
163
reporter = _mod_delta._ChangeReporter(output_file=to_file,
164
unversioned_filter=new.is_ignored)
165
report_changes(to_file, old, new, specific_files,
166
reporter, show_long_callback,
167
short=short, want_unchanged=show_unchanged,
168
want_unversioned=want_unversioned, show_ids=show_ids)
170
# show the ignored files among specific files (i.e. show the files
171
# identified from input that we choose to ignore).
172
if specific_files is not None:
173
# Ignored files is sorted because specific_files is already sorted
174
ignored_files = [specific for specific in
175
specific_files if new.is_ignored(specific)]
176
if len(ignored_files) > 0 and not short:
177
to_file.write("ignored:\n")
181
for ignored_file in ignored_files:
182
to_file.write("%s %s\n" % (prefix, ignored_file))
110
changes = new.iter_changes(old, show_unchanged, specific_files,
111
require_versioned=False, want_unversioned=want_unversioned)
112
reporter = _mod_delta._ChangeReporter(output_file=to_file,
113
unversioned_filter=new.is_ignored)
114
_mod_delta.report_changes(changes, reporter)
116
delta = new.changes_from(old, want_unchanged=show_unchanged,
117
specific_files=specific_files,
118
want_unversioned=want_unversioned)
119
# filter out unknown files. We may want a tree method for
121
delta.unversioned = [unversioned for unversioned in
122
delta.unversioned if not new.is_ignored(unversioned[0])]
125
show_unchanged=show_unchanged,
184
127
# show the new conflicts only for now. XXX: get them from the
186
129
conflicts = new.conflicts()
364
304
# their groups individually. But for consistency of this
365
305
# function's API, it's better to sort both than just 'nonexistent'.
366
306
return sorted(remaining), sorted(nonexistent)
369
class StatusHooks(_mod_hooks.Hooks):
370
"""A dictionary mapping hook name to a list of callables for status hooks.
372
e.g. ['post_status'] Is the list of items to be called when the
373
status command has finished printing the status.
377
"""Create the default hooks.
379
These are all empty initially, because by default nothing should get
382
_mod_hooks.Hooks.__init__(self)
383
self.create_hook(_mod_hooks.HookPoint('post_status',
384
"Called with argument StatusHookParams after Bazaar has "
385
"displayed the status. StatusHookParams has the attributes "
386
"(old_tree, new_tree, to_file, versioned, show_ids, short, "
387
"verbose). The last four arguments correspond to the command "
388
"line options specified by the user for the status command. "
389
"to_file is the output stream for writing.",
391
self.create_hook(_mod_hooks.HookPoint('pre_status',
392
"Called with argument StatusHookParams before Bazaar "
393
"displays the status. StatusHookParams has the attributes "
394
"(old_tree, new_tree, to_file, versioned, show_ids, short, "
395
"verbose). The last four arguments correspond to the command "
396
"line options specified by the user for the status command. "
397
"to_file is the output stream for writing.",
401
class StatusHookParams(object):
402
"""Object holding parameters passed to post_status hooks.
404
:ivar old_tree: Start tree (basis tree) for comparison.
405
:ivar new_tree: Working tree.
406
:ivar to_file: If set, write to this file.
407
:ivar versioned: Show only versioned files.
408
:ivar show_ids: Show internal object ids.
409
:ivar short: Use short status indicators.
410
:ivar verbose: Verbose flag.
413
def __init__(self, old_tree, new_tree, to_file, versioned, show_ids,
415
"""Create a group of post_status hook parameters.
417
:param old_tree: Start tree (basis tree) for comparison.
418
:param new_tree: Working tree.
419
:param to_file: If set, write to this file.
420
:param versioned: Show only versioned files.
421
:param show_ids: Show internal object ids.
422
:param short: Use short status indicators.
423
:param verbose: Verbose flag.
425
self.old_tree = old_tree
426
self.new_tree = new_tree
427
self.to_file = to_file
428
self.versioned = versioned
429
self.show_ids = show_ids
431
self.verbose = verbose
433
def __eq__(self, other):
434
return self.__dict__ == other.__dict__
437
return "<%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)
442
def _show_shelve_summary(params):
443
"""post_status hook to display a summary of shelves.
445
:param params: StatusHookParams.
447
manager = params.new_tree.get_shelf_manager()
448
shelves = manager.active_shelves()
450
params.to_file.write('%d shelves exist. '
451
'See "bzr shelve --list" for details.\n' % len(shelves))
454
hooks = StatusHooks()
457
hooks.install_named_hook('post_status', _show_shelve_summary,
added
removed
bzrlib/status.py
