-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

I noticed gdiff was a bit slower than necessary because it was doing
RevisionSpec.in_history just to get the revision_id.  I've gone and
changed all the commands to use in_history.

Note that while viz was doing '(revno, revid) = revision[0].in_history',
it was subsequently ignoring 'revno'.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFINOxh0F+nu1YWqI0RAiWSAJ0QxwW3K96/W2cipbeqfGwEoorucQCfagu4
za5xnP44QYYRTaUXbIaoh8M=
=W5x9
-----END PGP SIGNATURE-----
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: http://bazaar.launchpad.net/%7Ebzr-gtk/bzr-gtk/trunk/
# testament_sha1: b87d62f8af5855d7fb81e335077b90dbd6d5229c
# timestamp: 2008-05-21 23:43:19 -0400
# source_branch: http://code.aaronbentley.com/bzr/bzrrepo/bzr-gtk
# base_revision_id: [EMAIL PROTECTED]
#   3x585s8593j6a409
# 
# Begin patch
=== modified file '__init__.py'
--- __init__.py	2008-05-22 02:33:40 +0000
+++ __init__.py	2008-05-22 03:43:15 +0000
@@ -193,12 +193,12 @@
             if revision is not None:
                 if len(revision) == 1:
                     tree1 = wt
-                    revision_id = revision[0].in_history(branch).rev_id
+                    revision_id = revision[0].as_revision_id(tree1.branch)
                     tree2 = branch.repository.revision_tree(revision_id)
                 elif len(revision) == 2:
-                    revision_id_0 = revision[0].in_history(branch).rev_id
+                    revision_id_0 = revision[0].as_revision_id(branch)
                     tree2 = branch.repository.revision_tree(revision_id_0)
-                    revision_id_1 = revision[1].in_history(branch).rev_id
+                    revision_id_1 = revision[1].as_revision_id(branch)
                     tree1 = branch.repository.revision_tree(revision_id_1)
             else:
                 tree1 = wt
@@ -261,8 +261,7 @@
             if revision is None:
                 revids.append(br.last_revision())
             else:
-                (revno, revid) = revision[0].in_history(br)
-                revids.append(revid)
+                revids.append(revision[0].as_revision_id(br))
         import gtk
         pp = start_viz_window(br, revids, limit)
         pp.connect("destroy", lambda w: gtk.main_quit())
@@ -312,7 +311,7 @@
         if revision is not None:
             if len(revision) != 1:
                 raise BzrCommandError("Only 1 revion may be specified.")
-            revision_id = revision[0].in_history(br).rev_id
+            revision_id = revision[0].as_revision_id(br)
             tree = br.repository.revision_tree(revision_id)
         else:
             revision_id = getattr(tree, 'get_revision_id', lambda: None)()
@@ -393,7 +392,7 @@
         
         if revision is not None:
             try:
-                revision_id = revision[0].in_history(wt.branch).rev_id
+                revision_id = revision[0].as_revision_id(wt.branch)
             except:
                 from bzrlib.errors import BzrError
                 raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYi4PKAAAdD/gABUQABRY///
egAYCr////BQA5k8Aa1QO7BJQhT9U9qmntJihtNIAyaepoG0nqaNAZUZTahsggMINMgAANAyBiEm
imymmjBPRADTENNGTEAOYAAAAAAAAAAEkgmTQT0RkTRkKe1GU9TyamjEYaiLL1ouA7PQQJAyKCNK
xzwvBBvyV+lqcdEQqySHB/aLw01IJA7dYAr+ZTRF2GZPWySdssBanQerXY3220Re0bv3xk1Ig0U2
FGXVUS1NuazNBJtlLgMbagYxTLRU25uXlHiIBEoFM+R1nwK3nnSLtqpJ88ue9GdgUGSnjxB7cBB9
TzHC6y0RtJgpCp9ERO+25IkNfi468L+MHYlnoOKH1PmRK+kUuRxF687zBWDD7jRjXGLr7wTzIQ+g
jM3BteamRAs+BbcM1CpMsCRaYjTmzCiPJhyLQmLSM5gxqWkjAVQygQCWAPSwgJiI98i2i1GJDEc6
StZrXZxZ4nzNPbISkZWjf4pFS09w0DIYUYJsrhzqmb1c1TU21X+hgKIomBKBrJYlSosKNURpuZrD
wCptDQvpsOBiR0cYRLDaZFAuIaOhcQHxHBNTHOKLderVCBYEesx/g8mF6Mao4fdpGJ2vUPBBrdgz
WvDChM7khNWihvs43agnmNiHebBdN2LSSL2RYnA7ADy2THB0NxwDebx5/3yx/ZVHJnykW0vIlobP
KsqkRr0zoxaJDhXca8LCdIxJmDZ93cgzXA6HifrxLkaZNekZOVGCLF0jyKEVBMlS7yewdhsIX3jD
IRE4h25jAfHQyEgaaNZX1VsJOf8pHuoI/cU64+FloO4GatR+WEiSyBQ6t3A4ngbjrPU6jE/vn28m
Xm64X44+qMEM28Je1ANd5dAA4wOwyTjZ0+YUtyovPbGexIXwFikLpRco8+wNDLENRWLqUAWXx407
Ujt4qw+WtCso9hB6SGYA1GSIItgD2OTA9JMyGT3C7Nl89oJ0gZIZJDJHh+XIsCS6OCmNK1qoH6nI
Gy3TmN3KovcVniXLxdAQRBJCoipmZLzU7QFVarRKSgWWJYVrJIRdAkZIIBZtQDTCmS3WOfEhxDCS
CpGZgCFPJ/Ug+3fEkvuXtdtLK3Dy34gnTBzMb2UWVHGfmLvlPmKYbQSp4g8TwpsbenpDntniQ5/+
LuSKcKEhEXB5QA==
-- 
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk

Reply via email to