D7992: clean: delete obsolete unlinking of .hg/graftstate

martinvonz updated this revision to Diff 19735. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7992?vs=19580=19735 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7992/new/ REVISION DETAIL

D6846: packaging: script the building of a MacOS installer using a custom python

mharbison72 added a comment. In D6846#118733 , @marmoute wrote: > What's the latest with this diff ? It seems to still be a work in progress. Should it be in the "need-review" state? The hangup here is that the installed code seems to

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

quark added a comment. Have `pyre` been considered? It seems `pyre` only takes 10 seconds to check all the `.py` files. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7295/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7295 To: durin42,

D8054: resourceutil: correct the root path for file based lookup under py2exe

Closed by commit rHGccb719dd1fe3: resourceutil: correct the root path for file based lookup under py2exe (authored by mharbison72). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D8054: resourceutil: correct the root path for file based lookup under py2exe

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This silly copy/paste error caused "Mercurial" to be truncated from "C:\Program Files". The fact that "helptext" and "defaultrc" are now in a subpackage of

D8053: pyoxidizer: use `legacy_windows_stdio` on Windows

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The C executable sets this too, otherwise no output shows up (when paging?). There is also `legacy_windows_fs_encoding`, but I'm not setting that for now

D8052: wix: restore COPYING.rtf

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This got truncated to 0 bytes in 0ab651b5f77c when the Phabricator extension

D8051: worker: Use buffered input from the pickle stream

heftig created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On Python 3, "pickle.load" will raise an exception ("_pickle.UnpicklingError: pickle data was truncated") when it gets a short read, i.e. it receives fewer bytes

D7450: packaging: add support for PyOxidizer

Closed by commit rHG0dd8b752f287: packaging: add support for PyOxidizer (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/D7450?vs=19628=19728 CHANGES SINCE

D7450: packaging: add support for PyOxidizer

This revision now requires review to proceed. mharbison72 added a comment. mharbison72 accepted this revision. In D7450#118725 , @martinvonz wrote: > I think @indygreg doesn't have much time for Mercurial these days. @mharbison72, what do you

D7384: commands: necessary annotations and suppresssions to pass pytype

dlax added a comment. In D7384#118739 , @marmoute wrote: > What's up on this ? It seemed on a good track, but I don't think it landed. @dlax I think you offer to use a context manager got a warm welcome, I would says, go ahead with it.

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

marmoute added a comment. This seems useful, and the stabilisation seems to take a long while. Maybe we could take it in its current state (with "expected" broken output) and iterate from there. With the test in the repo. What do you all think ? REPOSITORY rHG Mercurial CHANGES

D7119: rust-dirstatemap: remove additional lookup in dirstate.matches

martinvonz added a comment. In D7119#118735 , @marmoute wrote: > What's up on this? It appears to have been > > x 29641ceacf8c > |pruned using prune by Martin von Zweigbergk (Wed Dec 11 10:48:08 2019 -0800) That's

D7384: commands: necessary annotations and suppresssions to pass pytype

marmoute added a comment. What's up on this ? It seemed on a good track, but I don't think it landed. @dlax I think you offer to use a context manager got a warm welcome, I would says, go ahead with it. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7296: pycompat: kludge around pytype being confused by __new__

marmoute added a comment. The status of this is unclear ? Are we waiting on: 1. a the right way to do it in our codebase? 2. a fix in pytype? 3. a fix in python? 4. something else? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7296/new/

D7119: rust-dirstatemap: remove additional lookup in dirstate.matches

marmoute added a comment. What's up on this? It appears to have been x 29641ceacf8c |pruned using prune by Martin von Zweigbergk (Wed Dec 11 10:48:08 2019 -0800) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7119/new/ REVISION

D6846: packaging: script the building of a MacOS installer using a custom python

marmoute added a comment. What's the latest with this diff ? It seems to still be a work in progress. Should it be in the "need-review" state? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6846/new/ REVISION DETAIL

Re: [PATCH STABLE] contrib: a small script to nudge lingering diff

Gentle ping on that. Since this is actually put to use, I would rather have to in the soruce tree ASAP. In addition there is a question of "where do we get it to run everyday". Right now I am running it by hand. I could set a recurrent job on an octobus server, however, I don't feel like it

D7176: rebase: allow rebasing obsolete commit without successor

This revision now requires changes to proceed. baymax added a comment. baymax requested changes to this revision. There seems to have been no activities on this Diff for the past 3 Months. By policy, we are automatically moving it out of the `need-review` state. Please, move it back

D7188: git: force using bytes in command name

This revision now requires changes to proceed. baymax added a comment. baymax requested changes to this revision. There seems to have been no activities on this Diff for the past 3 Months. By policy, we are automatically moving it out of the `need-review` state. Please, move it back

D7450: packaging: add support for PyOxidizer

martinvonz added a comment. In D7450#118285 , @mharbison72 wrote: > In D7450#118284 , @martinvonz wrote: > >> I'd be very happy to queue this as soon as @mharbison72's request for Windows has

D8029: uncopy: add new `hg uncopy` command

martinvonz updated this revision to Diff 19725. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8029?vs=19692=19725 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8029/new/ REVISION DETAIL

D8030: uncopy: add support for unmarking committed copies

martinvonz updated this revision to Diff 19726. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8030?vs=19693=19726 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8030/new/ REVISION DETAIL

D8035: copy: add support for marking committed copies

martinvonz updated this revision to Diff 19727. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8035?vs=19697=19727 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8035/new/ REVISION DETAIL

D8029: uncopy: add new `hg uncopy` command

martinvonz added inline comments. INLINE COMMENTS > martinvonz wrote in commands.py:7502 > Oops, I just forgot about that, I think. I'll send a follow-up (I assume you > know that many of the patches you're reviewing now are already queued). Sorry, I forgot that this series was just accepted

