← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to annotate.py

  • Committer: Aaron Bentley
  • Date: 2005-09-01 14:11:13 UTC
  • Revision ID: abentley@panoramicfeedback.com-20050901141113-bc37c80383a77aaf
Tweaked missing-dot handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate.py
25
25
import sys
26
26
 
27
27
def iter_anno_data(branch, file_id):
28
 
    max_revno = branch.revno()
29
 
    later_revision = max_revno
30
 
    q = range(max_revno)
31
 
    q.append(max_revno)
 
28
    later_revision = branch.revno()
 
29
    q = range(branch.revno())
32
30
    q.reverse()
33
 
    next_tree = branch.working_tree()
34
 
    later_text_sha1 = next_tree.get_file_sha1(file_id)
 
31
    later_text_id = branch.basis_tree().inventory[file_id].text_id
35
32
    i = 0
36
33
    for revno in q:
37
34
        i += 1
38
 
        cur_tree = branch.revision_tree(branch.get_rev_id(revno))
 
35
        cur_tree = branch.revision_tree(branch.lookup_revision(revno))
39
36
        if file_id not in cur_tree.inventory:
40
 
            text_sha1 = None
 
37
            text_id = None
41
38
        else:
42
 
            text_sha1 = cur_tree.get_file_sha1(file_id)
43
 
        if text_sha1 != later_text_sha1:
44
 
            patch = get_patch(branch, cur_tree, next_tree, file_id)
45
 
            next_tree = cur_tree
46
 
            if revno == max_revno:
47
 
                display_id = "Tree"
48
 
            else:
49
 
                display_id = str(revno+1)
50
 
            yield display_id, patch.iter_inserted(), patch
 
39
            text_id = cur_tree.inventory[file_id].text_id
 
40
        if text_id != later_text_id:
 
41
            patch = get_patch(branch, revno, later_revision, file_id)
 
42
            yield revno, patch.iter_inserted(), patch
51
43
            later_revision = revno
52
 
            later_text_sha1 = text_sha1
 
44
            later_text_id = text_id
53
45
        yield progress.Progress("revisions", i)
54
46
 
55
 
def get_patch(branch, old_tree, new_tree, file_id):
 
47
def get_patch(branch, old_revno, new_revno, file_id):
 
48
    old_tree = branch.revision_tree(branch.lookup_revision(old_revno))
 
49
    new_tree = branch.revision_tree(branch.lookup_revision(new_revno))
56
50
    if file_id in old_tree.inventory:
57
51
        old_file = old_tree.get_file(file_id).readlines()
58
52
    else:
67
61
    def run(self, filename):
68
62
        if not os.path.exists(filename):
69
63
            raise BzrCommandError("The file %s does not exist." % filename)
70
 
        branch,relpath = (Branch.open_containing(filename))
71
 
        file_id = branch.working_tree().path2id(relpath)
 
64
        branch = (Branch(filename))
 
65
        file_id = branch.working_tree().path2id(branch.relpath(filename))
72
66
        if file_id is None:
73
67
            raise BzrCommandError("The file %s is not versioned." % filename)
74
68
        lines = branch.basis_tree().get_file(file_id)