Re: Improving the CI experience

> On Sep 28, 2020, at 10:43, Raphaël Gomès wrote: > > Hi all, > > As you may know, we (Octobus) and other Mercurial contributors have been using > the Heptapod [1] CI to vet our patches pre-submission against 7 variants of > Mercurial: > - Python 2 pure > - Python 3 pure > - Python 2

Re: Virtual sprint? Ideas?

Done. Please add your availability there if you want to join. On Sun, Sep 27, 2020 at 12:56 PM Augie Fackler wrote: > Sure. It’s better in general to sprint after a release because then we’re > not all focussed on getting a stable release out the door and can have > slightly more experimental

D9117: copies: directly pass a changes object to the copy tracing code

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The object contains all the data we need. For example, the `is_merged` callback can now use the associated precomputed data. This will be useful again

D9116: copies: no longer change the sidedata flag

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY With the new sidedata storage that include data about all file changes, every revision has one, so the sidedata flag is not longer a good way to spot

D9115: copies: use dedicated `_revinfo_getter` function and call

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We want to return data in a different form, so we need different revinfo function. At that point it make sense to have different getter. REPOSITORY rHG

D9114: copies: make two version of the changeset centric algorithm

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY They are two main ways to run the changeset-centric copy-tracing algorithm. One fed from data stored in side-data and still in development, and one based on

D9113: copies: rename some function to the new naming scheme

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We are about to introduce more function and more variants, it seems better to align everything on the new scheme, allowing `_` for clarify. We do this aligned

D9112: changing-files: cache the various property

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We are going to start using them more having some basic caching would be good. The focus is not about performance yet, however avoid some easy N² trap seems

D9111: changing-files: always use `mark_touched` to update the touched set

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We use this function internally too because that will make cache invalidation simpler. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

mercurial@45558: new changeset

New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/80bf7b1ada15 changeset: 45558:80bf7b1ada15 bookmark:@ tag: tip user:Raphaël Gomès date:Fri Jul 24 16:35:02 2020 +0200 summary: rust-dirstatemap: add #[timed] to dirstatemap read for comparison

D9110: updaterepo: add deprecation warning

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We just moved all in-tree callers off of the function, but we're leaving it here for a bit to help extension writers. REPOSITORY rHG Mercurial BRANCH

D9109: rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9109 AFFECTED FILES rust/rhg/src/commands/cat.rs CHANGE DETAILS diff --git

D9108: hg-core: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9108 AFFECTED FILES rust/hg-core/src/operations/list_tracked_files.rs

Improving the CI experience

Hi all, As you may know, we (Octobus) and other Mercurial contributors have been using the Heptapod [1] CI to vet our patches pre-submission against 7 variants of Mercurial: - Python 2 pure - Python 3 pure - Python 2 python+c - Python 3 python+c - Python 2 rust+c - Python 3 rust+c - Python 2

