D5199: test: fix self._testdir to use ues the right mercurial library during testing

yuja added a comment. > - a/tests/run-tests.py +++ b/tests/run-tests.py @@ -2527,13 +2527,14 @@ os.umask(oldmask) > > def _run(self, testdescs): +testdir = getcwdb() > self._testdir = osenvironb[b'TESTDIR'] = getcwdb() Nit: maybe this line has to be removed.

Re: D5199: test: fix self._testdir to use ues the right mercurial library during testing

> --- a/tests/run-tests.py > +++ b/tests/run-tests.py > @@ -2527,13 +2527,14 @@ > os.umask(oldmask) > > def _run(self, testdescs): > +testdir = getcwdb() > self._testdir = osenvironb[b'TESTDIR'] = getcwdb() Nit: maybe this line has to be removed. >

Re: D5200: fix: add a config to abort when a fixer tool fails

Looks good, but test-check-config.t failed probably because the doc couldn't be found by the checker. > @@ -464,9 +488,14 @@ > showstderr(ui, fixctx.rev(), fixername, stderr) > if proc.returncode == 0: > newdata = newerdata > -elif not

D5207: tests: skip wireproto clientreactor tests on Python 3.6.0-3.6.3 inclusive

This revision was automatically updated to reflect the committed changes. Closed by commit rHG07b87ee2ea75: tests: skip wireproto clientreactor tests on Python 3.6.0-3.6.3 inclusive (authored by durin42, committed by ). CHANGED PRIOR TO COMMIT

D5204: tests: add a critical flush() to run-tests.py to make output stable on py3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG176c26a21123: tests: add a critical flush() to run-tests.py to make output stable on py3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

mercurial@40471: 4 new changesets

4 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/1f0c5c9a1765 changeset: 40468:1f0c5c9a1765 user:Boris Feld date:Thu Nov 01 14:29:14 2018 +0100 summary: test: drop usage of `HGMERGE` in `test-lfconvert.t`

D5200: fix: add a config to abort when a fixer tool fails

yuja added a comment. Looks good, but test-check-config.t failed probably because the doc couldn't be found by the checker. > @@ -464,9 +488,14 @@ > > showstderr(ui, fixctx.rev(), fixername, stderr) > if proc.returncode == 0: > newdata = newerdata > > - elif

D5207: tests: skip wireproto clientreactor tests on Python 3.6.0-3.6.3 inclusive

yuja added a comment. > if __name__ == '__main__': > > +if (3, 6, 0) <= sys.version_info <= (3, 6, 3): > +# Python 3.6.0 through 3.6.3 inclusive shipped with > +# https://bugs.python.org/issue31825 and we can't run these > +# tests on those specific

Re: D5207: tests: skip wireproto clientreactor tests on Python 3.6.0-3.6.3 inclusive

> if __name__ == '__main__': > +if (3, 6, 0) <= sys.version_info <= (3, 6, 3): > +# Python 3.6.0 through 3.6.3 inclusive shipped with > +# https://bugs.python.org/issue31825 and we can't run these > +# tests on those specific versions of Python. Sigh. > +

