threads / patch / 25329

patchcontrib/ciabot: git-describe commit instead of HEAD

Subject: [PATCH] contrib/ciabot: git-describe commit instead of HEAD

## tl;dr

5 messages between Oct 4, 2010 and Oct 28, 2010. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Sven Eckelmann· Oct 4, 2010, 08:02 UTC · lore

For each commit a shorter version of the name will be generated. This is either the truncated hash or the output of git-describe. The call to git-describe was only made with an empty shell variable instead of an actual commit hash. Thus it only described the current HEAD and not each commit we want to submit to cia.vc.

Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
---
I send this patch already two and four weeks ago and got no reaction.
This is a resent in case it was forgotton.
 contrib/ciabot/ciabot.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/ciabot/ciabot.py +1 −1
diff --git a/contrib/ciabot/ciabot.py b/contrib/ciabot/ciabot.py
index d0627e0..9775dff 100755
--- a/contrib/ciabot/ciabot.py
+++ b/contrib/ciabot/ciabot.py
@@ -122,7 +122,7 @@ def report(refname, merged):
     branch = os.path.basename(refname)
 
     # Compute a shortnane for the revision
-    rev = do("git describe ${merged} 2>/dev/null") or merged[:12]
+    rev = do("git describe '"+ merged +"' 2>/dev/null") or merged[:12]
 
     # Extract the neta-information for the commit
     rawcommit = do("git cat-file commit " + merged)
-- 
1.7.2.3
Junio C Hamano· Oct 4, 2010, 17:47 UTC · re: Sven Eckelmann · lore

Re: [PATCH] contrib/ciabot: git-describe commit instead of HEAD

Sven Eckelmann <sven.eckelmann@gmx.de> writes:
Show 10 quoted lines
> For each commit a shorter version of the name will be generated. This is
> either the truncated hash or the output of git-describe. The
> call to git-describe was only made with an empty shell variable instead
> of an actual commit hash. Thus it only described the current HEAD and
> not each commit we want to submit to cia.vc.
>
> Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
> ---
> I send this patch already two and four weeks ago and got no reaction.
> This is a resent in case it was forgotton.

Although the computation of "rev" indeed looks wrong, I do not see it used anywhere, so it might be a better patch to remove it ... wait, the code does something funny to slurp everything into xml via ...

	context = locals()
        context.update(globals())
        out = xml % context
Yuck.

Even though it has been my policy not to complain too loudly on stuff in contrib/ part of the tree, I have to say that this is a bit too _cute_ for my taste.

Anyway, Ok, so it _is_ used.  And it needs to be fixed.

I was hoping that Eric who took over the maintainership of contrib/ciabot/ directory in April would give his blessing sooner, without me having to look at the script.

Ack?
Show 18 quoted lines
>  contrib/ciabot/ciabot.py |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/ciabot/ciabot.py b/contrib/ciabot/ciabot.py
> index d0627e0..9775dff 100755
> --- a/contrib/ciabot/ciabot.py
> +++ b/contrib/ciabot/ciabot.py
> @@ -122,7 +122,7 @@ def report(refname, merged):
>      branch = os.path.basename(refname)
>  
>      # Compute a shortnane for the revision
> -    rev = do("git describe ${merged} 2>/dev/null") or merged[:12]
> +    rev = do("git describe '"+ merged +"' 2>/dev/null") or merged[:12]
>  
>      # Extract the neta-information for the commit
>      rawcommit = do("git cat-file commit " + merged)
> -- 
> 1.7.2.3
Sven Eckelmann· Oct 11, 2010, 10:43 UTC · re: Junio C Hamano · lore

Re: [PATCH] contrib/ciabot: git-describe commit instead of HEAD

Junio C Hamano wrote:
Show 27 quoted lines
> Sven Eckelmann <sven.eckelmann@gmx.de> writes:
> > For each commit a shorter version of the name will be generated. This is
> > either the truncated hash or the output of git-describe. The
> > call to git-describe was only made with an empty shell variable instead
> > of an actual commit hash. Thus it only described the current HEAD and
> > not each commit we want to submit to cia.vc.
> > 
> > Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
> > ---
> > I send this patch already two and four weeks ago and got no reaction.
> > This is a resent in case it was forgotton.
> 
> Although the computation of "rev" indeed looks wrong, I do not see it used
> anywhere, so it might be a better patch to remove it ... wait, the code
> does something funny to slurp everything into xml via ...
> 
> 	context = locals()
>         context.update(globals())
>         out = xml % context
> 
> Yuck.
> 
> Even though it has been my policy not to complain too loudly on stuff in
> contrib/ part of the tree, I have to say that this is a bit too _cute_ for
> my taste.
> 
> Anyway, Ok, so it _is_ used.  And it needs to be fixed.
Yes, it is a little bit confusing when reading through it, but still it is 
used. :)
 
Show 5 quoted lines
> I was hoping that Eric who took over the maintainership of contrib/ciabot/
> directory in April would give his blessing sooner, without me having to
> look at the script.
> 
> Ack?

Hm, just be sure, because I saw no other replies since this message: You expected reaction after that "Ack?" from Eric Raymond and not from me, or?

Anyway, thanks for answering :)
Kind regards,
	Sven
Junio C Hamano· Oct 13, 2010, 19:24 UTC · re: Sven Eckelmann · lore

Re: [PATCH] contrib/ciabot: git-describe commit instead of HEAD

Sven Eckelmann <sven.eckelmann@gmx.de> writes:
Show 13 quoted lines
>> Anyway, Ok, so it _is_ used.  And it needs to be fixed.
>
> Yes, it is a little bit confusing when reading through it, but still it is 
> used. :)
>  
>> I was hoping that Eric who took over the maintainership of contrib/ciabot/
>> directory in April would give his blessing sooner, without me having to
>> look at the script.
>> 
>> Ack?
>
> Hm, just be sure, because I saw no other replies since this message: You 
> expected reaction after that "Ack?" from Eric Raymond and not from me, or?
Yeah, Pinging ESR again now...
Sven Eckelmann· Oct 28, 2010, 11:16 UTC · re: Junio C Hamano · lore

Re: [PATCH] contrib/ciabot: git-describe commit instead of HEAD

On Wednesday 13 October 2010 21:24:09 Junio C Hamano wrote:
Show 17 quoted lines
> Sven Eckelmann <sven.eckelmann@gmx.de> writes:
> >> Anyway, Ok, so it _is_ used.  And it needs to be fixed.
> > 
> > Yes, it is a little bit confusing when reading through it, but still it
> > is used. :)
> > 
> >> I was hoping that Eric who took over the maintainership of
> >> contrib/ciabot/ directory in April would give his blessing sooner,
> >> without me having to look at the script.
> >> 
> >> Ack?
> > 
> > Hm, just be sure, because I saw no other replies since this message: You
> > expected reaction after that "Ack?" from Eric Raymond and not from me,
> > or?
> 
> Yeah, Pinging ESR again now...

I am sure that he is still alive because he writes stuff http://esr.ibiblio.org/ ... but I am not sure about the rest.

And yes, this is just another ping for ESR
thanks,
	Sven

← back to recent threads