[PATCH STABLE] mq: use fallback patch name if no alpha-numeric byte in the summary line

Yuya Nishihara yuya at tcha.org
Fri Dec 25 06:09:44 CST 2015


On Wed, 23 Dec 2015 22:33:11 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1450877332 -32400
> #      Wed Dec 23 22:28:52 2015 +0900
> # Branch stable
> # Node ID 7aa93dad8092b571fb5ab0b3e3509a0320546b64
> # Parent  e47841c8343d06b91637c84866bf1469b835b1f7
> mq: use fallback patch name if no alpha-numeric byte in the summary line

I've added (issue5025).

> diff --git a/hgext/mq.py b/hgext/mq.py
> --- a/hgext/mq.py
> +++ b/hgext/mq.py
> @@ -395,10 +395,12 @@ def newcommit(repo, phase, *args, **kwar
>  class AbortNoCleanup(error.Abort):
>      pass
>  
> -def makepatchname(existing, title):
> +def makepatchname(existing, title, fallbackname):
>      """Return a suitable filename for title, adding a suffix to make
>      it unique in the existing list"""
>      namebase = re.sub('[\s\W_]+', '_', title.lower()).strip('_')
> +    if not namebase:
> +        namebase = fallbackname
>      name = namebase
>      i = 0
>      while name in existing:
> @@ -2101,7 +2103,8 @@ class queue(object):
>  
>                      if not patchname:
>                          patchname = makepatchname(self.fullseries,
> -                            repo[r].description().split('\n', 1)[0])
> +                            repo[r].description().split('\n', 1)[0],
> +                                                  '%d.diff' % r)

Looks good as it was '%d.diff' before 143b52fce68e.
Pushed to the clowncopter, thanks.


More information about the Mercurial-devel mailing list