[MERGE] annotate in the branch context

[Wouter van Heyst]

On Mon, Jan 29, 2007 at 03:21:38PM -0600, John Arbash Meinel wrote:
> # Bazaar revision bundle v0.8
> #
> # message:
> #   bzr annotate should use Branch's dotted revnos.
> #   Not the dotted revnos from the last modification of the file.
> #   
> # committer: John Arbash Meinel <john at arbash-meinel.com>
> # date: Mon 2007-01-29 15:11:28.857000113 -0600
> 
> === modified file NEWS
> --- NEWS
> +++ NEWS
> @@ -27,6 +27,10 @@
>  
>    BUGFIXES:
>  
> +    * ``bzr annotate`` now uses dotted revnos from the viewpoint of the
> +      branch, rather than the last changed revision of the file.
> +      (John Arbash Meinel, #82158)
> +
>    TESTING:
>  
>      * New ``--first`` option to ``bzr selftest`` to run specified tests
> 
> === modified file bzrlib/annotate.py
> --- bzrlib/annotate.py
> +++ bzrlib/annotate.py
> @@ -83,7 +83,7 @@
>          prevanno=anno

The copyright of bzrlib/annotate.py is at 2004, 2005, we should probably
update that when touched. I know emacs has some provision to this
automatically, is anyone aware of a vim solution?

> -def _annotate_file(branch, rev_id, file_id ):
> +def _annotate_file(branch, rev_id, file_id):
>      """Yield the origins for each line of a file.
>  
>      This includes detailed information, such as the committer name, and
> @@ -91,10 +91,11 @@
>      """
>  
>      rh = branch.revision_history()

rh doesn't seem to be used after this, might as well get rid of it now?

> -    revision_graph = branch.repository.get_revision_graph(rev_id)
> +    branch_last_revision = branch.last_revision()
> +    revision_graph = branch.repository.get_revision_graph(branch_last_revision)
>      merge_sorted_revisions = tsort.merge_sort(
>          revision_graph,
> -        rev_id,
> +        branch_last_revision,
>          None,
>          generate_revno=True)
>      revision_id_to_revno = dict((rev_id, revno)

Other than that, +1. Next thing to do for me, bzr log -r 2018.1.11.1.25.1.1
actually being constrained to that log entry.

Wouter van Heyst
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070130/07c012a5/attachment.pgp