Re: [PATCH 03/21] git p4: generate better error message for bad depot path

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 28, 2012, 18:58 UTC
Message-ID: <7vlifuklbz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1348833865-6093-4-git-send-email-pw@padd.com>

Pete Wyckoff <pw@padd.com> writes:

Show 33 quoted lines

> Depot paths must start with //.  Exit with a better explanation
> when a bad depot path is supplied.
>
> Signed-off-by: Pete Wyckoff <pw@padd.com>
> ---
>  git-p4.py               | 1 +
>  t/t9800-git-p4-basic.sh | 5 +++++
>  2 files changed, 6 insertions(+)
>
> diff --git a/git-p4.py b/git-p4.py
> index 97699ef..eef5c94 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -3035,6 +3035,7 @@ class P4Clone(P4Sync):
>          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
> index b7ad716..c5f4c88 100755
> --- 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 -q "Depot paths must start with" errs
> +'

Use of "grep -q" does not help ordinary testers, as the output will not be shown when the tests are run normally.

>  test_expect_success 'git p4 clone @all' '
>  	git p4 clone --dest="$git" //depot@all &&
>  	test_when_finished cleanup_git &&