33
from .lazy_import import lazy_import
34
lazy_import(globals(), """
37
from bzrlib.config import extract_email_address
38
from bzrlib.repository import _strip_NULL_ghosts
39
from bzrlib.revision import CURRENT_REVISION, Revision
42
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
43
to_file=None, show_ids=False):
44
"""Annotate file_id at revision rev_id in branch.
46
The branch should already be read_locked() when annotate_file is called.
48
:param branch: The branch to look for revision numbers and history from.
49
:param rev_id: The revision id to annotate.
50
:param file_id: The file_id to annotate.
51
:param verbose: Show all details rather than truncating to ensure
52
reasonable text width.
53
:param full: XXXX Not sure what this does.
54
:param to_file: The file to output the annotation to; if None stdout is
56
:param show_ids: Show revision ids in the annotation output.
61
# Handle the show_ids case
62
annotations = _annotations(branch.repository, file_id, rev_id)
64
return _show_id_annotations(annotations, to_file, full)
66
# Calculate the lengths of the various columns
67
annotation = list(_expand_annotations(annotations, branch))
68
_print_annotations(annotation, verbose, to_file, full)
71
def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,
47
extract_email_address,
49
from .repository import _strip_NULL_ghosts
50
from .revision import (
56
def annotate_file_tree(tree, path, to_file, verbose=False, full=False,
57
show_ids=False, branch=None, file_id=None):
73
58
"""Annotate file_id in a tree.
75
60
The tree should already be read_locked() when annotate_file_tree is called.
77
62
:param tree: The tree to look for revision numbers and history from.
78
:param file_id: The file_id to annotate.
63
:param path: The path to annotate
79
64
:param to_file: The file to output the annotation to.
80
65
:param verbose: Show all details rather than truncating to ensure
81
66
reasonable text width.
82
67
:param full: XXXX Not sure what this does.
83
68
:param show_ids: Show revision ids in the annotation output.
69
:param file_id: The file_id to annotate (must match file path)
70
:param branch: Branch to use for revision revno lookups
85
rev_id = tree.last_revision()
88
77
# Handle the show_ids case
89
annotations = list(tree.annotate_iter(file_id))
78
annotations = list(tree.annotate_iter(path, file_id))
91
80
return _show_id_annotations(annotations, to_file, full)
93
# Create a virtual revision to represent the current tree state.
94
# Should get some more pending commit attributes, like pending tags,
96
current_rev = Revision(CURRENT_REVISION)
97
current_rev.parent_ids = tree.get_parent_ids()
98
current_rev.committer = tree.branch.get_config().username()
99
current_rev.message = "?"
100
current_rev.timestamp = round(time.time(), 3)
101
current_rev.timezone = osutils.local_time_offset()
102
annotation = list(_expand_annotations(annotations, tree.branch,
82
if not getattr(tree, "get_revision_id", False):
83
# Create a virtual revision to represent the current tree state.
84
# Should get some more pending commit attributes, like pending tags,
86
current_rev = Revision(CURRENT_REVISION)
87
current_rev.parent_ids = tree.get_parent_ids()
89
current_rev.committer = branch.get_config_stack().get('email')
91
current_rev.committer = 'local user'
92
current_rev.message = "?"
93
current_rev.timestamp = round(time.time(), 3)
94
current_rev.timezone = osutils.local_time_offset()
97
annotation = list(_expand_annotations(annotations, branch,
104
99
_print_annotations(annotation, verbose, to_file, full)
136
129
anno = "%-*s %-7s " % (max_revno_len, revno_str, author[:7])
137
130
if anno.lstrip() == "" and full:
141
except UnicodeEncodeError:
142
# cmd_annotate should be passing in an 'exact' object, which means
143
# we have a direct handle to sys.stdout or equivalent. It may not
144
# be able to handle the exact Unicode characters, but 'annotate' is
145
# a user function (non-scripting), so shouldn't die because of
146
# unrepresentable annotation characters. So encode using 'replace',
147
# and write them again.
148
to_file.write(anno.encode(encoding, 'replace'))
132
# GZ 2017-05-21: Writing both unicode annotation and bytes from file
133
# which the given to_file must cope with.
149
135
to_file.write('| %s\n' % (text,))
214
193
revision_id_to_revno[CURRENT_REVISION] = (
215
194
"%d?" % (branch.revno() + 1),)
216
195
revisions[CURRENT_REVISION] = current_rev
217
revision_ids = [o for o in revision_ids if
218
repository.has_revision(o)]
219
revisions.update((r.revision_id, r) for r in
220
repository.get_revisions(revision_ids))
198
repository.iter_revisions(revision_ids)
199
if entry[1] is not None)
221
200
for origin, text in annotations:
222
201
text = text.rstrip('\r\n')
223
202
if origin == last_origin:
224
(revno_str, author, date_str) = ('','','')
203
(revno_str, author, date_str) = ('', '', '')
226
205
last_origin = origin
227
206
if origin not in revisions:
228
(revno_str, author, date_str) = ('?','?','?')
207
(revno_str, author, date_str) = ('?', '?', '?')
230
209
revno_str = '.'.join(str(i) for i in
231
210
revision_id_to_revno[origin])