42
42
from bzrlib.config import extract_email_address
43
43
from bzrlib.repository import _strip_NULL_ghosts
44
from bzrlib.revision import (
48
from bzrlib.symbol_versioning import (
54
@deprecated_function(deprecated_in((2, 4, 0)))
44
from bzrlib.revision import CURRENT_REVISION, Revision
55
47
def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
56
48
to_file=None, show_ids=False):
57
49
"""Annotate file_id at revision rev_id in branch.
69
61
:param show_ids: Show revision ids in the annotation output.
71
tree = branch.repository.revision_tree(rev_id)
72
annotate_file_tree(tree, file_id, to_file, verbose=verbose,
73
full=full, show_ids=show_ids, branch=branch)
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)
76
76
def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,
77
show_ids=False, branch=None):
78
78
"""Annotate file_id in a tree.
80
80
The tree should already be read_locked() when annotate_file_tree is called.
86
86
reasonable text width.
87
87
:param full: XXXX Not sure what this does.
88
88
:param show_ids: Show revision ids in the annotation output.
89
:param branch: Branch to use for revision revno lookups
90
rev_id = tree.last_revision()
96
93
# Handle the show_ids case
97
94
annotations = list(tree.annotate_iter(file_id))
99
96
return _show_id_annotations(annotations, to_file, full)
101
if not getattr(tree, "get_revision_id", False):
102
# Create a virtual revision to represent the current tree state.
103
# Should get some more pending commit attributes, like pending tags,
105
current_rev = Revision(CURRENT_REVISION)
106
current_rev.parent_ids = tree.get_parent_ids()
107
current_rev.committer = branch.get_config().username()
108
current_rev.message = "?"
109
current_rev.timestamp = round(time.time(), 3)
110
current_rev.timezone = osutils.local_time_offset()
113
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,
115
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]
179
180
def _expand_annotations(annotations, branch, current_rev=None):
180
181
"""Expand a file's annotations into command line UI ready tuples.
189
190
repository = branch.repository
190
191
if current_rev is not None:
191
# This can probably become a function on MutableTree, get_revno_map
192
# there, or something.
192
# This can probably become a function on MutableTree, get_revno_map there,
193
194
last_revision = current_rev.revision_id
194
195
# XXX: Partially Cloned from branch, uses the old_get_graph, eep.
195
196
# XXX: The main difficulty is that we need to inject a single new node
added
removed
bzrlib/annotate.py
