git p4: generate better error message for bad depot path

Pete Wyckoff · gitster · commit 0f487d308d81 · 2013-01-26T22:00:38.000-08:00
Depot paths must start with //.  Exit with a better explanation
when a bad depot path is supplied.

Signed-off-by: Pete Wyckoff &lt;pw@padd.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-p4.py b/git-p4.py
@@ -3163,6 +3163,7 @@ def run(self, args):
         self.cloneExclude = ["/"+p for p in self.cloneExclude]
         for p in depotPaths:
             if not p.startswith("//"):
+                sys.stderr.write('Depot paths must start with "//": %s\n' % p)
                 return False
 
         if not self.cloneDestination:
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
@@ -30,6 +30,11 @@ test_expect_success 'basic git p4 clone' '
 	)
 '
 
+test_expect_success 'depot typo error' '
+	test_must_fail git p4 clone --dest="$git" /depot 2>errs &&
+	grep "Depot paths must start with" errs
+'
+
 test_expect_success 'git p4 clone @all' '
 	git p4 clone --dest="$git" //depot@all &&
 	test_when_finished cleanup_git &&

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ test_expect_success 'basic git p4 clone' '`
`30`	`30`	`)`
`31`	`31`	`'`
`32`	`32`
	`33`	`+test_expect_success 'depot typo error' '`
	`34`	`+ test_must_fail git p4 clone --dest="$git" /depot 2>errs &&`
	`35`	`+ grep "Depot paths must start with" errs`
	`36`	`+'`
	`37`	`+`
`33`	`38`	`test_expect_success 'git p4 clone @all' '`
`34`	`39`	`git p4 clone --dest="$git" //depot@all &&`
`35`	`40`	`test_when_finished cleanup_git &&`