D7384: commands: necessary annotations and suppresssions to pass pytype

2020-02-14 Thread marmoute (Pierre-Yves David)
marmoute added a comment. marmoute accepted this revision. There don't seems to be any remaininf feedback on this. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7384/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7384 To: durin42, #hg-reviewe

D7730: rebase: make sure pruning does not confuse rebase (issue6180)

2020-02-14 Thread marmoute (Pierre-Yves David)
This revision now requires changes to proceed. marmoute added a comment. marmoute requested changes to this revision. In D7730#119191 , @pulkit wrote: > In D7730#117268 , @marmoute wrote: > >> I

D7728: rebase: add test to demonstrate issue6180

2020-02-14 Thread marmoute (Pierre-Yves David)
This revision now requires changes to proceed. marmoute added a comment. marmoute requested changes to this revision. As per comment of Pulkit and I on D7730 , please spin this test toward forbiding the prune while the rebase is in progress. REPOSITORY

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

2020-02-14 Thread marmoute (Pierre-Yves David)
marmoute added a comment. marmoute accepted this revision. looks good to me. thanks for plitting REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8086/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8086 To: Alphare, #hg-reviewers, marmoute Cc: m

D8030: copy: add experimetal support for unmarking committed copies

2020-02-14 Thread Raphaël Gomès
Alphare added a comment. > I'm fine with marking the use of `-r` experimental. I don't like the idea of delaying this feature two months. Any problem with marking it experimental for now? As usual with experimental features, that will allow us to rename the flag (and change other behavior) b

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

2020-02-14 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in status.rs:456 > I can definitely see that this is a judgement call. However > `.map(Cow::Borrowed)` is easy enough to write that I think it makes sense in > this case. However both ways are acceptable. I think your way is clean

Re: Nlnet funding for transitioning out of SHA-1

2020-02-14 Thread Raphaël Gomès
Hello all, I've received an email from Nlnet acknowledging our submission. It should be reviewed within the next 3 weeks. I'll keep you updated. On 1/15/20 5:53 PM, Raphaël Gomès wrote: Hello all, As you all know, we have to transition out of using SHA-1 for Mercurial (https://www.mercuria

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

2020-02-14 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > Alphare wrote in dirstate_map.rs:251 > Unwrapping creates a temporary value that is dropped instantly, so unless I'm > not seeing something, I don't think we can. You should be able to use `.as_mut()` just like you are currently doing in the ca

D7796: rust-nodemap: input/output primitives

2020-02-14 Thread Raphaël Gomès
Alphare added a comment. @kevincox To re-iterate, I've taken over this series, so excuse any additional inaccuracies. INLINE COMMENTS > gracinet wrote in nodemap.rs:268 > About a method to output to a writer: for the time being, we're avoiding > doing I/O directly in Rust because most of it

D7797: rust-nodemap: pure Rust example

2020-02-14 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in index.rs:47 > I would make this an early return and remove the else. It seems to me like an > unexpected condition. If it should never happen then please add a > debug_assert as well. This is expected to happen, as it is the cu

D7796: rust-nodemap: input/output primitives

2020-02-14 Thread Raphaël Gomès
Alphare updated this revision to Diff 20215. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7796?vs=20025&id=20215 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7796/new/ REVISION DETAIL https://phab.mercurial-scm.org/D77

D7798: rust-nodemap: special case for prefixes of NULL_NODE

2020-02-14 Thread Raphaël Gomès
Alphare updated this revision to Diff 20217. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7798?vs=20027&id=20217 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7798/new/ REVISION DETAIL https://phab.mercurial-scm.org/D77

D8097: rust-nodemap: accounting for dead blocks

2020-02-14 Thread Raphaël Gomès
Alphare updated this revision to Diff 20219. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8097?vs=20029&id=20219 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8097/new/ REVISION DETAIL https://phab.mercurial-scm.org/D80

D8098: rust-nodemap: a method for full invalidation

2020-02-14 Thread Raphaël Gomès
Alphare updated this revision to Diff 20220. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8098?vs=20030&id=20220 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8098/new/ REVISION DETAIL https://phab.mercurial-scm.org/D80

D7797: rust-nodemap: pure Rust example

2020-02-14 Thread Raphaël Gomès
Alphare updated this revision to Diff 20216. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7797?vs=20166&id=20216 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7797/new/ REVISION DETAIL https://phab.mercurial-scm.org/D77

D7819: rust-nodemap: core implementation for shortest

2020-02-14 Thread Raphaël Gomès
Alphare updated this revision to Diff 20218. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7819?vs=20028&id=20218 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7819/new/ REVISION DETAIL https://phab.mercurial-scm.org/D78

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

2020-02-14 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in dirstate_map.rs:251 > You should be able to use `.as_mut()` just like you are currently doing in > the caller. `as_mut()` only does `&mut Option -> Option<&mut T>`, which isn't always what we want (however you can argue that it

D7796: rust-nodemap: input/output primitives

2020-02-14 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > Alphare wrote in nodemap.rs:268 > @kevincox @durin42: I've changed the code to use the type-level > `ManuallyDrop` instead of `mem::forget`, added the `transmute` to be extra > paranoid and added a comment. This doesn't address the primary prob

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

2020-02-14 Thread marmoute (Pierre-Yves David)
marmoute added a comment. marmoute accepted this revision. Simple clear effective. Thanks for splitting REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8087/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8087 To: Alphare, #hg-reviewers, kevinco

D7797: rust-nodemap: pure Rust example

2020-02-14 Thread kevincox (Kevin Cox)
kevincox added inline comments. kevincox accepted this revision. INLINE COMMENTS > Alphare wrote in index.rs:76 > I'm not sure of the point of doing so with an mmap. We have to trust what the > mmap is giving us. In general an assertion is better than a comment because it expresses the things

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

2020-02-14 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > Alphare wrote in dirstate_map.rs:251 > `as_mut()` only does `&mut Option -> Option<&mut T>`, which isn't always > what we want (however you can argue that it would save a few keystrokes), but > calling `unwrap()` circles back to the same `error[

Re: D7796: rust-nodemap: input/output primitives

2020-02-14 Thread Yuya Nishihara
> +) -> (Box + Send>, Vec) { > +let (readonly, vec) = self.into_readonly_and_added(); > +// Prevent running `v`'s destructor so we are in complete control > +// of the allocation. > +let vec = mem::ManuallyDrop::new(vec); > + > +let bytes = unsafe { > +

D7796: rust-nodemap: input/output primitives

2020-02-14 Thread yuja (Yuya Nishihara)
yuja added a comment. > +) -> (Box + Send>, Vec) { > +let (readonly, vec) = self.into_readonly_and_added(); > +// Prevent running `v`'s destructor so we are in complete control > +// of the allocation. > +let vec = mem::ManuallyDrop::new(vec); > +

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

2020-02-14 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in dirstate_map.rs:251 > It works fine for me: > https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=f74f3771641d1e29bdd4de1444c43324 Aaah I still had `&mut`, and the auto-deref rules didn't work there. I see th

D8121: rust-dirstatemap: directly return `non_normal` and `other_entries`

2020-02-14 Thread Raphaël Gomès
Alphare created this revision. Herald added subscribers: mercurial-devel, kevincox. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This cleans up the interface which I previously thought needed to be uglier than in reality. No performance difference, simple refactoring. REPOSITORY

D8121: rust-dirstatemap: directly return `non_normal` and `other_entries`

2020-02-14 Thread Raphaël Gomès
Alphare updated this revision to Diff 20222. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8121?vs=20221&id=20222 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8121/new/ REVISION DETAIL https://phab.mercurial-scm.org/D81

D8030: copy: add experimetal support for unmarking committed copies

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D8030#120786 , @marmoute wrote: > In D8030#120781 , @martinvonz wrote: > >> I don't like the idea of delaying this feature two months. > > I believe we need wi

D8121: rust-dirstatemap: directly return `non_normal` and `other_entries`

2020-02-14 Thread Raphaël Gomès
Closed by commit rHGc089a0947f3e: rust-dirstatemap: directly return `non_normal` and `other_entries` (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

D8030: copy: add experimetal support for unmarking committed copies

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D8030#120899 , @martinvonz wrote: > In D8030#120786 , @marmoute wrote: > >> In D8030#120781 , @martinvonz wrote: >>

D7796: rust-nodemap: input/output primitives

2020-02-14 Thread Raphaël Gomès
Alphare added inline comments. INLINE COMMENTS > kevincox wrote in nodemap.rs:268 > This doesn't address the primary problem of padding. There is nothing in the > code that guarantees that there will be no padding inserted into `Block` > (although it is unlikely to ever happen). This is because

D7796: rust-nodemap: input/output primitives

2020-02-14 Thread kevincox (Kevin Cox)
kevincox added inline comments. INLINE COMMENTS > Alphare wrote in nodemap.rs:268 > I think that would be sufficient indeed. How about making `Block` into a > `[u8; 64]`? It will be less expressive, but this will no longer be needed. I like that. It makes it much more explicit that it is a back

mercurial@44323: 21 new changesets

2020-02-14 Thread Mercurial Commits
21 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d42eea9a0494 changeset: 44303:d42eea9a0494 parent: 44301:4caac36c66bc user:Raphaël Gomès date:Thu Jan 16 10:28:40 2020 +0100 summary: rust-filepatterns: improve API and robustness for pattern file

D6734: git: RFC of a new extension to _directly_ operate on git repositories

2020-02-14 Thread durin42 (Augie Fackler)
durin42 edited the summary of this revision. durin42 updated this revision to Diff 20224. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6734?vs=20144&id=20224 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6734/new/ REVISIO

D6734: git: RFC of a new extension to _directly_ operate on git repositories

2020-02-14 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 20225. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6734?vs=20224&id=20225 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6734/new/ REVISION DETAIL https://phab.mercurial-scm.org/D67

D6734: git: RFC of a new extension to _directly_ operate on git repositories

2020-02-14 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 20226. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6734?vs=20225&id=20226 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6734/new/ REVISION DETAIL https://phab.mercurial-scm.org/D67

D8033: copy: move argument validation a little earlier

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

D8035: copy: add experimental support for marking committed copies

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz edited the summary of this revision. martinvonz updated this revision to Diff 20229. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8035?vs=20208&id=20229 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8035/new/ R

D8030: copy: add experimetal support for unmarking committed copies

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

D6734: git: RFC of a new extension to _directly_ operate on git repositories

2020-02-14 Thread durin42 (Augie Fackler)
durin42 edited the summary of this revision. durin42 updated this revision to Diff 20230. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6734?vs=20226&id=20230 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6734/new/ REVISIO

D6734: git: RFC of a new extension to _directly_ operate on git repositories

2020-02-14 Thread durin42 (Augie Fackler)
durin42 added a comment. This is now ready for review: I would be happy to see this land, and have others contribute towards it. I don't know that I have time to do all that needs doing, but would be delighted to mentor others that want to help! REPOSITORY rHG Mercurial CHANGES SINCE LAST

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

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. martinvonz abandoned this revision. No longer needed now that we've renamed `-r` to `--at-rev`. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8034/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8034 To: martinvonz,

D8033: copy: move argument validation a little earlier

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. martinvonz updated this revision to Diff 20232. fixed stale uses of -r in commit message and transient code REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8033?vs=20228&id=20232 BRANCH default CHANGES SINCE LAST ACTION

D8035: copy: add experimental support for marking committed copies

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. martinvonz updated this revision to Diff 20233. fixed stale uses of -r in commit message and transient code REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8035?vs=20229&id=20233 BRANCH default CHANGES SINCE LAST ACTION

D8030: copy: add experimetal support for unmarking committed copies

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. martinvonz updated this revision to Diff 20231. fixed stale uses of -r in commit message and transient code REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8030?vs=20227&id=20231 BRANCH default CHANGES SINCE LAST ACTION

D8122: pyoxidizer: allow extensions to be loaded from the file system

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It seems that setting this config is all that's needed to be able to load extensions from the file system (which we clearly want). Thanks for making this work

D8122: pyoxidizer: allow extensions to be loaded from the file system

2020-02-14 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. Does this also allow extensions to be bundled in the exe, or are you thinking we need to leave the extensions outside the binary? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8122/new/ REVISION DETAIL https://phab.merc

D8122: pyoxidizer: allow extensions to be loaded from the file system

2020-02-14 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D8122#120939 , @mharbison72 wrote: > Does this also allow extensions to be bundled in the exe, or are you thinking we need to leave the extensions outside the binary? I'm pretty sure this just tells the PyOx