Rev 85: use cheaper as_revision_id. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-rebase/trunk/

------------------------------------------------------------
revno: 85
revision-id: jelmer at samba.org-20080518144701-moplzmp1nr504zzc
parent: jelmer at samba.org-20080518135753-q7gs8447av2g0qw3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-18 16:47:01 +0200
message:
  use cheaper as_revision_id.
modified:
  __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
=== modified file '__init__.py'
--- a/__init__.py	2008-05-18 13:57:53 +0000
+++ b/__init__.py	2008-05-18 14:47:01 +0000
@@ -153,12 +153,12 @@
             if revision is not None:
                 if len(revision) == 1:
                     if revision[0] is not None:
-                        stop_revid = revision[0].in_history(wt.branch).rev_id
+                        stop_revid = revision[0].as_revision_id(wt.branch)
                 elif len(revision) == 2:
                     if revision[0] is not None:
-                        start_revid = revision[0].in_history(wt.branch).rev_id
+                        start_revid = revision[0].as_revision_id(wt.branch)
                     if revision[1] is not None:
-                        stop_revid = revision[1].in_history(wt.branch).rev_id
+                        stop_revid = revision[1].as_revision_id(wt.branch)
                 else:
                     raise BzrCommandError(
                         "--revision takes only one or two arguments")
@@ -178,7 +178,7 @@
                 onto = upstream.last_revision()
             else:
                 rev_spec = RevisionSpec.from_string(onto)
-                onto = rev_spec.in_history(upstream).rev_id
+                onto = rev_spec.as_revision_id(upstream)
 
             wt.branch.repository.fetch(upstream_repository, onto)
 
@@ -344,7 +344,7 @@
         if revision is not None:
             if len(revision) == 1:
                 if revision[0] is not None:
-                    todo = [revision[0].in_history(from_branch).rev_id]
+                    todo = [revision[0].as_revision_id(from_branch)]
             elif len(revision) == 2:
                 from_revno, from_revid = revision[0].in_history(from_branch)
                 to_revno, to_revid = revision[1].in_history(from_branch)