Improve parsing of committed hash to be more resilient.

Improve parsing of committed hash to be more resilient.

TEST=Verified that if this code breaks, the presubmit checks fail.
BUG=none

[M-A Ruel, 2010-11-26 17:15:26]

Feel free to "git cl patch 5393002" to confirm it fixes the problem.

[mr.kschan, 2010-11-29 02:07:17]

On Sat, Nov 27, 2010 at 1:15 AM, <maruel@chromium.org> wrote:

> Reviewers: Evan Martin,
>
> Message:
> Feel free to "git cl patch 5393002" to confirm it fixes the problem.
>

confirmed working properly on my linux box

kschan.


>
> Description:
> Improve parsing of committed hash to be more resilient.
>
> TEST=Verified that if this code breaks, the presubmit checks fail.
> BUG=none
>
> Please review this at http://codereview.chromium.org/5393002/
>
> SVN Base: http://git.chromium.org/git/git-cl.git@master
>
> Affected files:
>  M git_cl.py
>
>
> Index: git_cl.py
> diff --git a/git_cl.py b/git_cl.py
> index
>
02b94e3d395b8ca3d56bb6f414c7c7b1ff5e048f..f7c9471202e6dbad5286e3b7c9c6b3acaca0840c
> 100644
> --- a/git_cl.py
> +++ b/git_cl.py
> @@ -994,7 +994,13 @@ def SendUpstream(parser, args, cmd):
>     if cmd == 'dcommit' and 'Committed r' in output:
>       revision = re.match('.*?\nCommitted r(\\d+)', output,
> re.DOTALL).group(1)
>     elif cmd == 'push' and retcode == 0:
> -      revision = output.splitlines()[1].split('\t')[2].split('..')[1]
> +      m = (re.match(r'.*?([a-f0-9]{7})\.\.([a-f0-9]{7})$', l)
> +           for l in output.splitlines(False))
> +      m = filter(None, m)
> +      if not len(m) == 1:
> +        DieWithError("Couldn't parse ouput to extract the committed
> hash:\n%s" %
> +            output)
> +      revision = m[0].group(2)
>     else:
>       return 1
>     viewvc_url = settings.GetViewVCUrl()
>
>
>


-- 
Please do not send me Microsoft Office/Apple iWork documents. Send
OpenDocument (.pdf, .odt, .ods, .odp, etc.) instead!

http://fsf.org/campaigns/opendocument/

[mr.kschan, 2010-12-23 07:42:34]

On 2010/11/29 02:07:17, mr.kschan wrote:
> On Sat, Nov 27, 2010 at 1:15 AM, <mailto:maruel@chromium.org> wrote:
> 
> > Reviewers: Evan Martin,
> >
> > Message:
> > Feel free to "git cl patch 5393002" to confirm it fixes the problem.
> >
> 
> confirmed working properly on my linux box
> 
> kschan.

Hi there,

Is this patch pushed to git-cl master?

> 
> 
> >
> > Description:
> > Improve parsing of committed hash to be more resilient.
> >
> > TEST=Verified that if this code breaks, the presubmit checks fail.
> > BUG=none
> >
> > Please review this at http://codereview.chromium.org/5393002/
> >
> > SVN Base: http://git.chromium.org/git/git-cl.git%40master
> >
> > Affected files:
> >  M git_cl.py
> >
> >
> > Index: git_cl.py
> > diff --git a/git_cl.py b/git_cl.py
> > index
> >
>
02b94e3d395b8ca3d56bb6f414c7c7b1ff5e048f..f7c9471202e6dbad5286e3b7c9c6b3acaca0840c
> > 100644
> > --- a/git_cl.py
> > +++ b/git_cl.py
> > @@ -994,7 +994,13 @@ def SendUpstream(parser, args, cmd):
> >     if cmd == 'dcommit' and 'Committed r' in output:
> >       revision = re.match('.*?\nCommitted r(\\d+)', output,
> > re.DOTALL).group(1)
> >     elif cmd == 'push' and retcode == 0:
> > -      revision = output.splitlines()[1].split('\t')[2].split('..')[1]
> > +      m = (re.match(r'.*?([a-f0-9]{7})\.\.([a-f0-9]{7})$', l)
> > +           for l in output.splitlines(False))
> > +      m = filter(None, m)
> > +      if not len(m) == 1:
> > +        DieWithError("Couldn't parse ouput to extract the committed
> > hash:\n%s" %
> > +            output)
> > +      revision = m[0].group(2)
> >     else:
> >       return 1
> >     viewvc_url = settings.GetViewVCUrl()
> >
> >
> >
> 
> 
> -- 
> Please do not send me Microsoft Office/Apple iWork documents. Send
> OpenDocument (.pdf, .odt, .ods, .odp, etc.) instead!
> 
> http://fsf.org/campaigns/opendocument/

[M-A Ruel, 2010-12-23 14:39:49]

On 2010/12/23 07:42:34, mr.kschan wrote:
> On 2010/11/29 02:07:17, mr.kschan wrote:
> > confirmed working properly on my linux box
> > 
> > kschan.
> 
> Hi there,
> 
> Is this patch pushed to git-cl master?

No sorry I totally forgot about it, in the meantime we switched of repo so I
sent another code review.