D5210: statprof: clean up unicode/bytes a little

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8664fdc1cfb3: statprof: clean up unicode/bytes a little (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5210?vs=12365=12386

D5210: statprof: clean up unicode/bytes a little

yuja added a comment. Queued, thanks. > - sitelabel = '%s:%d:%s' % (pycompat.fsencode(site.filename()), + sitelabel = '%s:%d:%s' % (site.filename(), Maybe missing b'' ? > - pycompat.sysbytes(site.function)) + site.function)

Re: D5210: statprof: clean up unicode/bytes a little

Queued, thanks. > -sitelabel = '%s:%d:%s' % (pycompat.fsencode(site.filename()), > +sitelabel = '%s:%d:%s' % (site.filename(), Maybe missing b'' ? > - pycompat.sysbytes(site.function)) > + site.function) >

D5094: merge-tools: when calling external merge tool, describe the resolve inputs

This revision was automatically updated to reflect the committed changes. Closed by commit rHG86dfae98a3a2: merge-tools: when calling external merge tool, describe the resolve inputs (authored by spectral, committed by ). CHANGED PRIOR TO COMMIT

D5208: tests: add some helpful `|| cat` bits to test-profile.t

This revision was automatically updated to reflect the committed changes. Closed by commit rHG4e6ffcb5b9fc: tests: add some helpful `|| cat` bits to test-profile.t (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

mercurial@40467: 7 new changesets

7 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c7618901584d changeset: 40461:c7618901584d user:Boris Feld date:Fri Oct 19 00:53:18 2018 +0200 summary: obsutil: prefetch method in allpredecessors loop

D5205: contrib: fix import-checker to not b'' module names on Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG99d5424eedc8: contrib: fix import-checker to not b module names on Python 3 (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5206: contrib: tweak import-checker to always use bytes for module names

This revision was automatically updated to reflect the committed changes. Closed by commit rHG90517fad4293: contrib: tweak import-checker to always use bytes for module names (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5209: statprof: add a couple of asserts to avoid storing unicodes

This revision was automatically updated to reflect the committed changes. Closed by commit rHG93501a5fd62b: statprof: add a couple of asserts to avoid storing unicodes (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH 2 of 2] obsolete: prefetch the repo.obsstore used in phasedivergence loop

# HG changeset patch # User Boris Feld # Date 1539904028 -7200 # Fri Oct 19 01:07:08 2018 +0200 # Node ID 2ba5875c72c1f3475a465c2aa7a6463ab4a31704 # Parent a2497966bf47a02572bbad448458d5a4b94fe77e # EXP-Topic bettertroubles # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 2] obsutil: prefetch method in allpredecessors loop

# HG changeset patch # User Boris Feld # Date 1539903198 -7200 # Fri Oct 19 00:53:18 2018 +0200 # Node ID a2497966bf47a02572bbad448458d5a4b94fe77e # Parent 2c0aa02ecd5a05ae76b6345962ee3a0ef773bd8a # EXP-Topic bettertroubles # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH] extensions: include current version in "invalid version" message

# HG changeset patch # User Boris Feld # Date 1524240534 -7200 # Fri Apr 20 18:08:54 2018 +0200 # Node ID 6bfa530c2f37d1d66058486aaa661d00dff45f83 # Parent e0dea186ab6edfab124b1dfd84237a4b8142f13b # EXP-Topic better-version-check # Available At https://bitbucket.org/octobus/mercurial-devel/

[PATCH 8 of 8] test: remove changes preparing the drop of `HGMERGE`

# HG changeset patch # User Boris Feld # Date 1541079318 -3600 # Thu Nov 01 14:35:18 2018 +0100 # Node ID 3c8e7922f5caef98c092f88a5d5b622326e44a38 # Parent 6f27a7b59488df033a80006b552e56c16f6acb44 # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 7 of 8] run-tests: define the default merge tool through configuration

# HG changeset patch # User Boris Feld # Date 1541078961 -3600 # Thu Nov 01 14:29:21 2018 +0100 # Node ID 6f27a7b59488df033a80006b552e56c16f6acb44 # Parent b95aef679522bd42e7041373b5af9ca4ab9ce004 # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 4 of 8] test: drop usage of `HGMERGE` in `test-merge-types.t`

# HG changeset patch # User Boris Feld # Date 1541078790 -3600 # Thu Nov 01 14:26:30 2018 +0100 # Node ID 05fcb3400a879d518b51bb470d9b4517bbbfaa75 # Parent 9de8e01ffb96120d41a48f0ca8748ed3a77a75b7 # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 5 of 8] test: drop usage of `HGMERGE` in `test-lfconvert.t`

# HG changeset patch # User Boris Feld # Date 1541078954 -3600 # Thu Nov 01 14:29:14 2018 +0100 # Node ID 063a0cb2cb31f0071c764035953fb8c3bc9bbdbc # Parent 05fcb3400a879d518b51bb470d9b4517bbbfaa75 # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

D5201: delta: skip "empty delta" optimisation for non-general case (issue6006)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG324ba8b14d78: delta: skip empty delta optimisation for non-general case (issue6006) (authored by lothiraldan, committed by ). CHANGED PRIOR TO COMMIT

[PATCH STABLE] tests: require SQLite 3.8.3+ as sqlitestore relies on "WITH" clause

# HG changeset patch # User Yuya Nishihara # Date 1541161535 -32400 # Fri Nov 02 21:25:35 2018 +0900 # Branch stable # Node ID d12b6941f9ac56cebc165fa83ad982db202335a2 # Parent 41f48262b845632a1fca09e79d72fdb8eb1eb624 tests: require SQLite 3.8.3+ as sqlitestore relies on "WITH" clause The

mercurial@40450: 4 new changesets (4 on stable)

4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/f1c1b4d0e695 changeset: 40447:f1c1b4d0e695 branch: stable user:Martin von Zweigbergk date:Thu Nov 01 11:24:45 2018 -0700 summary: tests: demonstrate broken copies.pathcopies()

[PATCH STABLE RESEND] rust: fix signature of rustlazyancestors_init() function

# HG changeset patch # User Yuya Nishihara # Date 1540728996 -32400 # Sun Oct 28 21:16:36 2018 +0900 # Branch stable # Node ID 41f48262b845632a1fca09e79d72fdb8eb1eb624 # Parent 324ba8b14d7836a5cd4c5586f270391725168c0a rust: fix signature of rustlazyancestors_init() function Obviously,

[PATCH 1 of 8] tests: adjust merge tool config in test-largefiles-update.t

# HG changeset patch # User Boris Feld # Date 1541007836 -3600 # Wed Oct 31 18:43:56 2018 +0100 # Node ID d01a6df50fa2c5432f2040afe686e05062e02cce # Parent 909c31805f54628ab5bf22cd92418c8ac9c09277 # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 2 of 8] test: also deactivate `ui.merge` when testing merge tool

# HG changeset patch # User Boris Feld # Date 1541009552 -3600 # Wed Oct 31 19:12:32 2018 +0100 # Node ID 1f02b29ed5c6637cfa8e844f1b7019f3d90af107 # Parent d01a6df50fa2c5432f2040afe686e05062e02cce # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 3 of 8] test: use the "correct" merge tool in `test-rebase-detach.t`

# HG changeset patch # User Boris Feld # Date 1541078674 -3600 # Thu Nov 01 14:24:34 2018 +0100 # Node ID 9de8e01ffb96120d41a48f0ca8748ed3a77a75b7 # Parent 1f02b29ed5c6637cfa8e844f1b7019f3d90af107 # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 6 of 8] run-tests: explicitly declare the list of dropped environment variable

# HG changeset patch # User Boris Feld # Date 1539906736 -7200 # Fri Oct 19 01:52:16 2018 +0200 # Node ID b95aef679522bd42e7041373b5af9ca4ab9ce004 # Parent 063a0cb2cb31f0071c764035953fb8c3bc9bbdbc # EXP-Topic run-tests # Available At https://bitbucket.org/octobus/mercurial-devel/ #

[PATCH 1 of 4] templatekw: extract internal "{rev}:{node|formatnode}" template to constant

# HG changeset patch # User Yuya Nishihara # Date 1540556900 -32400 # Fri Oct 26 21:28:20 2018 +0900 # Node ID 276558285cd47fc388aed7861eaf7237c6d184e3 # Parent c2a0bc6412dbbcbba20517e250b0fcd2fc79b0e7 templatekw: extract internal "{rev}:{node|formatnode}" template to constant This will be

D5094: merge-tools: when calling external merge tool, describe the resolve inputs

yuja added a comment. > > class mappingdict(mappable, _mappingsequence): > > """Wrapper for a single template mapping > > > > This isn't a sequence in a way that the underlying dict won't be iterated > > as a dict, but shares most of the

[PATCH 3 of 4] templatekw: add p1/p2 keywords which switches the current ctx

# HG changeset patch # User Yuya Nishihara # Date 1540557800 -32400 # Fri Oct 26 21:43:20 2018 +0900 # Node ID cd356034a839f6cfd0e64c894d9696e79e3c25f7 # Parent 49a6ece003a203da3e4a74fb60256f811fd2f32b templatekw: add p1/p2 keywords which switches the current ctx This is just an example of

[PATCH 2 of 4] templater: add wrapper for a single template mapping

# HG changeset patch # User Yuya Nishihara # Date 1539951090 -32400 # Fri Oct 19 21:11:30 2018 +0900 # Node ID 49a6ece003a203da3e4a74fb60256f811fd2f32b # Parent 276558285cd47fc388aed7861eaf7237c6d184e3 templater: add wrapper for a single template mapping This can be used to nest template

D5194: wireprotov2: add an extension to cache wireproto v2 responses in S3

sheehan abandoned this revision. sheehan added a comment. > Either way, we'll be deploying this to Mozilla's hg servers in the next few months and testing it out. Perhaps after it's been in production for some time we will have a stronger case for inclusion in core. :) Going to deploy

[PATCH 4 of 4] templatekw: deprecate p1rev/p2rev/p1node/p2node in favor of p1/p2

# HG changeset patch # User Yuya Nishihara # Date 1540557997 -32400 # Fri Oct 26 21:46:37 2018 +0900 # Node ID 50c57f7f27b047e8f60d7e2b1a18b0da392c5db9 # Parent cd356034a839f6cfd0e64c894d9696e79e3c25f7 templatekw: deprecate p1rev/p2rev/p1node/p2node in favor of p1/p2 diff --git

Re: D5094: merge-tools: when calling external merge tool, describe the resolve inputs

> > class mappingdict(mappable, _mappingsequence): > > """Wrapper for a single template mapping > > > > This isn't a sequence in a way that the underlying dict won't be > iterated > > as a dict, but shares most of the _mappingsequence functions. > > """ >

[PATCH] relnotes: various tweaks for release notes

# HG changeset patch # User Anton Shestakov # Date 1539958193 -28800 # Fri Oct 19 22:09:53 2018 +0800 # Node ID 4db7723d4f4c9a90fe917787cc1afe7e3db74ee3 # Parent 8c124d10ae02790e0e33fbc2a5af463e97f2d5b3 # EXP-Topic relnotes relnotes: various tweaks for release notes Stop filtering out

mercurial@40451: new changeset (1 on stable)

New changeset (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/324ba8b14d78 changeset: 40451:324ba8b14d78 branch: stable tag: tip user:Boris Feld date:Thu Nov 01 12:52:16 2018 +0100 summary: delta: skip "empty delta" optimisation for

D5218: resolve: when resolve.mark-check=abort, downgrade to warning if pats specified

spectral added a comment. Note: This is meant for 'stable' REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5218 To: spectral, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D4362: zsh_completion: complete merge tools for -t/--tool

av6 added projects: hg, hg-reviewers. av6 added a comment. Changing project tags, please ignore. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4362 To: av6, #hg-reviewers, spectral Cc: spectral, mercurial-devel, namenlos, dsp, pulkit, durham, akushner

mercurial@40460: 6 new changesets (2 on stable)

6 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/88702fd208ce changeset: 40455:88702fd208ce parent: 40443:909c31805f54 user:Yuya Nishihara date:Wed Oct 24 21:28:03 2018 +0900 summary: py3: convert revlog stats to a dict of (bytes,

mercurial@40454: 3 new changesets (3 on stable)

3 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/683e99f0b30c changeset: 40452:683e99f0b30c branch: stable user:Anton Shestakov date:Fri Oct 19 22:09:53 2018 +0800 summary: relnotes: various tweaks for release notes

D5218: resolve: when resolve.mark-check=abort, downgrade to warning if pats specified

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Previously, with --config resolve.mark-check=abort, running `hg resolve -m foo` would abort and emit a message saying to use --all. This command does not