← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

 * The internal storage of history, and logical branch identity have now
   been split into Branch, and Repository. The common locking and file 
   management routines are now in bzrlib.lockablefiles. 
   (Aaron Bentley, Robert Collins, Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
74
74
    last_path = None
75
75
    revno = 1
76
76
    for revision_id in branch.revision_history():
77
 
        this_inv = branch.get_revision_inventory(revision_id)
 
77
        this_inv = branch.repository.get_revision_inventory(revision_id)
78
78
        if file_id in this_inv:
79
79
            this_ie = this_inv[file_id]
80
80
            this_path = this_inv.id2path(file_id)
223
223
            # although we calculated it, throw it away without display
224
224
            delta = None
225
225
 
226
 
        rev = branch.get_revision(rev_id)
 
226
        rev = branch.repository.get_revision(rev_id)
227
227
 
228
228
        if searchRE:
229
229
            if not searchRE.search(rev.message):
235
235
                excludes = set()
236
236
            else:
237
237
                # revno is 1 based, so -2 to get back 1 less.
238
 
                excludes = set(branch.get_ancestry(revision_history[revno - 2]))
 
238
                repository = branch.repository
 
239
                excludes = repository.get_ancestry(revision_history[revno - 2])
 
240
                excludes = set(excludes)
239
241
            pending = list(rev.parent_ids)
240
242
            while pending:
241
243
                rev_id = pending.pop()
244
246
                # prevent showing merged revs twice if they multi-path.
245
247
                excludes.add(rev_id)
246
248
                try:
247
 
                    rev = branch.get_revision(rev_id)
 
249
                    rev = branch.repository.get_revision(rev_id)
248
250
                except errors.NoSuchRevision:
249
251
                    continue
250
252
                pending.extend(rev.parent_ids)
510
512
        to_file.write('*'*60)
511
513
        to_file.write('\nRemoved Revisions:\n')
512
514
        for i in range(base_idx, len(old_rh)):
513
 
            rev = branch.get_revision(old_rh[i])
 
515
            rev = branch.repository.get_revision(old_rh[i])
514
516
            lf.show(i+1, rev, None)
515
517
        to_file.write('*'*60)
516
518
        to_file.write('\n\n')