Patchwork [2,of,2,V2+] Makefile: temporary copy of hg.pot ist hg.pot.tmp instead of hg.pot~

login
register
mail settings
Submitter Simon Heimberg
Date Nov. 25, 2013, 8:24 p.m.
Message ID <c7b23cfd88514a15d46a.1385411076@lapsi.heimberg.home>
Download mbox | patch
Permalink /patch/3132/
State Superseded
Headers show

Comments

Simon Heimberg - Nov. 25, 2013, 8:24 p.m.
# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1384687106 -3600
# Node ID c7b23cfd88514a15d46ae32e35dbfb008040e9f0
# Parent  78670e69a7e22e7905bd5868297815ff14d96260
Makefile: temporary copy of hg.pot ist hg.pot.tmp instead of hg.pot~

The file ending of temporary files for generating XX.po has been changed to
.tmp (from ~). Use the same ending when generating hg.pot.
Simon Heimberg - Nov. 25, 2013, 8:30 p.m.
s/ist/is/ (in description of this patch)

Shall I resend?

On 25.11.2013 21:24, Simon Heimberg wrote:
> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1384687106 -3600
> # Node ID c7b23cfd88514a15d46ae32e35dbfb008040e9f0
> # Parent  78670e69a7e22e7905bd5868297815ff14d96260
> Makefile: temporary copy of hg.pot ist hg.pot.tmp instead of hg.pot~
>
> The file ending of temporary files for generating XX.po has been changed to
> .tmp (from ~). Use the same ending when generating hg.pot.
>
> diff -r 78670e69a7e2 -r c7b23cfd8851 Makefile
> --- a/Makefile	Son Nov 17 12:17:55 2013 +0100
> +++ b/Makefile	Son Nov 17 12:18:26 2013 +0100
> @@ -108,7 +108,7 @@
>   	  mercurial/fileset.py mercurial/revset.py \
>   	  mercurial/templatefilters.py mercurial/templatekw.py \
>   	  mercurial/filemerge.py \
> -	  $(DOCFILES) > i18n/hg.pot~
> +	  $(DOCFILES) > i18n/hg.pot.tmp
>           # All strings marked for translation in Mercurial contain
>           # ASCII characters only. But some files contain string
>           # literals like this '\037\213'. xgettext thinks it has to
> @@ -120,11 +120,11 @@
>   	  --msgid-bugs-address "<mercurial-devel@selenic.com>" \
>   	  --copyright-holder "Matt Mackall <mpm@selenic.com> and others" \
>   	  --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
> -	  -d hg -p i18n -o hg.pot~
> -	$(PYTHON) i18n/posplit i18n/hg.pot~
> +	  -d hg -p i18n -o hg.pot.tmp
> +	$(PYTHON) i18n/posplit i18n/hg.pot.tmp
>           # The target file is not created before the last step. So it never is in
>           # an intermediate state.
> -	mv -f i18n/hg.pot~ i18n/hg.pot
> +	mv -f i18n/hg.pot.tmp i18n/hg.pot
>
>   %.po: i18n/hg.pot
>           # work on a temporary copy for never having a half completed target
>
Matt Mackall - Nov. 25, 2013, 8:34 p.m.
On Mon, 2013-11-25 at 21:30 +0100, Simon Heimberg wrote:
> s/ist/is/ (in description of this patch)
> 
> Shall I resend?

I've lost the plot, so probably.

Patch

diff -r 78670e69a7e2 -r c7b23cfd8851 Makefile
--- a/Makefile	Son Nov 17 12:17:55 2013 +0100
+++ b/Makefile	Son Nov 17 12:18:26 2013 +0100
@@ -108,7 +108,7 @@ 
 	  mercurial/fileset.py mercurial/revset.py \
 	  mercurial/templatefilters.py mercurial/templatekw.py \
 	  mercurial/filemerge.py \
-	  $(DOCFILES) > i18n/hg.pot~
+	  $(DOCFILES) > i18n/hg.pot.tmp
         # All strings marked for translation in Mercurial contain
         # ASCII characters only. But some files contain string
         # literals like this '\037\213'. xgettext thinks it has to
@@ -120,11 +120,11 @@ 
 	  --msgid-bugs-address "<mercurial-devel@selenic.com>" \
 	  --copyright-holder "Matt Mackall <mpm@selenic.com> and others" \
 	  --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
-	  -d hg -p i18n -o hg.pot~
-	$(PYTHON) i18n/posplit i18n/hg.pot~
+	  -d hg -p i18n -o hg.pot.tmp
+	$(PYTHON) i18n/posplit i18n/hg.pot.tmp
         # The target file is not created before the last step. So it never is in
         # an intermediate state.
-	mv -f i18n/hg.pot~ i18n/hg.pot
+	mv -f i18n/hg.pot.tmp i18n/hg.pot
 
 %.po: i18n/hg.pot
         # work on a temporary copy for never having a half completed target