Make specifying the revision ranges more convenient.

Added support for @all as revision range specifier to import all changes to a given depot path.
Also default to an import of #head if no revrange is specified.

Signed-off-by: Simon Hausmann <hausmann@kde.org>

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index be4fd36c361e263ff4d7bddc3df0ba29a5b92e8e..16e3d8d42acd297a295c38b31753eee32f1b4a48 100755 (executable)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -13,7 +13,7 @@
 import marshal, popen2
 
 branch = "refs/heads/p4"
 import marshal, popen2
 
 branch = "refs/heads/p4"

-prefix = os.popen("git-repo-config --get p4.depotpath").read()
+prefix = previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()

 if len(prefix) != 0:
     prefix = prefix[:-1]
 
 if len(prefix) != 0:
     prefix = prefix[:-1]
 


@@ -22,7 +22,8 @@
 elif len(sys.argv) != 2:
     print "usage: %s //depot/path[@revRange]" % sys.argv[0]
     print "\n    example:"
 elif len(sys.argv) != 2:
     print "usage: %s //depot/path[@revRange]" % sys.argv[0]
     print "\n    example:"

-    print "    %s //depot/my/project/ -- to import everything"
+    print "    %s //depot/my/project/ -- to import the current head"
+    print "    %s //depot/my/project/@all -- to import everything"

     print "    %s //depot/my/project/@1,6 -- to import only from revision 1 to 6"
     print ""
     print "    (a ... is not needed in the path p4 specification, it's added implicitly)"
     print "    %s //depot/my/project/@1,6 -- to import only from revision 1 to 6"
     print ""
     print "    (a ... is not needed in the path p4 specification, it's added implicitly)"


@@ -42,7 +43,9 @@
 if prefix.find("@") != -1:
     atIdx = prefix.index("@")
     changeRange = prefix[atIdx:]
 if prefix.find("@") != -1:
     atIdx = prefix.index("@")
     changeRange = prefix[atIdx:]

-    if changeRange.find(",") == -1:
+    if changeRange == "@all":
+        changeRange = ""
+    elif changeRange.find(",") == -1:

         revision = changeRange
         changeRange = ""
     prefix = prefix[0:atIdx]
         revision = changeRange
         changeRange = ""
     prefix = prefix[0:atIdx]


@@ -50,6 +53,8 @@
     hashIdx = prefix.index("#")
     revision = prefix[hashIdx:]
     prefix = prefix[0:hashIdx]
     hashIdx = prefix.index("#")
     revision = prefix[hashIdx:]
     prefix = prefix[0:hashIdx]

+elif len(previousDepotPath) == 0:
+    revision = "#head"

 
 if prefix.endswith("..."):
     prefix = prefix[:-3]
 
 if prefix.endswith("..."):
     prefix = prefix[:-3]