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

kevincox added inline comments. INLINE COMMENTS > dirstate_map.rs:38 > +non_normal_set: Option>, > +other_parent_set: Option>, > parents: Option, I don't understand why an `Option` is faster than a `HashSet`. Could you add some explanation to the commit message? Is this to avoid

D8111: rust-dirstatemap: add `NonNormalEntries` class

Closed by commit rHG71e13cfd6154: rust-dirstatemap: add `NonNormalEntries` class (authored by Alphare). 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 Mercurial CHANGES

D8088: rust-status: add missing variants to `Dispatch` enum

Alphare updated this revision to Diff 20186. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8088?vs=20046=20186 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8088/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8088

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

marmoute added a comment. marmoute added a subscriber: Alphare. This is supposed to be a graft of something already accepted on default. So unless I did a mistake on the graft (cc @Alphare for checking) any feedback on this also apply on the default one. REPOSITORY rHG Mercurial CHANGES

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

Closed by commit rHG58c74a517a00: rust-dirstatemap: cache non normal and other parent set (authored by Alphare). 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 Mercurial

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

Alphare added inline comments. INLINE COMMENTS > kevincox wrote in dirstate_map.rs:38 > I don't understand why an `Option` is faster than a `HashSet`. Could > you add some explanation to the commit message? Is this to avoid attempting > to initialize the entry multiple times? Using `Option`

D8086: rust-status: refactor options into a `StatusOptions` struct

Alphare updated this revision to Diff 20184. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8086?vs=20164=20184 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8086/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8086

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

Alphare added a comment. In D8110#120671 , @marmoute wrote: > This is supposed to be a graft of something already accepted on default. So unless I did a mistake on the graft (cc @Alphare for checking) any feedback on this also apply on the

D7927: rust-status: add util for listing a directory

Alphare updated this revision to Diff 20183. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7927?vs=19942=20183 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7927/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7927

D8113: debugcommands: add templated command for reading the merge state for e.g. IDEs

durin42 added a comment. Why can't we add templater support to `debugmergestate` instead? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8113/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8113 To: martinvonz, #hg-reviewers Cc: durin42,

D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy

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

mercurial@44302: 10 new changesets (3 on stable)

10 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/83b2b829c94e changeset: 44293:83b2b829c94e user:Raphaël Gomès date:Thu Jan 30 14:57:02 2020 +0100 summary: rust-dirstatemap: cache non normal and other parent set

D8031: copy: rewrite walkpat() to depend less on dirstate

Closed by commit rHG2bd3b95fdce0: copy: rewrite walkpat() to depend less on dirstate (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". REPOSITORY rHG Mercurial

D8030: copy: add support for unmarking committed copies

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

D8087: rust-status: rename `StatusResult` to `DirstateStatus`

Alphare updated this revision to Diff 20185. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8087?vs=20156=20185 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8087/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8087

D8029: copy: add option to unmark file as copied

pulkit added a comment. The commit message has a mention of `uncopy` which needs to be removed. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8029/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8029 To: martinvonz, #hg-reviewers, durin42,

D8035: copy: add support for marking committed copies

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

D8029: copy: add option to unmark file as copied

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

D8114: debugmergestate: use only templated output

martinvonz added a comment. martinvonz abandoned this revision. Making this patch part of D8113 (this patch was never meant to be queued on its own). REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8114/new/

D7929: rust-status: add bare `hg status` support in hg-core

Alphare marked 5 inline comments as done. Alphare updated this revision to Diff 20188. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7929?vs=20157=20188 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7929/new/ REVISION

D8113: debugcommands: add templated command for reading the merge state for e.g. IDEs

martinvonz added a comment. In D8113#120695 , @durin42 wrote: > Why can't we add templater support to `debugmergestate` instead? Sorry, I should have explained that in the commit message. The reason I didn't was because the current

D8029: copy: add option to unmark file as copied

martinvonz added a comment. In D8029#120701 , @pulkit wrote: > The commit message has a mention of `uncopy` which needs to be removed. Good catch. Done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D8115: rebase: show bug when rebasing merge with obsoleted revs on both sides

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY By inspection, the rebase should be fine: "just" omit 8 and 10 from the rebase. This is a simplified case of something we're seeing at Google. DO NOT

D7930: rust-status: update rust-cpython bridge to account for the changes in core

Alphare updated this revision to Diff 20189. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7930?vs=20158=20189 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7930/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7930

D8112: test: pin the number of CPU for issue4074 tests

Closed by commit rHG60bc043d7df7: test: pin the number of CPU for issue4074 tests (authored by marmoute). 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 Mercurial

D8032: copy: rename `wctx` to `ctx` since it will not necessarily be working copy

Closed by commit rHG27a78ea30b48: copy: rename `wctx` to `ctx` since it will not necessarily be working copy (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".

D8033: copy: move argument validation a little earlier

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

D8033: copy: move argument validation a little earlier

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

D8113: debugmergestate: make templated

martinvonz added a comment. In D8113#120745 , @pulkit wrote: > Will be nice to add some release notes either in BC section or in features section stating `debugmergestate` now supports templates and can be used by scripts/editors.

D8029: copy: add option to unmark file as copied

This revision now requires changes to proceed. marmoute added a comment. marmoute requested changes to this revision. The UI seems good, but it seems like we should have `--dry-run` supports and I find the help text confusing (I made improvement suggestion). INLINE COMMENTS >

D8029: copy: add option to unmark file as copied

marmoute added inline comments. INLINE COMMENTS > martinvonz wrote in commands.py:2339 > If you first do `hg cp a b`, you can't then do `hg cp --forget a`, it needs > to be the destination. The "SOURCE" and "DEST" names refer to the names in > the synopsis. I was trying to clarify that that

D8030: copy: add support for unmarking committed copies

This revision now requires changes to proceed. marmoute added a comment. marmoute requested changes to this revision. I had a longer discussion with @martinvonz on IRC on about this feature, he also pointed out to D7631 doing similar work for `hg

D8035: copy: add support for marking committed copies

marmoute added a comment. See my comment on D8030 https://phab.mercurial-scm.org/D8030#120771 This proposed change is part of a much bigger picture that requires wider discussion before we can safely proceed. (Sorry for the delay this will

D8113: debugmergestate: make templated

pulkit added a comment. Will be nice to add some release notes either in BC section or in features section stating `debugmergestate` now supports templates and can be used by scripts/editors. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8113/new/

D8035: copy: add support for marking committed copies

marmoute added a comment. In D8035#120590 , @durin42 wrote: > In D8035#119861 , @marmoute wrote: > >> See my comment in D8030 , the feature is

D8030: copy: add support for unmarking committed copies

martinvonz added a comment. In D8030#120771 , @marmoute wrote: > I had a longer discussion with @martinvonz on IRC on about this feature, he also pointed out to D7631 doing similar work for `hg

D8030: copy: add support for unmarking committed copies

marmoute added a comment. In D8030#120781 , @martinvonz wrote: > I don't like the idea of delaying this feature two months. I believe we need wider discussion about this before going further, this is an interresting change but we cannot

D8030: copy: add experimetal support for unmarking committed copies

martinvonz retitled this revision from "copy: add support for unmarking committed copies" to "copy: add experimetal support for unmarking committed copies". martinvonz updated this revision to Diff 20207. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8113: debugmergestate: make templated

Herald added a reviewer: durin42. martinvonz edited the summary of this revision. martinvonz retitled this revision from "debugcommands: add templated command for reading the merge state for e.g. IDEs" to "debugmergestate: make templated". martinvonz updated this revision to Diff 20202.

D8113: debugmergestate: make templated

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

D7795: rust-nodemap: insert method

marmoute added a comment. In D7795#120551 , @durin42 wrote: > In D7795#119774 , @marmoute wrote: > >> The change seesm good to me. However kevincox proposal to use `#[cfg(test)]` for

D8029: copy: add option to unmark file as copied

martinvonz added inline comments. INLINE COMMENTS > marmoute wrote in cmdutil.py:1413 > Why are these two incompatible ? I can imagine running `--forget` with > `--dryrun` Just not implemented yet. Are you asking just out of curiosity or do you think it needs to be clarified to the user? >

D8029: copy: add option to unmark file as copied

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

D8030: copy: add support for unmarking committed copies

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

D8029: copy: add option to unmark file as copied

marmoute added inline comments. INLINE COMMENTS > martinvonz wrote in commands.py:2339 > > What I find the most confusing part is the piece refering to SOURCE and > > DEST for an > > operation that as no such pair. I would refer to an explicite TARGET > > argument and > > include some kind of

D8035: copy: add experimental support for marking committed copies

martinvonz retitled this revision from "copy: add support for marking committed copies" to "copy: add experimental support for marking committed copies". martinvonz updated this revision to Diff 20208. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8113: debugmergestate: make templated

martinvonz added a comment. I was worried that the new version might be crashing in some cases (I specifically worried about indexes out of range in the `state` list). To test that, I added `hg debugmergestate` before every `hg resolve` call in the test suite. That showed two different

D8113: debugmergestate: make templated

martinvonz added a comment. In D8113#120746 , @martinvonz wrote: > In D8113#120745 , @pulkit wrote: > >> Will be nice to add some release notes either in BC section or in features section

D7631: absorb: allowing committed changes to be absorbed into their ancestors

marmoute added a comment. marmoute requested changes to this revision. As explained in this comment https://phab.mercurial-scm.org/D8030#120771 I find the idea of usign a changeset in place of the working copy interresting. However, this is a larger big UX change that seems to deserve a

D8029: copy: add option to unmark file as copied

martinvonz added inline comments. INLINE COMMENTS > marmoute wrote in commands.py:2339 > What i mean is to put the equivalent of a synopsys line inside the > documentation text at tle location where --forget is defined. Hmm, do we do that elsewhere? It would seem out of place to me, but if

D8029: copy: add option to unmark file as copied

marmoute added inline comments. INLINE COMMENTS > martinvonz wrote in commands.py:2339 > Hmm, do we do that elsewhere? It would seem out of place to me, but if > there's precedent for doing it, I can do it here too. The other command with variable number of arguments I can think of usually

D8029: copy: add option to unmark file as copied

martinvonz added inline comments. INLINE COMMENTS > marmoute wrote in commands.py:2339 > doing `hg cp a b` does not add copies information to `a`, so I don't think > there would be confusion from the users. > > What I find the most confusing part is the piece refering to `SOURCE` and > `DEST`

D8035: copy: add support for marking committed copies

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

D8029: copy: add option to unmark file as copied

martinvonz added inline comments. INLINE COMMENTS > marmoute wrote in commands.py:2339 > The other command with variable number of arguments I can think of usually > mark them as optional in their synopsis (eg: `hg bookmarks`), but I feel like > the situation in a bit different. > > The new

D8117: bookmarks: prevent pushes of divergent bookmarks (foo@remote)

valentin.gatienbaron created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this change, such bookmarks are write-only: a client can push them but not pull/read them. And because these bookmark can't be read, even

D8118: mergestate: determine if active without looking for state files on disk

martinvonz created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I couldn't think of a reason that we need to check state files on disk to determine if a merge is active. I could imagine them being for there for

D8120: debugmergestate: make templated

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. martinvonz added a comment. This one replaces D8113 . REVISION SUMMARY Our IntelliJ team wants to be

D8116: bookmarks: refactor in preparation for next commit

valentin.gatienbaron 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/D8116 AFFECTED FILES mercurial/bookmarks.py CHANGE DETAILS diff --git

D8113: debugmergestate: make templated

martinvonz added a comment. In D8113#120803 , @martinvonz wrote: > I was worried that the new version might be crashing in some cases (I specifically worried about indexes out of range in the `state` list). To test that, I added `hg

D8119: tests: add tests of debugmergestate with unresolved/resolved path conflicts

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm about to change `hg debugmergestate` and it broke on these "pu" and "pr" records on my first attempt (D8113 ), so

D8120: debugmergestate: make templated

martinvonz added a comment. This one replaces D8113 . REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8120/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8120 To: martinvonz, durin42, #hg-reviewers Cc:

Mercurial 5.4 Sprint; Paris, France; March 27th-29th.

Hi everyone, This is a reminder that we have a Community sprint coming. It will be held in Paris, France from Friday March 27th to Sunday 29th 2020. Everyone is welcome from core developers to aspiring contributors. Attending a Mercurial sprint is usually a good way to kickstart your

D7928: rust-status: add function for sequential traversal of the working directory

Alphare updated this revision to Diff 20187. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7928?vs=20047=20187 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7928/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7928

D8114: debugmergestate: use only templated output

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8114 AFFECTED FILES mercurial/debugcommands.py

D8030: copy: add support for unmarking committed copies

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