Submitter | timeless |
---|---|
Date | May 8, 2016, 1:58 a.m. |
Message ID | <CAAKMeYj5GWY99UJxMMwUwC=45Yv=pmYpD=bcZwJUevvuz+qG4A@mail.gmail.com> |
Download | mbox | patch |
Permalink | /patch/14968/ |
State | Changes Requested |
Headers | show |
Comments
On 05/08/2016 03:58 AM, timeless wrote: > > Let's have a helper script which does this and just . include it from > all the scripts that use it. > This sounds like a good idea, Can we get a V3 with this? > On May 6, 2016 10:28 PM, "Matt Harbison" <mharbison72@gmail.com > <mailto:mharbison72@gmail.com>> wrote: > > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com > <mailto:matt_harbison@yahoo.com>> > # Date 1462585858 14400 > # Fri May 06 21:50:58 2016 -0400 > # Node ID f3156cc10f6d6df6463f534279a3bd73a85fc06b > # Parent af6d4a49e3615ac6cfa63b9c10811c28520434ea > tests: avoid obsolete marker warnings on the hg code repo without > evolve > > These tests run on the local Mercurial repository. If evolve is > enabled in a > config file other than the local file, it isn't loaded for the > test, causing the > warning to be emitted if obsolete markers are found. (Having said > that, I see > that the Linux install I have enables evolve only from the user > config, so maybe > this is somehow Windows specific?) > > The problem tests observed between timeless and I were limited to > *-shbang.t and > *-execute.t. But since check-commit.t also had this from the > beginning, I added > this to all of the other check-* tests with #require test-repo for > consistency. > > diff --git a/tests/test-check-code.t b/tests/test-check-code.t > --- a/tests/test-check-code.t > +++ b/tests/test-check-code.t > @@ -1,5 +1,11 @@ > #require test-repo > > + $ cat >> $HGRCPATH <<EOF > + > # Silence "obsolete feature not enabled, but markers found" > warnings > + > [experimental] > + > evolution=createmarkers > + > EOF > + > $ check_code="$TESTDIR"/../contrib/check-code.py > $ cd "$TESTDIR"/.. > > diff --git a/tests/test-check-config.t b/tests/test-check-config.t > --- a/tests/test-check-config.t > +++ b/tests/test-check-config.t > @@ -1,5 +1,11 @@ > #require test-repo > > + $ cat >> $HGRCPATH <<EOF > + > # Silence "obsolete feature not enabled, but markers found" > warnings > + > [experimental] > + > evolution=createmarkers > + > EOF > + > $ cd "$TESTDIR"/.. > > New errors are not allowed. Warnings are strongly discouraged. > diff --git a/tests/test-check-execute.t b/tests/test-check-execute.t > --- a/tests/test-check-execute.t > +++ b/tests/test-check-execute.t > @@ -1,5 +1,11 @@ > #require test-repo execbit > > + $ cat >> $HGRCPATH <<EOF > + > # Silence "obsolete feature not enabled, but markers found" > warnings > + > [experimental] > + > evolution=createmarkers > + > EOF > + > $ cd "`dirname "$TESTDIR"`" > > look for python scripts without the execute bit > diff --git a/tests/test-check-module-imports.t > b/tests/test-check-module-imports.t > --- a/tests/test-check-module-imports.t > +++ b/tests/test-check-module-imports.t > @@ -1,5 +1,11 @@ > #require test-repo > > + $ cat >> $HGRCPATH <<EOF > + > # Silence "obsolete feature not enabled, but markers found" > warnings > + > [experimental] > + > evolution=createmarkers > + > EOF > + > $ import_checker="$TESTDIR"/../contrib/import-checker.py > > Run the doctests from the import checker, and make sure > diff --git a/tests/test-check-py3-compat.t > b/tests/test-check-py3-compat.t > --- a/tests/test-check-py3-compat.t > +++ b/tests/test-check-py3-compat.t > @@ -1,5 +1,11 @@ > #require test-repo > > + $ cat >> $HGRCPATH <<EOF > + > # Silence "obsolete feature not enabled, but markers found" > warnings > + > [experimental] > + > evolution=createmarkers > + > EOF > + > $ cd "$TESTDIR"/.. > > $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python > contrib/check-py3-compat.py > diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t > --- a/tests/test-check-pyflakes.t > +++ b/tests/test-check-pyflakes.t > @@ -1,5 +1,11 @@ > #require test-repo pyflakes > > + $ cat >> $HGRCPATH <<EOF > + > # Silence "obsolete feature not enabled, but markers found" > warnings > + > [experimental] > + > evolution=createmarkers > + > EOF > + > $ cd "`dirname "$TESTDIR"`" > > run pyflakes on all tracked files ending in .py or without a file > ending > diff --git a/tests/test-check-shbang.t b/tests/test-check-shbang.t > --- a/tests/test-check-shbang.t > +++ b/tests/test-check-shbang.t > @@ -1,5 +1,11 @@ > #require test-repo > > + $ cat >> $HGRCPATH <<EOF > + > # Silence "obsolete feature not enabled, but markers found" > warnings > + > [experimental] > + > evolution=createmarkers > + > EOF > + > $ cd "`dirname "$TESTDIR"`" > > look for python scripts that do not use /usr/bin/env > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > <mailto:Mercurial-devel@mercurial-scm.org> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel > > > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> On May 8, 2016, at 4:13 AM, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote: > >> On 05/08/2016 03:58 AM, timeless wrote: >> >> Let's have a helper script which does this and just . include it from all the scripts that use it. >> > > This sounds like a good idea, Can we get a V3 with this? Yep. First, do you have a stack trace for how localrepo.obstore is being called on your Linux system Timeless? I'm still curious why you are seeing it there. > >> On May 6, 2016 10:28 PM, "Matt Harbison" <mharbison72@gmail.com <mailto:mharbison72@gmail.com>> wrote: >> >> # HG changeset patch >> # User Matt Harbison <matt_harbison@yahoo.com >> <mailto:matt_harbison@yahoo.com>> >> # Date 1462585858 14400 >> # Fri May 06 21:50:58 2016 -0400 >> # Node ID f3156cc10f6d6df6463f534279a3bd73a85fc06b >> # Parent af6d4a49e3615ac6cfa63b9c10811c28520434ea >> tests: avoid obsolete marker warnings on the hg code repo without >> evolve >> >> These tests run on the local Mercurial repository. If evolve is >> enabled in a >> config file other than the local file, it isn't loaded for the >> test, causing the >> warning to be emitted if obsolete markers are found. (Having said >> that, I see >> that the Linux install I have enables evolve only from the user >> config, so maybe >> this is somehow Windows specific?) >> >> The problem tests observed between timeless and I were limited to >> *-shbang.t and >> *-execute.t. But since check-commit.t also had this from the >> beginning, I added >> this to all of the other check-* tests with #require test-repo for >> consistency. >> >> diff --git a/tests/test-check-code.t b/tests/test-check-code.t >> --- a/tests/test-check-code.t >> +++ b/tests/test-check-code.t >> @@ -1,5 +1,11 @@ >> #require test-repo >> >> + $ cat >> $HGRCPATH <<EOF >> + > # Silence "obsolete feature not enabled, but markers found" >> warnings >> + > [experimental] >> + > evolution=createmarkers >> + > EOF >> + >> $ check_code="$TESTDIR"/../contrib/check-code.py >> $ cd "$TESTDIR"/.. >> >> diff --git a/tests/test-check-config.t b/tests/test-check-config.t >> --- a/tests/test-check-config.t >> +++ b/tests/test-check-config.t >> @@ -1,5 +1,11 @@ >> #require test-repo >> >> + $ cat >> $HGRCPATH <<EOF >> + > # Silence "obsolete feature not enabled, but markers found" >> warnings >> + > [experimental] >> + > evolution=createmarkers >> + > EOF >> + >> $ cd "$TESTDIR"/.. >> >> New errors are not allowed. Warnings are strongly discouraged. >> diff --git a/tests/test-check-execute.t b/tests/test-check-execute.t >> --- a/tests/test-check-execute.t >> +++ b/tests/test-check-execute.t >> @@ -1,5 +1,11 @@ >> #require test-repo execbit >> >> + $ cat >> $HGRCPATH <<EOF >> + > # Silence "obsolete feature not enabled, but markers found" >> warnings >> + > [experimental] >> + > evolution=createmarkers >> + > EOF >> + >> $ cd "`dirname "$TESTDIR"`" >> >> look for python scripts without the execute bit >> diff --git a/tests/test-check-module-imports.t >> b/tests/test-check-module-imports.t >> --- a/tests/test-check-module-imports.t >> +++ b/tests/test-check-module-imports.t >> @@ -1,5 +1,11 @@ >> #require test-repo >> >> + $ cat >> $HGRCPATH <<EOF >> + > # Silence "obsolete feature not enabled, but markers found" >> warnings >> + > [experimental] >> + > evolution=createmarkers >> + > EOF >> + >> $ import_checker="$TESTDIR"/../contrib/import-checker.py >> >> Run the doctests from the import checker, and make sure >> diff --git a/tests/test-check-py3-compat.t >> b/tests/test-check-py3-compat.t >> --- a/tests/test-check-py3-compat.t >> +++ b/tests/test-check-py3-compat.t >> @@ -1,5 +1,11 @@ >> #require test-repo >> >> + $ cat >> $HGRCPATH <<EOF >> + > # Silence "obsolete feature not enabled, but markers found" >> warnings >> + > [experimental] >> + > evolution=createmarkers >> + > EOF >> + >> $ cd "$TESTDIR"/.. >> >> $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python >> contrib/check-py3-compat.py >> diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t >> --- a/tests/test-check-pyflakes.t >> +++ b/tests/test-check-pyflakes.t >> @@ -1,5 +1,11 @@ >> #require test-repo pyflakes >> >> + $ cat >> $HGRCPATH <<EOF >> + > # Silence "obsolete feature not enabled, but markers found" >> warnings >> + > [experimental] >> + > evolution=createmarkers >> + > EOF >> + >> $ cd "`dirname "$TESTDIR"`" >> >> run pyflakes on all tracked files ending in .py or without a file >> ending >> diff --git a/tests/test-check-shbang.t b/tests/test-check-shbang.t >> --- a/tests/test-check-shbang.t >> +++ b/tests/test-check-shbang.t >> @@ -1,5 +1,11 @@ >> #require test-repo >> >> + $ cat >> $HGRCPATH <<EOF >> + > # Silence "obsolete feature not enabled, but markers found" >> warnings >> + > [experimental] >> + > evolution=createmarkers >> + > EOF >> + >> $ cd "`dirname "$TESTDIR"`" >> >> look for python scripts that do not use /usr/bin/env >> _______________________________________________ >> Mercurial-devel mailing list >> Mercurial-devel@mercurial-scm.org >> <mailto:Mercurial-devel@mercurial-scm.org> >> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >> >> >> >> _______________________________________________ >> Mercurial-devel mailing list >> Mercurial-devel@mercurial-scm.org >> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >
>> obsstore [localrepository] localrepo.py:489 __get__ [storecache] scmutil.py:1202 __get__ [storecache] localrepo.py:70 getrevs obsolete.py:1094 hideablerevs repoview.py:33 computehidden repoview.py:175 filterrevs repoview.py:261 changelog [proxycls] repoview.py:319 _changeset [changectx] context.py:527 __get__ [propertycache] util.py:737 _manifest [changectx] context.py:531 __get__ [propertycache] util.py:737 __contains__ [changectx] context.py:87 _checklookup [workingctx] context.py:1546 _dirstatestatus [workingctx] context.py:1601 _buildstatus [workingctx] context.py:1628 status [changectx] context.py:351 status [proxycls] localrepo.py:1815 status commands.py:6597 check util.py:1005 <lambda> dispatch.py:888 checkargs dispatch.py:982 _runcommand dispatch.py:1021 runcommand dispatch.py:636 _dispatch dispatch.py:891 _runcatch dispatch.py:204 dispatch dispatch.py:125 run dispatch.py:59 <module> hg:63 On Sun, May 8, 2016 at 9:28 PM, Matt Harbison <mharbison72@gmail.com> wrote: > > >> On May 8, 2016, at 4:13 AM, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote: >> >>> On 05/08/2016 03:58 AM, timeless wrote: >>> >>> Let's have a helper script which does this and just . include it from all the scripts that use it. >>> >> >> This sounds like a good idea, Can we get a V3 with this? > > Yep. First, do you have a stack trace for how localrepo.obstore is being called on your Linux system Timeless? I'm still curious why you are seeing it there. > >> >>> On May 6, 2016 10:28 PM, "Matt Harbison" <mharbison72@gmail.com <mailto:mharbison72@gmail.com>> wrote: >>> >>> # HG changeset patch >>> # User Matt Harbison <matt_harbison@yahoo.com >>> <mailto:matt_harbison@yahoo.com>> >>> # Date 1462585858 14400 >>> # Fri May 06 21:50:58 2016 -0400 >>> # Node ID f3156cc10f6d6df6463f534279a3bd73a85fc06b >>> # Parent af6d4a49e3615ac6cfa63b9c10811c28520434ea >>> tests: avoid obsolete marker warnings on the hg code repo without >>> evolve >>> >>> These tests run on the local Mercurial repository. If evolve is >>> enabled in a >>> config file other than the local file, it isn't loaded for the >>> test, causing the >>> warning to be emitted if obsolete markers are found. (Having said >>> that, I see >>> that the Linux install I have enables evolve only from the user >>> config, so maybe >>> this is somehow Windows specific?) >>> >>> The problem tests observed between timeless and I were limited to >>> *-shbang.t and >>> *-execute.t. But since check-commit.t also had this from the >>> beginning, I added >>> this to all of the other check-* tests with #require test-repo for >>> consistency. >>> >>> diff --git a/tests/test-check-code.t b/tests/test-check-code.t >>> --- a/tests/test-check-code.t >>> +++ b/tests/test-check-code.t >>> @@ -1,5 +1,11 @@ >>> #require test-repo >>> >>> + $ cat >> $HGRCPATH <<EOF >>> + > # Silence "obsolete feature not enabled, but markers found" >>> warnings >>> + > [experimental] >>> + > evolution=createmarkers >>> + > EOF >>> + >>> $ check_code="$TESTDIR"/../contrib/check-code.py >>> $ cd "$TESTDIR"/.. >>> >>> diff --git a/tests/test-check-config.t b/tests/test-check-config.t >>> --- a/tests/test-check-config.t >>> +++ b/tests/test-check-config.t >>> @@ -1,5 +1,11 @@ >>> #require test-repo >>> >>> + $ cat >> $HGRCPATH <<EOF >>> + > # Silence "obsolete feature not enabled, but markers found" >>> warnings >>> + > [experimental] >>> + > evolution=createmarkers >>> + > EOF >>> + >>> $ cd "$TESTDIR"/.. >>> >>> New errors are not allowed. Warnings are strongly discouraged. >>> diff --git a/tests/test-check-execute.t b/tests/test-check-execute.t >>> --- a/tests/test-check-execute.t >>> +++ b/tests/test-check-execute.t >>> @@ -1,5 +1,11 @@ >>> #require test-repo execbit >>> >>> + $ cat >> $HGRCPATH <<EOF >>> + > # Silence "obsolete feature not enabled, but markers found" >>> warnings >>> + > [experimental] >>> + > evolution=createmarkers >>> + > EOF >>> + >>> $ cd "`dirname "$TESTDIR"`" >>> >>> look for python scripts without the execute bit >>> diff --git a/tests/test-check-module-imports.t >>> b/tests/test-check-module-imports.t >>> --- a/tests/test-check-module-imports.t >>> +++ b/tests/test-check-module-imports.t >>> @@ -1,5 +1,11 @@ >>> #require test-repo >>> >>> + $ cat >> $HGRCPATH <<EOF >>> + > # Silence "obsolete feature not enabled, but markers found" >>> warnings >>> + > [experimental] >>> + > evolution=createmarkers >>> + > EOF >>> + >>> $ import_checker="$TESTDIR"/../contrib/import-checker.py >>> >>> Run the doctests from the import checker, and make sure >>> diff --git a/tests/test-check-py3-compat.t >>> b/tests/test-check-py3-compat.t >>> --- a/tests/test-check-py3-compat.t >>> +++ b/tests/test-check-py3-compat.t >>> @@ -1,5 +1,11 @@ >>> #require test-repo >>> >>> + $ cat >> $HGRCPATH <<EOF >>> + > # Silence "obsolete feature not enabled, but markers found" >>> warnings >>> + > [experimental] >>> + > evolution=createmarkers >>> + > EOF >>> + >>> $ cd "$TESTDIR"/.. >>> >>> $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python >>> contrib/check-py3-compat.py >>> diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t >>> --- a/tests/test-check-pyflakes.t >>> +++ b/tests/test-check-pyflakes.t >>> @@ -1,5 +1,11 @@ >>> #require test-repo pyflakes >>> >>> + $ cat >> $HGRCPATH <<EOF >>> + > # Silence "obsolete feature not enabled, but markers found" >>> warnings >>> + > [experimental] >>> + > evolution=createmarkers >>> + > EOF >>> + >>> $ cd "`dirname "$TESTDIR"`" >>> >>> run pyflakes on all tracked files ending in .py or without a file >>> ending >>> diff --git a/tests/test-check-shbang.t b/tests/test-check-shbang.t >>> --- a/tests/test-check-shbang.t >>> +++ b/tests/test-check-shbang.t >>> @@ -1,5 +1,11 @@ >>> #require test-repo >>> >>> + $ cat >> $HGRCPATH <<EOF >>> + > # Silence "obsolete feature not enabled, but markers found" >>> warnings >>> + > [experimental] >>> + > evolution=createmarkers >>> + > EOF >>> + >>> $ cd "`dirname "$TESTDIR"`" >>> >>> look for python scripts that do not use /usr/bin/env >>> _______________________________________________ >>> Mercurial-devel mailing list >>> Mercurial-devel@mercurial-scm.org >>> <mailto:Mercurial-devel@mercurial-scm.org> >>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >>> >>> >>> >>> _______________________________________________ >>> Mercurial-devel mailing list >>> Mercurial-devel@mercurial-scm.org >>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >>
Patch
diff --git a/tests/test-check-code.t b/tests/test-check-code.t --- a/tests/test-check-code.t +++ b/tests/test-check-code.t @@ -1,5 +1,11 @@ #require test-repo + $ cat >> $HGRCPATH <<EOF + > # Silence "obsolete feature not enabled, but markers found" warnings + > [experimental] + > evolution=createmarkers + > EOF + $ check_code="$TESTDIR"/../contrib/check-code.py $ cd "$TESTDIR"/.. diff --git a/tests/test-check-config.t b/tests/test-check-config.t --- a/tests/test-check-config.t +++ b/tests/test-check-config.t @@ -1,5 +1,11 @@ #require test-repo + $ cat >> $HGRCPATH <<EOF + > # Silence "obsolete feature not enabled, but markers found" warnings + > [experimental] + > evolution=createmarkers + > EOF + $ cd "$TESTDIR"/.. New errors are not allowed. Warnings are strongly discouraged. diff --git a/tests/test-check-execute.t b/tests/test-check-execute.t --- a/tests/test-check-execute.t +++ b/tests/test-check-execute.t @@ -1,5 +1,11 @@ #require test-repo execbit + $ cat >> $HGRCPATH <<EOF + > # Silence "obsolete feature not enabled, but markers found" warnings + > [experimental] + > evolution=createmarkers + > EOF + $ cd "`dirname "$TESTDIR"`" look for python scripts without the execute bit diff --git a/tests/test-check-module-imports.t b/tests/test-check-module-imports.t --- a/tests/test-check-module-imports.t +++ b/tests/test-check-module-imports.t @@ -1,5 +1,11 @@ #require test-repo + $ cat >> $HGRCPATH <<EOF + > # Silence "obsolete feature not enabled, but markers found" warnings + > [experimental] + > evolution=createmarkers + > EOF + $ import_checker="$TESTDIR"/../contrib/import-checker.py Run the doctests from the import checker, and make sure diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -1,5 +1,11 @@ #require test-repo + $ cat >> $HGRCPATH <<EOF + > # Silence "obsolete feature not enabled, but markers found" warnings + > [experimental] + > evolution=createmarkers + > EOF + $ cd "$TESTDIR"/.. $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python contrib/check-py3-compat.py diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t --- a/tests/test-check-pyflakes.t +++ b/tests/test-check-pyflakes.t @@ -1,5 +1,11 @@ #require test-repo pyflakes + $ cat >> $HGRCPATH <<EOF + > # Silence "obsolete feature not enabled, but markers found" warnings + > [experimental] + > evolution=createmarkers + > EOF + $ cd "`dirname "$TESTDIR"`" run pyflakes on all tracked files ending in .py or without a file ending diff --git a/tests/test-check-shbang.t b/tests/test-check-shbang.t --- a/tests/test-check-shbang.t +++ b/tests/test-check-shbang.t @@ -1,5 +1,11 @@ #require test-repo + $ cat >> $HGRCPATH <<EOF + > # Silence "obsolete feature not enabled, but markers found" warnings + > [experimental] + > evolution=createmarkers + > EOF + $ cd "`dirname "$TESTDIR"`" look for python scripts that do not use /usr/bin/env