/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 02:33:40 UTC
  • mfrom: (487.2.8 save-patch)
  • Revision ID: aaron@aaronbentley.com-20080522023340-3x585s8593j6a409
Allow saving from patch window, refactoring, testing.

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