D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

yuja added a comment. > What do you think about this approach: > 1. The server detects that LC_TYPE is coerced. > 2. When handling the "validate" command, the server sends back "invalidate this server, and fallback to original hg" response. > This makes chg/non-chg behave

Re: D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

> What do you think about this approach: > > 1. The server detects that LC_TYPE is coerced. > 2. When handling the "validate" command, the server sends back "invalidate > this server, and fallback to original hg" response. > > This makes chg/non-chg behave consistently with some

D7827: rebase: don't use rebased node as dirstate p2 (BC)

martinvonz updated this revision to Diff 19724. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7827?vs=19705=19724 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7827/new/ REVISION DETAIL

D8043: graphlog: use '%' for other context in merge conflict

martinvonz edited the summary of this revision. martinvonz retitled this revision from "graphlog: use '@' also for other context in merge conflict" to "graphlog: use '%' for other context in merge conflict". martinvonz updated this revision to Diff 19723. REPOSITORY rHG Mercurial CHANGES

[PATCH 6 of 6] rust-cpython: remove PySharedRefCell and its companion structs

# HG changeset patch # User Yuya Nishihara # Date 1579941024 -32400 # Sat Jan 25 17:30:24 2020 +0900 # Node ID 419d82410496d29e04a67292ff325f8ecea3f989 # Parent daf8dc5bb62f80794c12ddaede649d73cc4a4f33 rust-cpython: remove PySharedRefCell and its companion structs Also updates

[PATCH 5 of 6] rust-cpython: switch to upstreamed version of PySharedRefCell

# HG changeset patch # User Yuya Nishihara # Date 1579940783 -32400 # Sat Jan 25 17:26:23 2020 +0900 # Node ID daf8dc5bb62f80794c12ddaede649d73cc4a4f33 # Parent 641a0f64ae5a289a476dceac692ecf7d665b6ff3 rust-cpython: switch to upstreamed version of PySharedRefCell Our PyLeaked is identical

[PATCH 4 of 6] rust-cpython: rename inner_shared() to inner()

# HG changeset patch # User Yuya Nishihara # Date 1579940466 -32400 # Sat Jan 25 17:21:06 2020 +0900 # Node ID 641a0f64ae5a289a476dceac692ecf7d665b6ff3 # Parent 44c3b090dea5b6f5f048796c997c0d7176e8bc0a rust-cpython: rename inner_shared() to inner() The "shared" accessor will be

[PATCH 3 of 6] rust-cpython: use PyList.insert() instead of .insert_item()

# HG changeset patch # User Yuya Nishihara # Date 1580396910 -32400 # Fri Jan 31 00:08:30 2020 +0900 # Node ID 44c3b090dea5b6f5f048796c997c0d7176e8bc0a # Parent 50dcc8baffa106c54a4e40bbb563e6ee0c8d40a9 rust-cpython: use PyList.insert() instead of .insert_item() Silences the deprecated

[PATCH 2 of 6] rust-cpython: bump cpython to 0.4 to switch to upstreamed PySharedRef

# HG changeset patch # User Yuya Nishihara # Date 1580396489 -32400 # Fri Jan 31 00:01:29 2020 +0900 # Node ID 50dcc8baffa106c54a4e40bbb563e6ee0c8d40a9 # Parent 60729184896c34715b637ba12759b0518204bdbe rust-cpython: bump cpython to 0.4 to switch to upstreamed PySharedRef diff --git

[PATCH 1 of 6] rust: update dependencies

# HG changeset patch # User Yuya Nishihara # Date 1580396239 -32400 # Thu Jan 30 23:57:19 2020 +0900 # Node ID 60729184896c34715b637ba12759b0518204bdbe # Parent 71457ff69c2f0bd54794606eba8d7da3110f8e3d rust: update dependencies For no particular reason, but just because I'll bump the

D8041: revset: add a revset for parents in merge state

martinvonz marked an inline comment as done. martinvonz updated this revision to Diff 19722. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8041?vs=19701=19722 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/

mercurial@44194: 4 new changesets

4 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/732098027b34 changeset: 44191:732098027b34 user:Martin von Zweigbergk date:Tue Jan 28 10:40:19 2020 -0800 summary: rust: re-format with nightly rustfmt

D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

quark added a comment. What do you think about this approach: 1. The server detects that LC_TYPE is coerced. 2. When handling the "validate" command, the server sends back "invalidate this server, and fallback to original hg" response. This makes chg/non-chg behave consistently

D8027: graft: default `base` argument to common case of `ctx.p1()`

