44
42
from bzrlib.config import extract_email_address
45
43
from bzrlib.repository import _strip_NULL_ghosts
46
from bzrlib.revision import (
44
from bzrlib.revision import CURRENT_REVISION, Revision
47
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
48
to_file=None, show_ids=False):
49
"""Annotate file_id at revision rev_id in branch.
51
The branch should already be read_locked() when annotate_file is called.
53
:param branch: The branch to look for revision numbers and history from.
54
:param rev_id: The revision id to annotate.
55
:param file_id: The file_id to annotate.
56
:param verbose: Show all details rather than truncating to ensure
57
reasonable text width.
58
:param full: XXXX Not sure what this does.
59
:param to_file: The file to output the annotation to; if None stdout is
61
:param show_ids: Show revision ids in the annotation output.
66
# Handle the show_ids case
67
annotations = _annotations(branch.repository, file_id, rev_id)
69
return _show_id_annotations(annotations, to_file, full)
71
# Calculate the lengths of the various columns
72
annotation = list(_expand_annotations(annotations, branch))
73
_print_annotations(annotation, verbose, to_file, full)
52
76
def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,
53
show_ids=False, branch=None):
54
78
"""Annotate file_id in a tree.
56
80
The tree should already be read_locked() when annotate_file_tree is called.
62
86
reasonable text width.
63
87
:param full: XXXX Not sure what this does.
64
88
:param show_ids: Show revision ids in the annotation output.
65
:param branch: Branch to use for revision revno lookups
90
rev_id = tree.last_revision()
72
93
# Handle the show_ids case
73
94
annotations = list(tree.annotate_iter(file_id))
75
96
return _show_id_annotations(annotations, to_file, full)
77
if not getattr(tree, "get_revision_id", False):
78
# Create a virtual revision to represent the current tree state.
79
# Should get some more pending commit attributes, like pending tags,
81
current_rev = Revision(CURRENT_REVISION)
82
current_rev.parent_ids = tree.get_parent_ids()
84
current_rev.committer = branch.get_config_stack().get('email')
85
except errors.NoWhoami:
86
current_rev.committer = 'local user'
87
current_rev.message = "?"
88
current_rev.timestamp = round(time.time(), 3)
89
current_rev.timezone = osutils.local_time_offset()
92
annotation = list(_expand_annotations(annotations, branch,
98
# Create a virtual revision to represent the current tree state.
99
# Should get some more pending commit attributes, like pending tags,
101
current_rev = Revision(CURRENT_REVISION)
102
current_rev.parent_ids = tree.get_parent_ids()
103
current_rev.committer = tree.branch.get_config().username()
104
current_rev.message = "?"
105
current_rev.timestamp = round(time.time(), 3)
106
current_rev.timezone = osutils.local_time_offset()
107
annotation = list(_expand_annotations(annotations, tree.branch,
94
109
_print_annotations(annotation, verbose, to_file, full)
173
def _annotations(repo, file_id, rev_id):
174
"""Return the list of (origin_revision_id, line_text) for a revision of a file in a repository."""
175
annotations = repo.texts.annotate((file_id, rev_id))
177
return [(key[-1], line) for (key, line) in annotations]
158
180
def _expand_annotations(annotations, branch, current_rev=None):
159
181
"""Expand a file's annotations into command line UI ready tuples.
168
190
repository = branch.repository
169
191
if current_rev is not None:
170
# This can probably become a function on MutableTree, get_revno_map
171
# there, or something.
192
# This can probably become a function on MutableTree, get_revno_map there,
172
194
last_revision = current_rev.revision_id
173
195
# XXX: Partially Cloned from branch, uses the old_get_graph, eep.
174
196
# XXX: The main difficulty is that we need to inject a single new node