D7373: py3: pass a bytes value for "msg" to nouideprecwarn()

dlax created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY That function formats "msg" with the "version" value. On Python 3, this leads to "TypeError: can only concatenate str (not

[Bug 6221] New: pull --bookmark adds too many bookmarks

https://bz.mercurial-scm.org/show_bug.cgi?id=6221 Bug ID: 6221 Summary: pull --bookmark adds too many bookmarks Product: Mercurial Version: 4.5.2 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug

D7373: py3: pass a bytes value for "msg" to nouideprecwarn()

dlax added a comment. should fix tracebacks in https://ci.octobus.net/job/EvolvePy3/278/console REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7373/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7373 To: dlax, indygreg, #hg-reviewers Cc:

D7256: repoview: define filteredchangelog as a top-level (non-local) class

martinvonz added a comment. In D7256#107172 , @yuja wrote: >> +cl.__class__ = type('filteredchangelog', >> +(filteredchangelogmixin, cl.__class__), >> +{}) > > Nit: maybe this can be

D7375: py3: replace "%r" by"'%s'% for py3-compatible (and clearer) quoting in chg

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

D7373: py3: pass a bytes value for "msg" to nouideprecwarn()

Closed by commit rHGc207c46a86b9: py3: pass a bytes value for msg to nouideprecwarn() (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/D7373?vs=18051=18053 CHANGES

D7198: lock: refactor in preparation for next commit

marmoute added a comment. In D7198#108404 , @pulkit wrote: > @marmoute can you have a look at these two patches? Yes, I will. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7198/new/ REVISION

D7150: dirstate: respect request to not list unknown/ignored/clean files (API)

Closed by commit rHGdd773340a085: dirstate: respect request to not list unknown/ignored/clean files (API) (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7374: hghave: add a check for the `xz` compression utility

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This isn't install by default on Mac, which causes a test failure. The logic for avoiding the command is a little goofy, but nested `#if` isn't supported,

D7198: lock: refactor in preparation for next commit

pulkit added a comment. pulkit added subscribers: marmoute, pulkit. @marmoute can you have a look at these two patches? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7198/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7198 To:

D7372: remotefilelog: handle **kwargs correctly when overriding changelog.add()

Closed by commit rHGc5f6f58f6c71: remotefilelog: handle **kwargs correctly when overriding changelog.add() (authored by dploch). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH 4 of 6] mail: use a native string for "subtype" value

# HG changeset patch # User Denis Laxalde # Date 1573654984 -3600 # Wed Nov 13 15:23:04 2019 +0100 # Node ID 6f035c6bb911f36cd2459272843388a218be120d # Parent f84d980d58cd3e1bdf2b19aa03b419e438eff808 mail: use a native string for "subtype" value This is somehow similar to previous

D7375: py3: replace "%r" by"'%s'% for py3-compatible (and clearer) quoting in chg

durin42 added a comment. I feel obligated to point out that this will result in different (wrong!) quoting if `path` contains a `'`, but that's also probably fine since it's just a log. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7375/new/

[PATCH 5 of 6] mail: move strtolocal call in _addressencode()

# HG changeset patch # User Denis Laxalde # Date 1573659988 -3600 # Wed Nov 13 16:46:28 2019 +0100 # Node ID 11d514fd71855ace61c549d3154f52569cea9264 # Parent 6f035c6bb911f36cd2459272843388a218be120d mail: move strtolocal call in _addressencode() diff --git a/mercurial/mail.py

[PATCH 3 of 6] mail: let all charset values be native strings

# HG changeset patch # User Denis Laxalde # Date 1573595550 -3600 # Tue Nov 12 22:52:30 2019 +0100 # Node ID f84d980d58cd3e1bdf2b19aa03b419e438eff808 # Parent ff60edae8bb65ef213f9d83b6065c161d57f2a51 mail: let all charset values be native strings Charset values will typically be used to

mercurial@43619: 2 new changesets

2 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/c5f6f58f6c71 changeset: 43618:c5f6f58f6c71 user:Daniel Ploch date:Tue Nov 12 15:53:58 2019 -0800 summary: remotefilelog: handle **kwargs correctly when overriding changelog.add()

[PATCH 2 of 6] mail: add type hints for pytype

# HG changeset patch # User Denis Laxalde # Date 1573680044 -3600 # Wed Nov 13 22:20:44 2019 +0100 # Node ID ff60edae8bb65ef213f9d83b6065c161d57f2a51 # Parent a57f3ab9661af30fd20d6a69d872448afa4612bd mail: add type hints for pytype We essentially annotate functions in which handling of

[PATCH 6 of 6] patchbomb: fix wrong argument type when calling mail generator.flatten()

# HG changeset patch # User Denis Laxalde # Date 1573661165 -3600 # Wed Nov 13 17:06:05 2019 +0100 # Node ID 9ebd700f9dc4e27c0bd45dce1108f7a2255b # Parent 11d514fd71855ace61c549d3154f52569cea9264 patchbomb: fix wrong argument type when calling mail generator.flatten() diff --git

[PATCH 1 of 6] mail: fix a bad return type in _encode()

# HG changeset patch # User Denis Laxalde # Date 1573575136 -3600 # Tue Nov 12 17:12:16 2019 +0100 # Node ID a57f3ab9661af30fd20d6a69d872448afa4612bd # Parent c207c46a86b92ad7be05de2bf85bb36757e8ae3a mail: fix a bad return type in _encode() This particular instruction returned only a

D7375: py3: replace "%r" by"'%s'% for py3-compatible (and clearer) quoting in chg

martinvonz added a comment. In D7375#108431 , @durin42 wrote: > I feel obligated to point out that this will result in different (wrong!) quoting if `path` contains a `'`, but that's also probably fine since it's just a log. Oh, good to

D7375: py3: replace "%r" by"'%s'% for py3-compatible (and clearer) quoting in chg

Closed by commit rHG975e517451a6: py3: replace %r by%s% for py3-compatible (and clearer) quoting in chg (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

mercurial@43620: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/dd773340a085 changeset: 43620:dd773340a085 bookmark:@ tag: tip user:Martin von Zweigbergk date:Tue Oct 22 23:21:26 2019 -0700 summary: dirstate: respect request to not list

D7144: status: use unfiltered repo if we're getting status of working copy

marmoute added a comment. I took more time to look at your series and at the bigger picture. My general position is still that passing the wrong filter level to high level function is hacking and will be a significant source of bugs. For example, `hg status` taks a "PATTERN" argument,

D7371: tests: add optional output when wheel is missing

Closed by commit rHG45c15ed06f33: tests: add optional output when wheel is missing (authored by indygreg). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7371?vs=18038=18058

D7376: help: create packages for the help text

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY These files need to be loaded as resources with PyOxidizer, instead of using filesystem representations. AFAICT, the resource loading mechanisms only work

D7257: [RFC] repoview: add a "filter" that just disallows walking to heads

durin42 added a comment. durin42 accepted this revision as: durin42. I'm a big fan of this idea. I'd probably land it if there were some obvious usecases as child patches. :) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7257/new/ REVISION DETAIL

D7173: packaging: stage files and dynamically generate WiX installer

Closed by commit rHG94eac340d212: packaging: stage files and dynamically generate WiX installer (authored by indygreg). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG

D7296: pycompat: kludge around pytype being confused by __new__

Herald added a subscriber: mjpieters. durin42 updated this revision to Diff 18066. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7296?vs=17672=18066 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7296/new/ REVISION DETAIL

D7383: state: add a pytype annotation

durin42 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/D7383 AFFECTED FILES mercurial/state.py CHANGE DETAILS diff --git a/mercurial/state.py

D7381: cmdutil: add a pytype annotation to help out some callsites

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I think we could constrain the values here more than Any, but this lets us move forward with typechecking commands.py. REPOSITORY rHG Mercurial REVISION

D7295: pytype: add a (very slow) test that executes pytype

durin42 updated this revision to Diff 18072. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7295?vs=17665=18072 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7295/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7295 AFFECTED FILES

D7380: encoding: define per-use identity functions only in typechecking mode

durin42 added a comment. Let's not land this for now: it's breaking a fair amount of typechecking. :( REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7380/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7380 To: durin42, #hg-reviewers Cc:

D7387: packaging: add the config file for PyOxidizer

mharbison72 added a comment. mharbison72 added a subscriber: martinvonz. mharbison72 planned changes to this revision. This isn't meant to be queued. I posted this to share with @martinvonz , and give it better visibility to anyone else interested than an IRC paste. REPOSITORY rHG

D7379: encoding: fix bad type annotation

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This function returns utf-8 in a bytes, not a unicode. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7379 AFFECTED FILES

D7378: debugcommands: don't shadow the error module

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

D7384: commands: necessary annotations and suppresssions to pass pytype

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As with other places, there are some places where our types are just too complicated for pytype, so we put some suppressions in place. REPOSITORY rHG Mercurial

Re: [PATCH 6 of 6] patchbomb: fix wrong argument type when calling mail generator.flatten()

queued, thanks > On Nov 13, 2019, at 16:59, Denis Laxalde wrote: > > # HG changeset patch > # User Denis Laxalde > # Date 1573661165 -3600 > # Wed Nov 13 17:06:05 2019 +0100 > # Node ID 9ebd700f9dc4e27c0bd45dce1108f7a2255b > # Parent 11d514fd71855ace61c549d3154f52569cea9264 >

D7380: encoding: define per-use identity functions only in typechecking mode

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This avoids some unfortunate overhead from my previous iteration. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7380 AFFECTED

D7382: logcmdutil: add a type annotation

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This wasn't actually required in the end, as there was a real bug found by pytype, but the annotation helped me figure that out. We can drop this patch if

D7377: commands: log --line-range is incompatible with --copies

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was (to my surprise) detected by pytype. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7377 AFFECTED FILES

D7385: debugcommands: suppress import errors for pytype

durin42 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/D7385 AFFECTED FILES mercurial/debugcommands.py CHANGE DETAILS diff --git

D7386: help: access text files as resources under PyOxidizer

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This allows `hg help revsets` to run on an oxidized Mac executable. I left the old path in place for py2 support, as well as the other packaging apps.

D7386: help: access text files as resources under PyOxidizer

mharbison72 added a comment. mharbison72 added a subscriber: indygreg. It looks like py2app puts it's name in `sys.frozen`[1], instead of just making it `True`/`False`. Should PyOxidizer do the same @indygreg ? I don't have any idea why the error on Windows (I even disabled pager). I

D7144: status: use unfiltered repo if we're getting status of working copy

martinvonz added a comment. In D7144#108444 , @marmoute wrote: > I took more time to look at your series and at the bigger picture. My general position is still that passing the wrong filter level to high level function is hacking and will

D7289: branchmap: always copy closednodes to a set

durin42 updated this revision to Diff 18063. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7289?vs=17659=18063 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7289/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7289 AFFECTED FILES

D7297: cleanup: remove now-obsolete wrong-arg-type annotations

durin42 updated this revision to Diff 18067. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7297?vs=17673=18067 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7297/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7297 AFFECTED FILES

D7387: packaging: add the config file for PyOxidizer

mharbison72 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is the current file I'm using on Mac. It *seems* like we can get away with a single config file for all platforms, so this platform agnostic

D7376: help: create packages for the help text

martinvonz added a comment. Looks good to me, but I don't know Python well enough to say if `mercurial.help` and `mercurial.help.internal` should be "namespace packages" (which I think is what you're doing with the `pkgutil.extend_path()` stuff). I'd appreciate it if someone who knows