Closed by commit rHG4b774ce8e778: graft: default `base` argument to common case of `ctx.p1()` (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8040: mergestate: add accessors for local and other nodeid, not just contexts

Closed by commit rHGb8b4d9ad4613: mergestate: add accessors for local and other nodeid, not just contexts (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7906: rebase: define base in only place in defineparents()

Closed by commit rHG0712c5e86b9c: rebase: define base in only place in defineparents() (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7906?vs=19698=19720

D8026: graft: let caller pass in overlayworkingctx to merge.graft()

Closed by commit rHG916e3ed05195: graft: let caller pass in overlayworkingctx to merge.graft() (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8028: tests: use full `uncommit` command name in tests

Closed by commit rHG4f4382291204: tests: use full `uncommit` command name in tests (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8028?vs=19661=19719

D8046: copies: fix crash when copy source is not in graft base

Closed by commit rHGa0f34033adf6: copies: fix crash when copy source is not in graft base (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8045: tests: add test showing crash when shelving ghosted rename target

Closed by commit rHGb3c08e1b2cd8: tests: add test showing crash when shelving ghosted rename target (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. In D7974#118685 , @martinvonz wrote: > In D7974#118682 , @pulkit wrote: > >> `test-rename-merge1.t` fails with this patch. Looks like there is one more instance of

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. In D7974#118682 , @pulkit wrote: > `test-rename-merge1.t` fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure.

D8041: revset: add a revset for parents in merge state

yuja added a comment. > +@predicate(b'conflictparents()', safe=True) > +def parents(repo, subset, x): ^^^ Nit: copy-paste error? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/ REVISION DETAIL

Re: D8041: revset: add a revset for parents in merge state

> +@predicate(b'conflictparents()', safe=True) > +def parents(repo, subset, x): ^^^ Nit: copy-paste error? ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7974: merge: when rename was made on both sides, use ancestor as merge base

pulkit added a comment. `test-rename-merge1.t` fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

yuja added a comment. > - # Python3 has some logic to "coerce" the C locale to a UTF-8 capable > - # one, and it sets LC_CTYPE in the environment to C.UTF-8 if none of > - # 'LC_CTYPE', 'LC_ALL' or 'LANG' are set (to any value). This can be > - # disabled with PYTHONCOERCECLOCALE=0 in

Re: D8039: chg: force-set LC_CTYPE on server start to actual value from the environment

> -# Python3 has some logic to "coerce" the C locale to a UTF-8 capable > -# one, and it sets LC_CTYPE in the environment to C.UTF-8 if none of > -# 'LC_CTYPE', 'LC_ALL' or 'LANG' are set (to any value). This can be > -# disabled with PYTHONCOERCECLOCALE=0 in the

D8041: revset: add a revset for parents in merge state

pulkit added inline comments. INLINE COMMENTS > revset.py:1866 > + > +If "merge" here includes merge conflicts from e.g. 'hg rebase' or > +'hg graft'. The sentence looks incomplete. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/

D8022: chg: pass copies of some envvars so we can detect py37+ modifications

yuja added a comment. > Getting this implemented "correctly" using daemon_postexec is getting relatively complicated - there's no way to backwards- and forwards-compatibly do this since there's no capabilities mechanism for daemon_postexec. If I blindly do it, it fails when connecting to

Re: D8022: chg: pass copies of some envvars so we can detect py37+ modifications

> Getting this implemented "correctly" using daemon_postexec is getting > relatively complicated - there's no way to backwards- and forwards-compatibly > do this since there's no capabilities mechanism for daemon_postexec. If I > blindly do it, it fails when connecting to an older hg saying

D8029: uncopy: add new `hg uncopy` command

martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in cmdutil.py:1698 > generally we refer to `repo[None]` as `wctx` right? I didn't do that because I had planned the next patch, where the same code is used for working copy and not, so `ctx` isn't necessarily the working copy. >

D8030: uncopy: add support for unmarking committed copies

martinvonz added a comment. In D8030#118662 , @pulkit wrote: > I don't feel very good with this because this makes `hg uncopy` a history editing command. That's a good thing in my opinion :) > Something like `hg uncopy --after` which

D8030: uncopy: add support for unmarking committed copies

pulkit added a comment. I don't feel very good with this because this makes `hg uncopy` a history editing command. Something like `hg uncopy --after` which makes the changes in wdir which can be committed afterwards sounds best, but I am not sure if that's possible. REPOSITORY rHG

D8029: uncopy: add new `hg uncopy` command

pulkit added inline comments. INLINE COMMENTS > cmdutil.py:1698 > +def uncopy(ui, repo, pats, opts): > +ctx = repo[None] > + generally we refer to `repo[None]` as `wctx` right? > commands.py:7502 > +) > +def uncopy(ui, repo, *pats, **opts): > +"""unmark files as copied""" We should

D8049: rust-dirstatemap: add `NonNormalEntries` class

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This fix introduces the same encapsulation as the `copymap`. There is no easy way of doing this any better for now. REPOSITORY rHG Mercurial BRANCH

D8050: rust-dirstatemap: update call sites from Python

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

D8048: rust-dirstatemap: cache non normal and other parent set

Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Performance of `hg update` was significantly worse since the introduction of the Rust `dirstatemap`. This regression was noticed by Valentin Gatien-Baron

D8047: rust-dirstate: add missing @propertycache

Alphare created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY While investigating a regression on `hg update` performance introduced by the Rust `dirstatemap`, two missing `@propertycache` were identified when comparing