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

2020-02-12 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > dirstate_map.rs:251 > +self.set_non_normal_other_parent_entries(false); > +(&mut self.non_normal_set, &mut self.other_parent_set) > +} If we have just set the fields to `Some(..)` in the previous line can't we do the unwrap h

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

2020-02-12 Thread kevincox (Kevin Cox)
kevincox added inline comments. kevincox accepted this revision. INLINE COMMENTS > status.rs:76 > + > +results.sort_by(|a, b| a.0.cmp(&b.0)); > +Ok(results) It would be more clear to do `.sort_by_key(|e| e.0)` And I don't think stability matters here so you could use `sort_unstable_by_

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

2020-02-12 Thread kevincox (Kevin Cox)
This revision now requires changes to proceed. kevincox added inline comments. kevincox requested changes to this revision. INLINE COMMENTS > status.rs:201 > root_dir: impl AsRef + Sync + Send, > +work: mpsc::Sender<&'a HgPath>, > options: StatusOptions, Please describe this parame

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

2020-02-12 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in status.rs:76 > It would be more clear to do `.sort_by_key(|e| e.0)` > > And I don't think stability matters here so you could use > `sort_unstable_by_key`. I didn't realize that `sort_unstable_by_key` needed to return a `T` and

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

2020-02-12 Thread Raphaël Gomès
Alphare added inline comments. Alphare marked an inline comment as done. INLINE COMMENTS > kevincox wrote in status.rs:456 > Why was this changed when IIUC all of the returns are references? If a caller > wants that I would prefer to do a map in the caller. `traverse` returns some `Cow::Owned`,

D7797: rust-nodemap: pure Rust example

2020-02-12 Thread kevincox (Kevin Cox)
kevincox added inline comments. kevincox accepted this revision. INLINE COMMENTS > index.rs:6 > + > +/// Minimal `RevlogIndex`, readable from standard Mercurial file format > +use hg::*; Since this is a file-level comment it should use `//!` https://doc.rust-lang.org/reference/comments.html#exa

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

2020-02-12 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > Alphare wrote in status.rs:76 > I didn't realize that `sort_unstable_by_key` needed to return a `T` and not a > `&T`, that forces a `clone()`. I'm not sure that matters, we'll go with the > shortest code and see if that shows up in profiling lat

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

2020-02-12 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > Alphare wrote in status.rs:456 > `traverse` returns some `Cow::Owned`, I felt that it was simpler to share the > same return signature for all functions, but I can map the output, I guess. I can definitely see that this is a judgement call. Howe

D7894: nodemap: introduce an option to use mmap to read the nodemap mapping

2020-02-12 Thread durin42 (Augie Fackler)
This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. (Marking this as wanting changes per discussions about adding some headline numbers in the log message so I stop looking at it until that happens.) REPOSITORY rHG Mercurial C

D7972: recover: don't verify by default

2020-02-12 Thread durin42 (Augie Fackler)
This revision is now accepted and ready to land. durin42 added a comment. durin42 accepted this revision. In D7972#120504 , @valentin.gatienbaron wrote: >> I _think_ it's just paranoia. As long as the bundle wasn't woefully corrupt, it shouldn

D7795: rust-nodemap: insert method

2020-02-12 Thread durin42 (Augie Fackler)
durin42 added a comment. In D7795#119774 , @marmoute wrote: > The change seesm good to me. However kevincox proposal to use `#[cfg(test)]` for `pad_node` seems worth applying inflight. For future reference, I'm going to add it here, but

D7796: rust-nodemap: input/output primitives

2020-02-12 Thread durin42 (Augie Fackler)
This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. I'm just not comfortable with the `unsafe` block here, especially with the comments from @kevincox . That said, if the `unsafe` can't disappear, it probably needs a pretty thoro

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

2020-02-12 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. In D6846#120513 , @indygreg wrote: > macOS supports a `@loader_path` and related magic tokens in rpath to load libraries relative to the current binary. See e.g. https://blogs.oracle.com/dipol/dynamic-libraries,-r

D7795: rust-nodemap: insert method

2020-02-12 Thread gracinet (Georges Racinet)
Closed by commit rHGd2da8667125b: rust-nodemap: insert method (authored by gracinet). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.o

D7972: recover: don't verify by default

2020-02-12 Thread valentin.gatienbaron (Valentin Gatien-Baron)
Closed by commit rHG7a4e1d245f19: recover: don't verify by default (authored by valentin.gatienbaron). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7972?vs=19520&id=20168 CHANGES

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

2020-02-12 Thread durin42 (Augie Fackler)
durin42 added a comment. durin42 accepted this revision. I like this, but I'm too chicken to queue it. 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-

D7932: debugstripbackups: introduce command to interact with strip backups

2020-02-12 Thread durin42 (Augie Fackler)
This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. I think I'd prefer debugbackupbundle per marmoute's suggestion. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7932/new/ REVISION DETAIL

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

2020-02-12 Thread Raphaël Gomès
Closed by commit rHGbed8d08cfcb2: rust-dirstatemap: remove additional lookup in dirstate.matches (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 Mer

D8029: copy: add option to unmark file as copied

2020-02-12 Thread durin42 (Augie Fackler)
durin42 added a comment. durin42 accepted this revision. LGTM, would like @marmoute to chime in. 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, ma

Re: [PATCH STABLE] chgserver: spawn new process if schemes change

2020-02-12 Thread Augie Fackler
queued for stable, tahnks > On Feb 11, 2020, at 06:07, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1581418436 -32400 > # Tue Feb 11 19:53:56 2020 +0900 > # Branch stable > # Node ID 3dcf73d0733d87e7a231809d23da4883f4ab3711 > # Parent 84d98fa814a8bab0dd9

Re: [PATCH] pathutil: resurrect comment about path auditing order

2020-02-12 Thread Augie Fackler
queued, thanks > On Feb 1, 2020, at 00:29, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1580529452 -32400 > # Sat Feb 01 12:57:32 2020 +0900 > # Node ID c30168a6a58660a119379c36e83c41ad7535d129 > # Parent 6b7aef44274b457847d912cf1eada1dd8396f650 > pathut

D8030: copy: add support for unmarking committed copies

2020-02-12 Thread durin42 (Augie Fackler)
durin42 added a comment. durin42 accepted this revision. I remain happy with this. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8030/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8030 To: martinvonz, #hg-reviewers, durin42, marmoute Cc: mar

D8033: copy: move argument validation a little earlier

2020-02-12 Thread durin42 (Augie Fackler)
This revision is now accepted and ready to land. durin42 added a comment. durin42 accepted this revision. Oddly, this had some rejects (I didn't look why) but i"d be happy to see this earlier in the series. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab

D8034: check-code: allow `hg cp -r`, by using a negative lookbehind

2020-02-12 Thread durin42 (Augie Fackler)
durin42 added a comment. I think this is obsolete now? Maybe? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8034/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8034 To: martinvonz, #hg-reviewers Cc: durin42, marmoute, mercurial-devel

D8034: check-code: allow `hg cp -r`, by using a negative lookbehind

2020-02-12 Thread durin42 (Augie Fackler)
This revision is now accepted and ready to land. durin42 added a comment. durin42 accepted this revision. Nevermind, I misread. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8034/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8035: copy: add support for marking committed copies

2020-02-12 Thread durin42 (Augie Fackler)
This revision is now accepted and ready to land. durin42 added a comment. durin42 accepted this revision. In D8035#119861 , @marmoute wrote: > See my comment in D8030 , the feature is interresting, but it

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

2020-02-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 20171. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8031?vs=20150&id=20171 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8031/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8029: copy: add option to unmark file as copied

2020-02-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 20174. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8029?vs=20148&id=20174 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8029/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8033: copy: move argument validation a little earlier

2020-02-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D8033#120581 , @durin42 wrote: > Oddly, this had some rejects (I didn't look why) but i"d be happy to see this earlier in the series. I moved some revisions around, but it wasn't trivial to move this one. I

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

2020-02-12 Thread marmoute (Pierre-Yves David)
marmoute created this revision. marmoute added a comment. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. INTENDED FOR STABLE REVISION SUMMARY Performance of `hg update` was significantly worse since the introduction of the Rust `dirstatemap`. Th

D8111: rust-dirstatemap: add `NonNormalEntries` class

2020-02-12 Thread marmoute (Pierre-Yves David)
marmoute created this revision. marmoute added a comment. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. INTENDED FOR STABLE REVISION SUMMARY This fix introduces the same encapsulation as the `copymap`. There is no easy way of doing this any bet

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

2020-02-12 Thread marmoute (Pierre-Yves David)
marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On machine with an hundreds of CPUs, the "user" CPU time reported can be inflated by the status steps. Since the test especially focus on the diff computation,

D7894: nodemap: introduce an option to use mmap to read the nodemap mapping

2020-02-12 Thread marmoute (Pierre-Yves David)
marmoute added a comment. phabricator seems to be very confused about the performance number formatting… It is easier to read here: https://foss.heptapod.net/octobus/mercurial-devel/commit/fb04cf42b051ef84bce081f9d10f5ff75c3e0445 and can be pulled using `hg pull --rev "nodemap-python

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

2020-02-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Our IntelliJ team wants to be able to read the merge state in order to help the user resolve merge conflicts. They had so far been reading file contents from