D7472: cleanup: update references to /help/ that should now be /helptext/

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I noticed this only because the WiX build was broken after 2e017696181f . I haven't

D7258: makefile: use Python 3 by default outside of Windows (BC)

mharbison72 added a comment. In D7258#109923 , @indygreg wrote: > I seriously question whether we need a `Makefile` at all [on Windows]: our `Makefile` is just a glorified shell script and isn't doing much in terms of dependency management.

D7258: makefile: use Python 3 by default outside of Windows (BC)

indygreg added a comment. I just uploaded a compromise patch that ignores Windows for now. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7258/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7258 To: indygreg, #hg-reviewers,

D7258: makefile: use Python 3 by default outside of Windows (BC)

indygreg edited the summary of this revision. indygreg retitled this revision from "makefile: use Python 3 by default (BC)" to "makefile: use Python 3 by default outside of Windows (BC)". indygreg updated this revision to Diff 18278. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7258: makefile: use Python 3 by default (BC)

indygreg added a comment. I seriously question whether we need a `Makefile` at all [on Windows]: our `Makefile` is just a glorified shell script and isn't doing much in terms of dependency management. I'm tempted to move the packaging targets to `contrib/packaging` and replace the remaining

D7258: makefile: use Python 3 by default (BC)

mharbison72 added a comment. mharbison72 accepted this revision. > To continue using Python 2, set the PYTHON variable. e.g. > `make install PYTHON=python2.7` or > `make install PYTHON=py.exe -2`. The "py -2" part needs to be quoted. I'm not super excited to deal with this on

[Bug 6226] New: terminfo color mode appears broken on Python 3

https://bz.mercurial-scm.org/show_bug.cgi?id=6226 Bug ID: 6226 Summary: terminfo color mode appears broken on Python 3 Product: Mercurial Version: default branch Hardware: All OS: Linux Status: UNCONFIRMED

D7258: makefile: use Python 3 by default (BC)

indygreg added a comment. This is ready for re-review. Please take a look @durin42. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7258/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7258 To: indygreg, #hg-reviewers,

D7258: makefile: use Python 3 by default (BC)

indygreg updated this revision to Diff 18277. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7258?vs=18276=18277 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7258/new/ REVISION DETAIL

D7258: makefile: use Python 3 by default (BC)

This revision is now accepted and ready to land. indygreg edited the summary of this revision. indygreg retitled this revision from "makefile: use python3 by default (BC)" to "makefile: use Python 3 by default (BC)". indygreg updated this revision to Diff 18276. REPOSITORY rHG Mercurial

D7471: tests: byteify a few more things in simplestorerepo.py

