~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to branchhistory.py

  • Committer: Robert Collins
  • Date: 2006-04-17 11:01:38 UTC
  • mfrom: (362 bzrtools)
  • mto: (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 366.
  • Revision ID: robertc@robertcollins.net-20060417110138-8b47d227583b5b28
mergeĀ fromĀ ab-trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
    b = Branch.open_containing(branch)[0]
7
7
    descriptor = None
8
8
    start = None
9
 
    for revno, revision in iter_revisiondata(b):
10
 
        new_descriptor = (revision.committer, 
11
 
                          revision.properties.get('branch-nick'))
12
 
        if descriptor is None:
 
9
    b.repository.lock_read()
 
10
    try:
 
11
        for revno, revision in iter_revisiondata(b):
 
12
            new_descriptor = (revision.committer, 
 
13
                              revision.properties.get('branch-nick'))
 
14
            if descriptor is None:
 
15
                descriptor = new_descriptor
 
16
            if start is None:
 
17
                start = revno
 
18
            if branch_change(descriptor, new_descriptor):
 
19
                print_info(descriptor, start, revno - 1)
 
20
                start = revno
13
21
            descriptor = new_descriptor
14
 
        if start is None:
15
 
            start = revno
16
 
        if branch_change(descriptor, new_descriptor):
17
 
            print_info(descriptor, start, revno - 1)
18
 
            start = revno
19
 
        descriptor = new_descriptor
20
 
    print_info(descriptor, start, revno)
 
22
        print_info(descriptor, start, revno)
 
23
    finally:
 
24
        b.repository.unlock()
21
25
 
22
26
def branch_change(old_descriptor, new_descriptor):
23
27
    if old_descriptor == new_descriptor: