← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
53
53
from bzrlib.tree import EmptyTree
54
54
from bzrlib.delta import compare_trees
55
55
from bzrlib.trace import mutter
56
 
from bzrlib.errors import InvalidRevisionNumber
57
56
 
58
57
 
59
58
def find_touching_revisions(branch, file_id):
162
161
    
163
162
    if start_revision is None:
164
163
        start_revision = 1
165
 
    elif start_revision < 1 or start_revision >= len(which_revs):
166
 
        raise InvalidRevisionNumber(start_revision)
 
164
    else:
 
165
        branch.check_real_revno(start_revision)
167
166
    
168
167
    if end_revision is None:
169
168
        end_revision = len(which_revs)
170
 
    elif end_revision < 1 or end_revision >= len(which_revs):
171
 
        raise InvalidRevisionNumber(end_revision)
 
169
    else:
 
170
        branch.check_real_revno(end_revision)
172
171
 
173
172
    # list indexes are 0-based; revisions are 1-based
174
173
    cut_revs = which_revs[(start_revision-1):(end_revision)]
310
309
        print >>to_file,  'revno:', revno
311
310
        if self.show_ids:
312
311
            print >>to_file,  'revision-id:', rev.revision_id
 
312
 
 
313
            for parent in rev.parents:
 
314
                print >>to_file, 'parent:', parent.revision_id
 
315
            
313
316
        print >>to_file,  'committer:', rev.committer
314
317
 
315
318
        date_str = format_date(rev.timestamp,