/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/annotate.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/annotate.py
32
32
 
33
33
from .lazy_import import lazy_import
34
34
lazy_import(globals(), """
 
35
 
 
36
import patiencediff
 
37
 
35
38
from breezy import (
36
 
    patiencediff,
37
39
    tsort,
38
40
    )
39
41
""")
54
56
 
55
57
def annotate_file_tree(tree, path, to_file, verbose=False, full=False,
56
58
                       show_ids=False, branch=None):
57
 
    """Annotate file_id in a tree.
 
59
    """Annotate path in a tree.
58
60
 
59
61
    The tree should already be read_locked() when annotate_file_tree is called.
60
62