D9107: hg-core: return Err if `offset != bytes.len()` (D8958#inline-14994 followup 2/2)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY [X] make `Index` owner of its bytes [X] make `Index::new` return an error if `offset != bytes.len()` REPOSITORY rHG Mercurial BRANCH default REVISION

D9106: hg-core: make `Index` owner of its bytes (D8958#inline-14994 followup 1/2)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Prevent building `Index` every time it is needed. It was a bad idea anyway. When `Index::new` will return `Result` it will avoid things like `Revlog::len`

D9105: hg-core: renaming of `Chunk` offset methods (D8958#inline-15002 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9105 AFFECTED FILES rust/hg-core/src/revlog/patch.rs CHANGE DETAILS diff --git

D9104: hg-core: minor rewording in docstring (D8958#inline-15005 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9104 AFFECTED FILES rust/hg-core/src/revlog/patch.rs CHANGE DETAILS diff --git

D9103: hg-core: use anonymous lifetime for `impl Chunk` (D8958#inline-15003 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9103 AFFECTED FILES rust/hg-core/src/revlog/patch.rs CHANGE DETAILS diff --git

D9102: hg-core: use `u32` instead of `i32` in `Chunk` (D8958#inline-15001 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9102 AFFECTED FILES rust/hg-core/src/revlog/patch.rs CHANGE DETAILS diff --git

D9101: hg-core: use the term `chunk` instead of `frag` (D8958#inline-15000 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9101 AFFECTED FILES rust/hg-core/src/revlog/patch.rs CHANGE DETAILS diff --git

D9100: hg-core: return `Err` on decompression error (D8958#inline-15004 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9100 AFFECTED FILES rust/hg-core/src/revlog/revlog.rs CHANGE DETAILS diff --git

D9099: hg-core: remove useless code (D8958#inline-14988 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9099 AFFECTED FILES rust/hg-core/src/revlog/patch.rs CHANGE DETAILS diff --git

D9098: hg-core: avoid memory allocation (D8958#inline-14990 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9098 AFFECTED FILES rust/hg-core/src/revlog/index.rs CHANGE DETAILS diff --git

D9097: hg-core: minor docstring update (D8958#inline-14991 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9097 AFFECTED FILES rust/hg-core/src/revlog/index.rs CHANGE DETAILS diff --git

D9096: hg-core: minor code style change (D8958#inline-14986 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9096 AFFECTED FILES rust/hg-core/src/revlog/index.rs CHANGE DETAILS diff --git

D9095: hg-core: Explain offset override of first revision (D8958#inline-14992 followup)

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9095 AFFECTED FILES rust/hg-core/src/revlog/index.rs CHANGE DETAILS diff --git

D9094: rust: clippy pass

Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This removes some justified warnings and one hard error that, while technically not a bug, was an ugly oversight on my part. REPOSITORY rHG Mercurial

Re: [PATCH 1 of 9 V3] configitems: add a new config option to control new filenode functionality

On Mon, 28 Sep 2020 11:59:13 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1600074083 -19800 > # Mon Sep 14 14:31:23 2020 +0530 > # Node ID a8107f2bdcebc9171d262764e74ac378e97f3da2 > # Parent f9a3edf2dee4f7699967c226b882a98957e0 >

D9093: rust: format with rustfmt

Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I suppose I ran the formatter on the tip but not on every patch. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

[Bug 6413] New: last() revset function can be a bit unpredictable

https://bz.mercurial-scm.org/show_bug.cgi?id=6413 Bug ID: 6413 Summary: last() revset function can be a bit unpredictable Product: Mercurial Version: 5.0.2 Hardware: PC OS: Windows Status: UNCONFIRMED

[PATCH 9 of 9 V3] merge: store cases when a file is absent post merge in commitinfo

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598263534 -19800 # Mon Aug 24 15:35:34 2020 +0530 # Node ID bf27967e594db17b8a3ba8dd1176ebcbc82d7692 # Parent 7d9a56694564c64b4ebeee2bb550d9c0a8494157 # EXP-Topic merge-newnode-final merge: store cases when a file is

[PATCH 8 of 9 V3] tests: add some more debugmergestate calls in `test-merge-criss-cross.t`

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600076295 -19800 # Mon Sep 14 15:08:15 2020 +0530 # Node ID 7d9a56694564c64b4ebeee2bb550d9c0a8494157 # Parent 2f889f4c2df053d4bb9e7bd1ae22540b6bdf26c7 # EXP-Topic merge-newnode-final tests: add some more debugmergestate

[PATCH 7 of 9 V3] commit: force create a new filenode if it was set in mergestate by merge

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599121694 -19800 # Thu Sep 03 13:58:14 2020 +0530 # Node ID 2f889f4c2df053d4bb9e7bd1ae22540b6bdf26c7 # Parent f4ddcee9c8e9de18897f8775cf65d5907e1bc6a9 # EXP-Topic merge-newnode-final commit: force create a new filenode

[PATCH 6 of 9 V3] merge: store commitinfo if these is a dc or cd conflict

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599120846 -19800 # Thu Sep 03 13:44:06 2020 +0530 # Node ID f4ddcee9c8e9de18897f8775cf65d5907e1bc6a9 # Parent f8e3bc0c10b22350994af28e86b11ae34ff04fc4 # EXP-Topic merge-newnode-final merge: store commitinfo if these is a

[PATCH 4 of 9 V3] tests: add some debugmergestate calls in `test-merge-criss-cross.t`

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600072905 -19800 # Mon Sep 14 14:11:45 2020 +0530 # Node ID b3bee7c363ff2c24ad2bf48359f300c7e9026aca # Parent 028e2b97c7ae12a432364875a1fc4e9143d6f1de # EXP-Topic merge-newnode-final tests: add some debugmergestate calls

[PATCH 5 of 9 V3] mergestate: update _stateextras instead of reassinging

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1601022485 -19800 # Fri Sep 25 13:58:05 2020 +0530 # Node ID f8e3bc0c10b22350994af28e86b11ae34ff04fc4 # Parent b3bee7c363ff2c24ad2bf48359f300c7e9026aca # EXP-Topic merge-newnode-final mergestate: update _stateextras

[PATCH 3 of 9 V3] tests: add few debugrevlogindex and a log call to see changes in next test

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1599121486 -19800 # Thu Sep 03 13:54:46 2020 +0530 # Node ID 028e2b97c7ae12a432364875a1fc4e9143d6f1de # Parent 816dff4f80b66039ae155e9a593be897390813e0 # EXP-Topic merge-newnode-final tests: add few debugrevlogindex and a

[PATCH 2 of 9 V3] merge: disable `m2-vs-ma` optimization if new filenode config is true

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600074612 -19800 # Mon Sep 14 14:40:12 2020 +0530 # Node ID 816dff4f80b66039ae155e9a593be897390813e0 # Parent a8107f2bdcebc9171d262764e74ac378e97f3da2 # EXP-Topic merge-newnode-final merge: disable `m2-vs-ma`

[PATCH 1 of 9 V3] configitems: add a new config option to control new filenode functionality

# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1600074083 -19800 # Mon Sep 14 14:31:23 2020 +0530 # Node ID a8107f2bdcebc9171d262764e74ac378e97f3da2 # Parent f9a3edf2dee4f7699967c226b882a98957e0 # EXP-Topic merge-newnode-final configitems: add a new config option