Re: [PATCH 04/21] git p4: fix error message when "describe -s" fails

2012-09-28 Thread Junio C Hamano 
Pete Wyckoff  writes:

> The output was a bit nonsensical, including a bare %d.  Fix it
> to make it easier to understand.
>
> Signed-off-by: Pete Wyckoff 
> ---
>  git-p4.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index eef5c94..d7ee4b4 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -2679,7 +2679,8 @@ class P4Sync(Command, P4UserMap):
>  if r.has_key('time'):
>  newestTime = int(r['time'])
>  if newestTime is None:
> -die("\"describe -s\" on newest change %d did not give a time")
> +die("Output from \"describe -s\" on newest change %d did not 
> give a time" %
> +newestRevision)

Shouldn't it say "p4 describe -s"?

>  details["time"] = newestTime
>  
>  self.updateOptionDict(details)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 04/21] git p4: fix error message when "describe -s" fails

2012-09-28 Thread Pete Wyckoff 
The output was a bit nonsensical, including a bare %d.  Fix it
to make it easier to understand.

Signed-off-by: Pete Wyckoff 
---
 git-p4.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-p4.py b/git-p4.py
index eef5c94..d7ee4b4 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2679,7 +2679,8 @@ class P4Sync(Command, P4UserMap):
 if r.has_key('time'):
 newestTime = int(r['time'])
 if newestTime is None:
-die("\"describe -s\" on newest change %d did not give a time")
+die("Output from \"describe -s\" on newest change %d did not give 
a time" %
+newestRevision)
 details["time"] = newestTime
 
 self.updateOptionDict(details)
-- 
1.7.12.1.403.g28165e1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html