/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2008-05-22 03:43:15 UTC
  • Revision ID: aaron@aaronbentley.com-20080522034315-enx7iqqut16kue6h
Convert remaining uses of RevisionSpec.in_history to as_revision_id

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
193
193
            if revision is not None:
194
194
                if len(revision) == 1:
195
195
                    tree1 = wt
196
 
                    revision_id = revision[0].in_history(branch).rev_id
 
196
                    revision_id = revision[0].as_revision_id(tree1.branch)
197
197
                    tree2 = branch.repository.revision_tree(revision_id)
198
198
                elif len(revision) == 2:
199
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
 
199
                    revision_id_0 = revision[0].as_revision_id(branch)
200
200
                    tree2 = branch.repository.revision_tree(revision_id_0)
201
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
 
201
                    revision_id_1 = revision[1].as_revision_id(branch)
202
202
                    tree1 = branch.repository.revision_tree(revision_id_1)
203
203
            else:
204
204
                tree1 = wt
261
261
            if revision is None:
262
262
                revids.append(br.last_revision())
263
263
            else:
264
 
                (revno, revid) = revision[0].in_history(br)
265
 
                revids.append(revid)
 
264
                revids.append(revision[0].as_revision_id(br))
266
265
        import gtk
267
266
        pp = start_viz_window(br, revids, limit)
268
267
        pp.connect("destroy", lambda w: gtk.main_quit())
312
311
        if revision is not None:
313
312
            if len(revision) != 1:
314
313
                raise BzrCommandError("Only 1 revion may be specified.")
315
 
            revision_id = revision[0].in_history(br).rev_id
 
314
            revision_id = revision[0].as_revision_id(br)
316
315
            tree = br.repository.revision_tree(revision_id)
317
316
        else:
318
317
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
393
392
        
394
393
        if revision is not None:
395
394
            try:
396
 
                revision_id = revision[0].in_history(wt.branch).rev_id
 
395
                revision_id = revision[0].as_revision_id(wt.branch)
397
396
            except:
398
397
                from bzrlib.errors import BzrError
399
398
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )