D7903: sha1dc: avoid including the nonexistent stdint.h with Visual Studio 2008

mharbison72 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/D7903 AFFECTED FILES mercurial/thirdparty/sha1dc/lib/ubc_check.c

D7902: merge: introduce a clean_update() for that use-case

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In the same vein as the previous patch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D7901: merge: introduce a revert_to() for that use-case

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I find it hard to understand what value to pass for all the arguments to `merge.update()`. I would like to introduce functions that are more specific to each

D7900: merge: avoid a negation in the definition of updatedirstate

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We only use `partial` in one place: the definition of `updatedirstate`. Let's simplify that a little. REPOSITORY rHG Mercurial BRANCH default REVISION

D7899: merge: define updatedirstate a little earlier and reuse it

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/D7899 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D7897: rebase: fix bug where `--collapse` would apply diff on missing file

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Even though the file was missing, the rebase would succeed. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7897

D7898: merge: don't call update hook when using in-memory context

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'm pretty sure many hook implementors will assume that they can inspect the working copy and/or dirstate parents when the hook is called, so I don't think

D7896: rebase: extract a variable for a repeated `repo[p1]`

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I'll add another use site in the next patch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7896 AFFECTED

D7787: rust-nodemap: building blocks for nodetree structures

gracinet added inline comments. gracinet marked 2 inline comments as done. INLINE COMMENTS > gracinet wrote in nodemap.rs:111 > Nice, thanks for the tip So, that gives formatting with braces, hence for consistency I changed the `block!` macro, too. I didn't keep the hexadecimal formatting,

D7819: rust-nodemap: core implementation for shortest

gracinet updated this revision to Diff 19331. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7819?vs=19139=19331 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7819/new/ REVISION DETAIL

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

gracinet updated this revision to Diff 19330. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7798?vs=19138=19330 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7798/new/ REVISION DETAIL

D7796: rust-nodemap: input/output primitives

gracinet updated this revision to Diff 19329. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7796?vs=19137=19329 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7796/new/ REVISION DETAIL

D7795: rust-nodemap: insert method

gracinet updated this revision to Diff 19328. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7795?vs=19044=19328 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7795/new/ REVISION DETAIL

D7788: rust-node: binary Node and conversion utilities

gracinet updated this revision to Diff 19323. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7788?vs=19037=19323 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7788/new/ REVISION DETAIL

D7794: rust-nodemap: generic NodeTreeVisitor

gracinet updated this revision to Diff 19327. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7794?vs=19043=19327 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7794/new/ REVISION DETAIL

D7793: rust-nodemap: mutable NodeTree data structure

gracinet updated this revision to Diff 19326. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7793?vs=19136=19326 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7793/new/ REVISION DETAIL

D7792: rust-nodemap: abstracting the indexing

gracinet updated this revision to Diff 19325. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7792?vs=19135=19325 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7792/new/ REVISION DETAIL

D7791: rust-nodemap: NodeMap trait with simplest implementor

gracinet updated this revision to Diff 19324. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7791?vs=19134=19324 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7791/new/ REVISION DETAIL

D7787: rust-nodemap: building blocks for nodetree structures

gracinet updated this revision to Diff 19322. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7787?vs=19133=19322 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7787/new/ REVISION DETAIL

D7871: rust-utils: add util for canonical path

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

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

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

D7869: rust-dirs-multiset: add `DirsChildrenMultiset`

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

D7870: rust-utils: add `Escaped` trait

Alphare added a comment. In D7870#115935 , @kevincox wrote: > I'm not convinced PrettyPrint is the best name. I might call it something more to do with escaping instead of "pretty". However I can't think of anything great. Yeah, I am

D7870: rust-utils: add `Escaped` trait

Alphare retitled this revision from "rust-utils: add `PrettyPrint` trait" to "rust-utils: add `Escaped` trait". Alphare updated this revision to Diff 19320. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7870?vs=19262=19320 BRANCH default CHANGES

D7867: rust-hg-path: add useful methods to `HgPath`

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

D7864: rust-utils: add Rust implementation of Python's "os.path.splitdrive"

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

D7863: rust-utils: add util to find a slice in another slice

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

D7862: dirstate: move rust fast-path calling code to its own method

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

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

Alphare added inline comments. Alphare marked 2 inline comments as done. INLINE COMMENTS > kevincox wrote in path_auditor.rs:54 > It would be nice to have this in a helper function in path to get a component > iterator. I think that's a good idea indeed, but I would prefer to do it in another

D7895: rust-core: fix typo in comment

gracinet added a comment. gracinet accepted this revision. Ah yes, thanks REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7895/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7895 To: aayjaychan, #hg-reviewers, kevincox, gracinet Cc: gracinet,

D7864: rust-utils: add Rust implementation of Python's "os.path.splitdrive"

Alphare added inline comments. INLINE COMMENTS > kevincox wrote in files.rs:109 > I would recommend just converting to bytes at the top of the function then > converting the return value to a path at the exit. I feel when you are doing > manipulation like this it makes the most sense to treat

D7864: rust-utils: add Rust implementation of Python's "os.path.splitdrive"

kevincox added inline comments. INLINE COMMENTS > Alphare wrote in files.rs:109 > Indeed, this is much better. While trying to adapt this code to fit with > `HgPath`, I find myself needing to translate to and from bytes whenever > indexing or when using `split_at`. Should we give a `HgPath` a

D7864: rust-utils: add Rust implementation of Python's "os.path.splitdrive"

Alphare added inline comments. INLINE COMMENTS > kevincox wrote in files.rs:109 > I think this can be simplified. See > https://play.rust-lang.org/?version=stable=debug=2018=78136ead96596afe6305e7542a881ca4. > I had to use &[u8] to avoid having to copy all of the HgPath stuff into the >

Re: 5.4sprint location/date finalization

Gentle reminder, please update the sprint wiki page with availability. On 1/6/20 10:14 PM, Augie Fackler wrote: Howdy folks, https://www.mercurial-scm.org/wiki/5.4Sprint has three choices of location: Finland, Brussels, and Paris. Given the tentative availability of Paris, and the relative

Nlnet funding for transitioning out of SHA-1

Hello all, As you all know, we have to transition out of using SHA-1 for Mercurial (https://www.mercurial-scm.org/wiki/SHA1TransitionPlan). While a known mitigation has been introduced by a few of Augie's patches, we still have to act on that transition. The Nlnet foundation has a program

D7895: rust-core: fix typo in comment

aayjaychan created this revision. Herald added subscribers: mercurial-devel, kevincox, durin42. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D7895 AFFECTED FILES rust/hg-core/src/revlog.rs CHANGE DETAILS

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

martinvonz added inline comments. INLINE COMMENTS > rebase.py:600 > +p1 = self.wctx.p1().node() > +repo.setparents(p1) > elif self.state[rev] == revtodo: Actually, doesn't this need to be `wctx.setparents()` (which you can do now that D7822

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

martinvonz added inline comments. INLINE COMMENTS > khanchi97 wrote in rebase.py:597 > I will look into it. No need, I've already sent D7827 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7730/new/ REVISION DETAIL

D7866: rust-pathauditor: add Rust implementation of the `pathauditor`

kevincox added inline comments. kevincox accepted this revision. INLINE COMMENTS > path_auditor.rs:53 > +.as_bytes() > +.split(|c| *c as char == std::path::MAIN_SEPARATOR) > +.collect(); Should this be `std::path::is_separator(*c as char)`?. If not please

D7870: rust-utils: add `PrettyPrint` trait

kevincox added a comment. kevincox accepted this revision. I'm not convinced PrettyPrint is the best name. I might call it something more to do with escaping instead of "pretty". However I can't think of anything great. INLINE COMMENTS > utils.rs:146 > +

D7869: rust-dirs-multiset: add `DirsChildrenMultiset`

kevincox added inline comments. kevincox accepted this revision. INLINE COMMENTS > dirs_multiset.rs:170 > +Some(i) => i.contains(), > +} { > +continue; I would put this check into a helper function. > files.rs:86 > +)), > +

D7867: rust-hg-path: add useful methods to `HgPath`

kevincox added inline comments. kevincox accepted this revision. INLINE COMMENTS > hg_path.rs:189 > +[..] > +}; > +HgPath::new(match inner.iter().rposition(|b| *b == b'/') { It would be nice to have a `trim_trailing_slash` helper. REPOSITORY rHG Mercurial CHANGES

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

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The performance and memory benefit is much greater if we don't have to copy all the data in memory for each information. So we introduce an option (on by

D7888: nodemap: track the maximum revision tracked in the nodemap

marmoute created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We need a simple way to detect when the on disk data contains less revision than the index we read from disk. The docket file

D7893: nodemap: update the index with the newly written data (when appropriate)

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If we are to use mmap to read the nodemap data, and if the python code is responsible for the IO, we need to refresh the mmap after each write and provide it

D7892: nodemap: never read more than the expected data amount

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since we are tracking this number we can use it to detect corrupted rawdata file and to only read the correct amount of data when possible. REPOSITORY rHG

D7889: nodemap: track the total and unused amount of data in the rawdata file

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We need to keep that information around: - total data will allow transaction to start appending new information without confusing other reader. - unused

D7891: nodemap: write new data from the expected current data length

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If the amount of data in the file exceed the expect amount, we will overwrite the extra data. This is a simple way to be safer. REPOSITORY rHG Mercurial

D7885: nodemap: keep track of the docket for loaded data

marmoute created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY To perform incremental update of the on disk data, we need to keep tracks of some aspect of that data. REPOSITORY rHG

D7890: nodemapdata: double check the source docket when doing incremental update

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In theory, the index will have the information we expect it to have. However by security, it seems safer to double check that the incremental data are

D7887: nodemap: add a flag to dump the details of the docket

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We are about to add more information to the docket. We first introduce a way to debug its content. REPOSITORY rHG Mercurial REVISION DETAIL

D7864: rust-utils: add Rust implementation of Python's "os.path.splitdrive"

This revision now requires changes to proceed. kevincox added inline comments. kevincox requested changes to this revision. INLINE COMMENTS > files.rs:109 > +/// Paths cannot contain both a drive letter and a UNC path. > +pub fn split_drive(path: impl AsRef) -> (HgPathBuf, HgPathBuf) { > +

D7845: nodemap: add basic checking of the on disk nodemap content

marmoute updated this revision to Diff 19299. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7845?vs=19182=19299 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7845/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7845 AFFECTED FILES

D7886: nodemap: introduce append-only incremental update of the persisten data

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rewriting the full nodemap for each transaction has a cost we would like to avoid. We introduce a new way to write persistent nodemap data by adding new

D7884: nodemap: introduce an explicit class/object for the docket

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We are about to add more information to this docket, having a clear location to stock them in memory will help. REPOSITORY rHG Mercurial REVISION DETAIL

D7883: nodemap: keep track of the ondisk id of nodemap blocks

marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY If we are to incrementally update the files, we need to keep some details about the data we read. REPOSITORY rHG Mercurial REVISION DETAIL

D7846: nodemap: all check that revision and nodes match in the nodemap

marmoute updated this revision to Diff 19300. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7846?vs=19183=19300 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7846/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7846 AFFECTED FILES

D7844: nodemap: code to parse a serialized nodemap

marmoute updated this revision to Diff 19298. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7844?vs=19181=19298 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7844/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7844 AFFECTED FILES

D7843: nodemap: move the iteratio inside the Block object

marmoute updated this revision to Diff 19297. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7843?vs=19180=19297 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7843/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7843 AFFECTED FILES

D7842: nodemap: use an explicit "Block" object in the reference implementation

marmoute updated this revision to Diff 19296. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7842?vs=19179=19296 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7842/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7842 AFFECTED FILES

D7841: nodemap: add a optional `nodemap_add_full` method on indexes

marmoute updated this revision to Diff 19295. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7841?vs=19178=19295 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7841/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7841 AFFECTED FILES

D7839: nodemap: deleted older raw data file when creating a new ones

marmoute updated this revision to Diff 19294. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7839?vs=19176=19294 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7839/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7839 AFFECTED FILES

D7787: rust-nodemap: building blocks for nodetree structures

gracinet added a comment. @kevincox thanks for the review! INLINE COMMENTS > kevincox wrote in nodemap.rs:92 > I would call these `get` and `set`. Yes, I suppose `read` and `write` feel like I/O. Will do. > kevincox wrote in nodemap.rs:111 > You can use this helper: >

D7862: dirstate: move rust fast-path calling code to its own method

Alphare added a comment. In D7862#115784 , @pulkit wrote: > Absorbing the following diff to make `test-check-format.t` happy: Sorry about that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7787: rust-nodemap: building blocks for nodetree structures

kevincox added inline comments. kevincox accepted this revision. INLINE COMMENTS > nodemap.rs:92 > + > +fn read(, nybble: u8) -> Element { > +Element::from(RawElement::from_be(self.0[nybble as usize])) I would call these `get` and `set`. > nodemap.rs:111 > +} > +

D7879: sha1dc: use buffer protocol when parsing arguments

Closed by commit rHGdc9b53482689: sha1dc: use buffer protocol when parsing arguments (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 Mercurial

D7881: lfs: check content length after downloading content

Closed by commit rHG0ee0a3f6a990: lfs: check content length after downloading content (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7881?vs=19280=19291

D7882: lfs: avoid quadratic performance in processing server responses

Closed by commit rHGffac09da7a19: lfs: avoid quadratic performance in processing server responses (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7880: lfs: rename a variable to clarify its use

Closed by commit rHG84f2becbd106: lfs: rename a variable to clarify its use (authored by mharbison72). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7880?vs=19279=19290 CHANGES

D7878: sha1dc: use proper string functions on Python 2/3

Closed by commit rHG29a110e2776e: sha1dc: use proper string functions on Python 2/3 (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/D7878?vs=19277=19289

D7875: packaging: leverage os.path.relpath() in setup.py

Closed by commit rHG4e05272dd681: packaging: leverage os.path.relpath() in setup.py (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/D7875?vs=19268=19286

D7876: sha1dc: manually define integer types on msvc 2008

Closed by commit rHGef36156eac9f: sha1dc: manually define integer types on msvc 2008 (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/D7876?vs=19275=19287

D7877: sha1dc: declare all variables at begininng of block

Closed by commit rHGc3f741bb2f33: sha1dc: declare all variables at begininng of block (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/D7877?vs=19276=19288

D7862: dirstate: move rust fast-path calling code to its own method

pulkit added a comment. Absorbing the following diff to make `test-check-format.t` happy: diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -1089,9 +1089,7 @@ class dirstate(object): # how to

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

khanchi97 added inline comments. INLINE COMMENTS > martinvonz wrote in rebase.py:597 > I think it's incorrect that rebase sets two parents while the merge is being > resolved, but that's out of scope for this patch. I will look into it. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

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

khanchi97 added a comment. In D7730#114953 , @pulkit wrote: > Unrelated to the fix, we need better way to skip commits during rebasing. Pruning manually is not a good option, IIRC git rebase have a `--skip` flag. Yeah, that's a good idea.

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

khanchi97 updated this revision to Diff 19283. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7730?vs=18939=19283 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7730/new/ REVISION DETAIL

D7728: rebase: add test to demonstrate issue6180

khanchi97 updated this revision to Diff 19282. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7728?vs=18937=19282 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7728/new/ REVISION DETAIL