From: Simon Hausmann <shausman@trolltech.com>
Date: Wed, 31 Jan 2007 08:49:41 +0000 (+0100)
Subject: Slightly improved help usage output and made specifying the trailing slash for the... 
X-Git-Tag: v1.5.3-rc0~65^2^2~242
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06bb04454fb91fbc144ed2b3abb3492c923f98f5;p=git.git

Slightly improved help usage output and made specifying the trailing slash for the depot path optional.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index abd6da466..8df3d7339 100644
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -20,8 +20,10 @@ import os, string, sys
 if len(sys.argv) != 2:
     sys.stderr.write("usage: %s //depot/path[@revRange]\n" % sys.argv[0]);
     sys.stderr.write("\n    example:\n");
-    sys.stderr.write("    %s //depot/my/project -- to import everything\n");
-    sys.stderr.write("    %s //depot/my/project@1,6 -- to import only from revision 1 to 6\n");
+    sys.stderr.write("    %s //depot/my/project/ -- to import everything\n");
+    sys.stderr.write("    %s //depot/my/project/@1,6 -- to import only from revision 1 to 6\n");
+    sys.stderr.write("\n");
+    sys.stderr.write("    (a ... is not needed in the path p4 specification, it's added implicitly)\n");
     sys.stderr.write("\n");
     sys.exit(1)
 
@@ -34,6 +36,9 @@ try:
 except ValueError:
     changeRange = ""
 
+if not prefix.endswith("/"):
+    prefix += "/"
+
 def describe(change):
     output = os.popen("p4 describe %s" % change).readlines()