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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71229

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

Replacement of http://codereview.chromium.org/5393002/ since the repository
changed in the meantime.

[mr.kschan, 2010-12-23 14:50:56]

On Thu, Dec 23, 2010 at 10:39 PM, <maruel@chromium.org> wrote:

> Reviewers: Evan Martin, mr.kschan,
>
> Message:
> Replacement of http://codereview.chromium.org/5393002/ since the
> repository
> changed in the meantime.
>
> 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/6079003/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/git_cl
>
>
Hi Maruel,

Do you mean git-cl is no longer on git repository of chromium?

ks


> Affected files:
>  M git_cl/git_cl.py
>
>
> Index: git_cl/git_cl.py
> diff --git a/git_cl/git_cl.py b/git_cl/git_cl.py
> index
>
ea1238261dc8c1aa2fe6d30485a13264bd1de242..6d153f8d7a318f9f906d7d82117d87799eaa3a18
> 100644
> --- a/git_cl/git_cl.py
> +++ b/git_cl/git_cl.py
> @@ -996,7 +996,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:53:42]

On 2010/12/23 14:50:56, mr.kschan wrote:
> Do you mean git-cl is no longer on git repository of chromium?

Exact.

[M-A Ruel, 2011-01-11 23:42:12]

Evan?

[evanm, 2011-01-12 00:21:06]

LGTM otherwsie

http://codereview.chromium.org/6079003/diff/1/git_cl/git_cl.py
File git_cl/git_cl.py (right):

http://codereview.chromium.org/6079003/diff/1/git_cl/git_cl.py#newcode999
git_cl/git_cl.py:999: m = (re.match(r'.*?([a-f0-9]{7})\.\.([a-f0-9]{7})$', l)
Can you use longer variable names?  ("match" instead of "m", the "l" is fine)

http://codereview.chromium.org/6079003/diff/1/git_cl/git_cl.py#newcode1002
git_cl/git_cl.py:1002: if not len(m) == 1:
Didn't realize this was valid Python (rather than len(m) != 1)

[commit-bot: I haz the power, 2011-01-12 20:42:16]

Patch verification failed