Closed by commit rHG8ca92bcb3083: tests: byteify a few more things in simplestorerepo.py (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7468: phases: make `allphases` a list on py3 also

Closed by commit rHGd18cf63e1dbd: phases: make `allphases` a list on py3 also (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7468?vs=18266=18272 CHANGES

D7470: profiling: add a missing argument to the ProgrammingError constructor

Closed by commit rHG882e633ac92c: profiling: add a missing argument to the ProgrammingError constructor (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7469: profiling: disable the import-error warning for the flamegraph module

Closed by commit rHG6c8ba31405d9: profiling: disable the import-error warning for the flamegraph module (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7467: util: convert an exception to bytes when passing to Abort()

Closed by commit rHG5be128f669d4: util: convert an exception to bytes when passing to Abort() (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7466: patch: fix a str + bytes issue in an exception handler

Closed by commit rHGeab0b7383cd3: patch: fix a str + bytes issue in an exception handler (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7466: patch: fix a str + bytes issue in an exception handler

This revision is now accepted and ready to land. indygreg added a comment. indygreg accepted this revision. I'll put this one on stable. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7466/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7466

D7467: util: convert an exception to bytes when passing to Abort()

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I happened to notice this searching for how to convert an exception to bytes in the previous patch. I'm pretty sure I've got a bunch of other instances that

D7471: tests: byteify a few more things in simplestorerepo.py

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7471 AFFECTED FILES tests/simplestorerepo.py CHANGE DETAILS diff --git

D7466: patch: fix a str + bytes issue in an exception handler

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Flagged by pytype. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7466 AFFECTED FILES mercurial/patch.py CHANGE DETAILS

D7470: profiling: add a missing argument to the ProgrammingError constructor

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7470 AFFECTED FILES mercurial/profiling.py CHANGE DETAILS diff --git a/mercurial/profiling.py

D7469: profiling: disable the import-error warning for the flamegraph module

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The module being missing is properly handled, but pytype was complaining. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7469

D7468: phases: make `allphases` a list on py3 also

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Pytype complained that `range` doesn't support slicing, so make this a list like it was on py2. REPOSITORY rHG Mercurial REVISION DETAIL

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

3 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/cb23d9e3e21f changeset: 43719:cb23d9e3e21f branch: stable parent: 43710:c5bcd946a34b user:Matt Harbison date:Tue Nov 19 14:36:22 2019 -0500 summary: shelve: fix a missing

[PATCH 1 of 2] status: fix default value of status struct

# HG changeset patch # User Yuya Nishihara # Date 1574344343 -32400 # Thu Nov 21 22:52:23 2019 +0900 # Node ID c19643244c5c9952ff624663e5232c5071d568da # Parent 835d415c5a17258e2cf11e9fcd650441690dfbd4 status: fix default value of status struct The default argument isn't overloaded.

[PATCH 2 of 2] graphlog: change state dict to attr struct

# HG changeset patch # User Yuya Nishihara # Date 1574343781 -32400 # Thu Nov 21 22:43:01 2019 +0900 # Node ID 07da30f0f8b7dac283a273ef380b05b32f2658f0 # Parent c19643244c5c9952ff624663e5232c5071d568da graphlog: change state dict to attr struct This should help static analysis. diff --git

[PATCH STABLE V2] singlehead: making config item a bool again

# HG changeset patch # User Georges Racinet # Date 1574273222 -3600 # Wed Nov 20 19:07:02 2019 +0100 # Branch stable # Node ID 0509d93280bfd9df473ad4ee5b00d0d1d1e8e291 # Parent ca3dca416f8d5863ca6f5a4a6a6bb835dcd5feeb # EXP-Topic single_head_is_boolean singlehead: making config item a bool

Re: [PATCH STABLE] singlehead: making config item a bool again

On 11/21/19 1:50 PM, Georges Racinet wrote: On 11/21/19 1:38 PM, Yuya Nishihara wrote: On Wed, 20 Nov 2019 19:23:26 +0100, Georges Racinet wrote: # HG changeset patch # User Georges Racinet # Date 1574273222 -3600 #  Wed Nov 20 19:07:02 2019 +0100 # Branch stable # Node ID

D7462: py3: make doc strings containing the deprected '\.' escape sequence raw strings

Closed by commit rHGbfbbf48d51e8: py3: make doc strings containing deprecated \. escape sequence raw strings (authored by dploch). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7458: shelve: add the missing `create` parameter to the bundlerepo constructor

Closed by commit rHG132470ee53fe: shelve: add the missing `create` parameter to the bundlerepo constructor (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7461: py3: wrap a __func__ in sysbytes() before logging as bytes

Closed by commit rHGaff3f6e407a1: py3: wrap a __func__ in sysbytes() before logging as bytes (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7457: shelve: fix a missing variable in the exception handler for delete

Closed by commit rHGcb23d9e3e21f: shelve: fix a missing variable in the exception handler for delete (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7462: py3: make doc strings containing the deprected '\.' escape sequence raw strings

pulkit added a comment. Applied the following diff to commit message as `test-check-commit.t` was complaining: --- a/changeset-description +++ b/changeset-description @@ -1,3 +1,3 @@ -py3: make doc strings containing the deprected '\.' escape sequence raw strings +py3:

D7455: revset: add an assertion to help pytype

Closed by commit rHG6c6d67fc45cb: revset: add an assertion to help pytype (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7455?vs=18244=18256 CHANGES

D7456: scmutil: add assertions to help pytype

Closed by commit rHG5b90a050082b: scmutil: add assertions to help pytype (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7456?vs=18245=18257 CHANGES SINCE

D7463: wireprotov1server: capture Abort type before accessing the `hint` attribute

Closed by commit rHG1d1232c0726f: wireprotov1server: capture Abort type before accessing the `hint` attribute (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7460: tests: add more tests for "hg shelve --delete"

Closed by commit rHG4330851947fb: tests: add more tests for hg shelve --delete (authored by dlax). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7460?vs=18250=18258 CHANGES SINCE

Re: [PATCH STABLE] singlehead: making config item a bool again

On 11/21/19 2:12 PM, Yuya Nishihara wrote: On Thu, 21 Nov 2019 13:50:56 +0100, Georges Racinet wrote: On 11/21/19 1:38 PM, Yuya Nishihara wrote: On Wed, 20 Nov 2019 19:23:26 +0100, Georges Racinet wrote: # HG changeset patch # User Georges Racinet # Date 1574273222 -3600 # Wed Nov 20

Re: [PATCH STABLE] singlehead: making config item a bool again

On Thu, 21 Nov 2019 13:50:56 +0100, Georges Racinet wrote: > On 11/21/19 1:38 PM, Yuya Nishihara wrote: > > On Wed, 20 Nov 2019 19:23:26 +0100, Georges Racinet wrote: > >> # HG changeset patch > >> # User Georges Racinet > >> # Date 1574273222 -3600 > >> # Wed Nov 20 19:07:02 2019 +0100 > >>

D7465: filemerge: fix a missing attribute usage

dlax added inline comments. INLINE COMMENTS > mharbison72 wrote in filemerge.py:122 > I’m not sure how this works, but this was enough to make pytype happy. Does > it make any sense to compare an absent file to an absent file? > > Maybe the right thing is to add a ctx attribute here? > Does

Re: [PATCH STABLE] singlehead: making config item a bool again

On 11/21/19 1:38 PM, Yuya Nishihara wrote: On Wed, 20 Nov 2019 19:23:26 +0100, Georges Racinet wrote: # HG changeset patch # User Georges Racinet # Date 1574273222 -3600 # Wed Nov 20 19:07:02 2019 +0100 # Branch stable # Node ID c557e15674ea6adfe1b034e5b4af1e26bca850dd # Parent

Re: [PATCH] import: add a --secret option

On Thu, 21 Nov 2019 10:40:07 +0100, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1574324750 -3600 > # Thu Nov 21 09:25:50 2019 +0100 > # Node ID f847210f92b94a13d7e260611e41d5508aeacb99 > # Parent 039fbd14d4e2889be830cc114957c31972c6ea04 > import: add a

Re: [PATCH STABLE] singlehead: making config item a bool again

On Wed, 20 Nov 2019 19:23:26 +0100, Georges Racinet wrote: > # HG changeset patch > # User Georges Racinet > # Date 1574273222 -3600 > # Wed Nov 20 19:07:02 2019 +0100 > # Branch stable > # Node ID c557e15674ea6adfe1b034e5b4af1e26bca850dd > # Parent ca3dca416f8d5863ca6f5a4a6a6bb835dcd5feeb

D7465: filemerge: fix a missing attribute usage

mharbison72 added inline comments. INLINE COMMENTS > dlax wrote in filemerge.py:122 > What about `fctx`? It could also lack the `ctx()` method if an instance of > `absentfilectx`. > I wonder if the intent was not `fctx.changectx() == self.changectx()`. I’m not sure how this works, but this was

[PATCH] import: add a --secret option

# HG changeset patch # User Denis Laxalde # Date 1574324750 -3600 # Thu Nov 21 09:25:50 2019 +0100 # Node ID f847210f92b94a13d7e260611e41d5508aeacb99 # Parent 039fbd14d4e2889be830cc114957c31972c6ea04 import: add a --secret option Similarly to "hg commit", we add a --secret option to "hg

D7465: filemerge: fix a missing attribute usage

dlax added inline comments. INLINE COMMENTS > filemerge.py:122 > fctx.isabsent() > -and fctx.ctx() == self.ctx() > +and fctx.ctx() == self._ctx > and fctx.path() == self.path() What about `fctx`? It could also lack the `ctx()` method if an

D7464: filemerge: drop a default argument to appease pytype

dlax added a comment. Shouldn't this be also done for all similar functions? (i.e. `_xmergeimm` and functions registered as a merge tool with `@internaltool`) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7464/new/ REVISION DETAIL