Patchwork make: drop deprecated rule to process temporary copy of pure modules

login
register
mail settings
Submitter Yuya Nishihara
Date May 3, 2017, 1:49 a.m.
Message ID <9b1232b9e87d69465744.1493776199@mimosa>
Download mbox | patch
Permalink /patch/20384/
State Accepted
Headers show

Comments

Yuya Nishihara - May 3, 2017, 1:49 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1470969402 -32400
#      Fri Aug 12 11:36:42 2016 +0900
# Node ID 9b1232b9e87d69465744d8b50a7c84fc2e60347a
# Parent  6cacc271ee0a9385be483314dc73be176a13c891
make: drop deprecated rule to process temporary copy of pure modules

Pure modules never be copied to mercurial/ since 511a4384b033.
Gregory Szorc - May 4, 2017, 6:53 a.m.
On Tue, May 2, 2017 at 6:49 PM, Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1470969402 -32400
> #      Fri Aug 12 11:36:42 2016 +0900
> # Node ID 9b1232b9e87d69465744d8b50a7c84fc2e60347a
> # Parent  6cacc271ee0a9385be483314dc73be176a13c891
> make: drop deprecated rule to process temporary copy of pure modules
>
> Pure modules never be copied to mercurial/ since 511a4384b033.
>

This could come into play if someone is bisecting and running `make local`
(or equivalent) on old revisions. But I suppose it has been long enough
that this can be considered dead code. So I'm OK with it.


>
> diff --git a/.hgignore b/.hgignore
> --- a/.hgignore
> +++ b/.hgignore
> @@ -54,14 +54,6 @@ i18n/hg.pot
>  locale/*/LC_MESSAGES/hg.mo
>  hgext/__index__.py
>
> -# files installed with a local --pure build
> -mercurial/base85.py
> -mercurial/bdiff.py
> -mercurial/diffhelpers.py
> -mercurial/mpatch.py
> -mercurial/osutil.py
> -mercurial/parsers.py
> -
>  # Generated wheels
>  wheelhouse/
>
> diff --git a/Makefile b/Makefile
> --- a/Makefile
> +++ b/Makefile
> @@ -64,7 +64,6 @@ cleanbutpackages:
>         -$(PYTHON) setup.py clean --all # ignore errors from this command
>         find contrib doc hgext hgext3rd i18n mercurial tests \
>                 \( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}'
> ';'
> -       rm -f $(addprefix mercurial/,$(notdir $(wildcard
> mercurial/pure/[a-z]*.py)))
>         rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
>         rm -f mercurial/__modulepolicy__.py
>         if test -d .hg; then rm -f mercurial/__version__.py; fi
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Augie Fackler - May 6, 2017, 4:55 p.m.
On Wed, May 03, 2017 at 11:53:48PM -0700, Gregory Szorc wrote:
> On Tue, May 2, 2017 at 6:49 PM, Yuya Nishihara <yuya@tcha.org> wrote:
>
> > # HG changeset patch
> > # User Yuya Nishihara <yuya@tcha.org>
> > # Date 1470969402 -32400
> > #      Fri Aug 12 11:36:42 2016 +0900
> > # Node ID 9b1232b9e87d69465744d8b50a7c84fc2e60347a
> > # Parent  6cacc271ee0a9385be483314dc73be176a13c891
> > make: drop deprecated rule to process temporary copy of pure modules
> >
> > Pure modules never be copied to mercurial/ since 511a4384b033.
> >
>
> This could come into play if someone is bisecting and running `make local`
> (or equivalent) on old revisions. But I suppose it has been long enough
> that this can be considered dead code. So I'm OK with it.

Yeah, it's probably been long enough. Queued, thanks.

Patch

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -54,14 +54,6 @@  i18n/hg.pot
 locale/*/LC_MESSAGES/hg.mo
 hgext/__index__.py
 
-# files installed with a local --pure build
-mercurial/base85.py
-mercurial/bdiff.py
-mercurial/diffhelpers.py
-mercurial/mpatch.py
-mercurial/osutil.py
-mercurial/parsers.py
-
 # Generated wheels
 wheelhouse/
 
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,6 @@  cleanbutpackages:
 	-$(PYTHON) setup.py clean --all # ignore errors from this command
 	find contrib doc hgext hgext3rd i18n mercurial tests \
 		\( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
-	rm -f $(addprefix mercurial/,$(notdir $(wildcard mercurial/pure/[a-z]*.py)))
 	rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
 	rm -f mercurial/__modulepolicy__.py
 	if test -d .hg; then rm -f mercurial/__version__.py; fi