Merge documentation improvements.

[jelmer/subvertpy.git] / upgrade.py

diff --git a/upgrade.py b/upgrade.py
index b308285fc9d8dcd90552071fadd6ced5b1a300c9..3a33e21e145f2154ad4715c51e2ebd5dd31376fb 100644 (file)
--- a/upgrade.py
+++ b/upgrade.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python2.4
-#
 # Copyright (C) 2006 by Jelmer Vernooij
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -132,8 +130,17 @@ def parse_legacy_revision_id(revid):
         assert revnum >= 0
         return (uuid, branch_path, revnum, 1)
     elif revid.startswith("svn-v2:"):
+        revid = revid[len("svn-v2:"):]
+        at = revid.index("@")
+        fash = revid.rindex("-")
+        uuid = revid[at+1:fash]
+        branch_path = unescape_svn_path(revid[fash+1:])
+        revnum = int(revid[0:at])
+        assert revnum >= 0
+        return (uuid, branch_path, revnum, 2)
+    elif revid.startswith("svn-v3-"):
         (uuid, bp, rev) = parse_svn_revision_id(revid)
-        return (uuid, bp, rev, 2)
+        return (uuid, bp, rev, 3)
 
     raise InvalidRevisionId(revid, None)
 
@@ -145,6 +152,7 @@ def create_upgraded_revid(revid):
     else:
         return revid + suffix
 
+
 def upgrade_branch(branch, svn_repository, allow_change=False):
     renames = upgrade_repository(branch.repository, svn_repository, 
               branch.last_revision(), allow_change)