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

martinvonz added a comment. In D7631#120777 , @marmoute wrote: > 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

D8269: tests: drop an extraneous (glob) from test-debugbackupbundle.t

mharbison72 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since this was not needed, it ends up causing the test to end with an error saying that the output changed, but with no diff and a message at the end saying

D8268: git: don't fail import when pygit2 is not install

Closed by commit rHGec54b3d2af0b: git: dont fail import when pygit2 is not install (authored by martinvonz). martinvonz marked an inline comment as done. This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state

D8172: notify: optional mail threading based on obsmarker

joerg.sonnenberger updated this revision to Diff 20648. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8172?vs=20350=20648 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8172/new/ REVISION DETAIL

D8267: hghave: add a check for pygit2

Closed by commit rHG2e464925f662: hghave: add a check for pygit2 (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 CHANGES SINCE LAST

D8268: git: don't fail import when pygit2 is not install

martinvonz added inline comments. martinvonz marked an inline comment as done. INLINE COMMENTS > mharbison72 wrote in __init__.py:95 > s/py2git2/pygit2/ ? Pip isn't finding the former for me. That was just a typo (a typo that I made many times while writing these two patches). REPOSITORY

D8268: git: don't fail import when pygit2 is not install

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

D8268: git: don't fail import when pygit2 is not install

mharbison72 added inline comments. INLINE COMMENTS > __init__.py:95 > +b'the git extension requires the Python ' > +b'py2git2 library to be installed' > +) s/py2git2/pygit2/ ? Pip isn't finding the former for me. REPOSITORY rHG Mercurial CHANGES

D8268: git: don't fail import when pygit2 is not install

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `test-duplicateoptions.py` was failing on py2 for be because I didn't have pygit2 installed. It failed because we depend on pygit2 at import time. This patch

D8267: hghave: add a check for pygit2

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This will make it easy to use availability of pygit2 as in conditions such as `#if pygit2` and `(pygit2 !)`. It also makes it a little clearer why the test

[Bug 6285] New: "hg unshelve -i" followed by "q" to abort still applies changes to the working directory

https://bz.mercurial-scm.org/show_bug.cgi?id=6285 Bug ID: 6285 Summary: "hg unshelve -i" followed by "q" to abort still applies changes to the working directory Product: Mercurial Version: 5.2 Hardware: PC

[PATCH 3 of 6 v3] setup-rust: add a --no-rust flag

# HG changeset patch # User Pierre-Yves David # Date 1583507190 -3600 # Fri Mar 06 16:06:30 2020 +0100 # Node ID 4094a983cfe6f59ddbec04c34a0070137911d6fa # Parent bbfdc8c2f3a2ac0f3c4921351614f4e134b0d46d # EXP-Topic rust-test-option # Available At

[PATCH 6 of 6 v3] heptapod-ci: use the new `--rust/--no-rust` flag to run the tests

# HG changeset patch # User Pierre-Yves David # Date 1583510570 -3600 # Fri Mar 06 17:02:50 2020 +0100 # Node ID 955e8b094c9bafe7d1abba3381539d05c9c06570 # Parent 5e7e2fecabbc0859174a1d09b092d3e0386ab458 # EXP-Topic rust-test-option # Available At

[PATCH 2 of 6 v3] cext: drop the WITH_RUST block

# HG changeset patch # User Pierre-Yves David # Date 1583771190 -3600 # Mon Mar 09 17:26:30 2020 +0100 # Node ID bbfdc8c2f3a2ac0f3c4921351614f4e134b0d46d # Parent 27e1e79c1a5ad9dfa699954aa68a4c0361d39f1b # EXP-Topic rust-test-option # Available At

[PATCH 5 of 6 v3] run-tests: add option for running with and without Rust extensions

# HG changeset patch # User Raphaël Gomès # Date 1583489775 -3600 # Fri Mar 06 11:16:15 2020 +0100 # Node ID 5e7e2fecabbc0859174a1d09b092d3e0386ab458 # Parent 7653a195e622714c5c2fc9232941d1bb224273aa # EXP-Topic rust-test-option # Available At

[PATCH 4 of 6 v3] run-tests: rename "pure" variable to setup_opts

# HG changeset patch # User Pierre-Yves David # Date 1583508290 -3600 # Fri Mar 06 16:24:50 2020 +0100 # Node ID 7653a195e622714c5c2fc9232941d1bb224273aa # Parent 4094a983cfe6f59ddbec04c34a0070137911d6fa # EXP-Topic rust-test-option # Available At

[PATCH 1 of 6 v3] setup: use printf instead of print

# HG changeset patch # User Pierre-Yves David # Date 1583770604 -3600 # Mon Mar 09 17:16:44 2020 +0100 # Node ID 27e1e79c1a5ad9dfa699954aa68a4c0361d39f1b # Parent b4fe3395b975d72c56f392fa671f86c3ccd1a892 # EXP-Topic rust-test-option # Available At

mercurial@44451: 19 new changesets (2 on stable)

19 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/f82d2d4e71db changeset: 44433:f82d2d4e71db parent: 44427:4ce2330f2d0b user:Pulkit Goyal <7895pul...@gmail.com> date:Fri Jan 17 21:22:23 2020 +0300 summary: debugbackupbundle:

D7932: debugbackupbundle: introduce command to interact with strip backups

martinvonz added a comment. I know this has already been queue and I'm just slow, but could you send follow-up patches to address my comments? INLINE COMMENTS > debugcommands.py:3416 > +] > ++ cmdutil.logopts, > +_(b"hg debugbackupbundle [--recover HASH]"), Do we really want to

D8254: nodemap: fix missing r-prefix on regular expression

martinvonz added a comment. In D8254#123111 , @marmoute wrote: > In D8254#123110 , @martinvonz wrote: > >> In D8254#123109 , @marmoute wrote: >>

D8254: nodemap: fix missing r-prefix on regular expression

marmoute added a comment. In D8254#123110 , @martinvonz wrote: > In D8254#123109 , @marmoute wrote: > >> In D8254#122981 , @martinvonz wrote: >>

Re: [PATCH stable] tests: fix isinstance test of wrong variable

On Mon, 09 Mar 2020 01:13:20 +0100, Manuel Jacob wrote: > # HG changeset patch > # User Manuel Jacob > # Date 1583712719 -3600 > # Mon Mar 09 01:11:59 2020 +0100 > # Node ID 1320093a99dc1a1ed796b230dd2f1b87ea045eac > # Parent ae4272a4f77c327ff08d48d50460d573fe003757 > # EXP-Topic

D8254: nodemap: fix missing r-prefix on regular expression

martinvonz added a comment. In D8254#123109 , @marmoute wrote: > In D8254#122981 , @martinvonz wrote: > >> In D8254#122978 , @marmoute wrote: >>

Re: [PATCH] tests: use native string type for parsed hghave log lines

On Mon, 09 Mar 2020 05:28:56 +0100, Manuel Jacob wrote: > # HG changeset patch > # User Manuel Jacob > # Date 1583727542 -3600 > # Mon Mar 09 05:19:02 2020 +0100 > # Node ID 0fda94caf796adac51a105ae2f39c057b37cf183 > # Parent 1320093a99dc1a1ed796b230dd2f1b87ea045eac > # EXP-Topic

Re: [PATCH] tests: avoid implicit bytes -> unicode -> bytes roundtrip on Python 2

On Mon, 09 Mar 2020 01:17:22 +0100, Manuel Jacob wrote: > # HG changeset patch > # User Manuel Jacob > # Date 1583486858 -3600 > # Fri Mar 06 10:27:38 2020 +0100 > # Node ID ae4272a4f77c327ff08d48d50460d573fe003757 > # Parent 2b5c4788d7f0aaf56775c0a2a032727255367c6c > # EXP-Topic

Re: [PATCH] tests: use pyflakes module instead of pyflakes executable

On Sun, 08 Mar 2020 23:26:44 +0100, Manuel Jacob wrote: > On 2020-03-08 06:24, Yuya Nishihara wrote: > > On Fri, 06 Mar 2020 23:05:06 +0100, Manuel Jacob wrote: > >> # HG changeset patch > >> # User Manuel Jacob > >> # Date 1583532298 -3600 > >> # Fri Mar 06 23:04:58 2020 +0100 > >> # Node

Re: [PATCH 3 of 6 V2] setup-rust: add a --no-rust flag

On Sun, 08 Mar 2020 22:06:54 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1583507190 -3600 > # Fri Mar 06 16:06:30 2020 +0100 > # Node ID 5736e8d4a0d8bdbecb8dfd0572233e47c27784f5 > # Parent b6ea7a94cdaea348eff4bc232a732e24f43469a8 > # EXP-Topic

Re: [PATCH 1 of 6 V2] setup-rust: remove the legacy 'direct-ffi' variant

On Sun, 08 Mar 2020 22:06:52 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1583509786 -3600 > # Fri Mar 06 16:49:46 2020 +0100 > # Node ID ac97907dc3f16b039213f54adb37d0a5b04eaf9b > # Parent c8fd21413458cec4537f3906cdb87f3c9ebe3367 > # EXP-Topic

Re: Mercurial shirts

On 2020-03-09 09:52, Raphaël Gomès wrote: Hello all, What do you think about printing some amount of Mercurial shirts to distribute at sprints and events for contributors and sympathizers? The 5.4 sprint is jeopardized at best, but this would be useful for later events. I personally had no

D8254: nodemap: fix missing r-prefix on regular expression

marmoute added a comment. In D8254#122981 , @martinvonz wrote: > In D8254#122978 , @marmoute wrote: > >> Good catch, look good to me. Can we drop the `skip-blame just adding a missing

D8259: discovery: avoid wrong detection of multiple branch heads (issue6256)

Closed by commit rHG7d5455b988ec: discovery: avoid wrong detection of multiple branch heads (issue6256) (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8248: debuginstall: print if Rust extensions are installed

Closed by commit rHG69935d41ada4: debuginstall: print if Rust extensions are installed (authored by Alphare). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D8248?vs=20568=20618#toc REPOSITORY rHG Mercurial

D8266: localrepo: add git extension to autoextensions list

Closed by commit rHG8407f8678a77: localrepo: add git extension to autoextensions list (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8266?vs=20615=20622

D8162: hghave: add a `rust` keyword to detect the use of compiled rust code

Closed by commit rHGd4689494c436: hghave: add a `rust` keyword to detect the use of compiled rust code (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8180: nodemap: check that a simple lookup works fine

Closed by commit rHGb4e098628646: nodemap: check that a simple lookup works fine (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8180?vs=20382=20623 CHANGES

D8264: gitlog: implement __iter__ on changelog

Closed by commit rHG3e5293769f22: gitlog: implement __iter__ on changelog (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8264?vs=20613=20621 CHANGES SINCE

D8263: gitlog: fix embarassing bug that prevented log from showing correct parents

Closed by commit rHG559e31eabc3d: gitlog: fix embarassing bug that prevented log from showing correct parents (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D8262: git: add readfast() method to manifest

Closed by commit rHGff465d38cf45: git: add readfast() method to manifest (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8262?vs=20611=20619 CHANGES SINCE

D8254: nodemap: fix missing r-prefix on regular expression

Closed by commit rHG50b570f04abb: nodemap: fix missing r-prefix on regular expression (authored by durin42). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8254?vs=20569=20617

D8256: git: make {shortest()} return shortest *unique* prefix

Closed by commit rHGbd539f0a3771: git: make {shortest()} return shortest *unique* prefix (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/D8256?vs=20575=20616

D8248: debuginstall: print if Rust extensions are installed

pulkit added a comment. and the following too to make `test-check-format.t` happy. diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1510,6 +1510,7 @@ def debuginstall(ui, **opts):

D8248: debuginstall: print if Rust extensions are installed

pulkit added a comment. Amended the following to make `test-check-module-imports.t` happy. diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1509,7 +1509,7 @@ def debuginstall(ui,

D8260: git: hide pygit2 imports from gendoc and other scripts not using demandimport

This revision now requires changes to proceed. pulkit added a comment. pulkit requested changes to this revision. `test-duplicateoptions.py` is failing with this patch. I dropped this from my push list, stripping the patch was resulting in complex state for me, so I used prune, kindly use

D8172: notify: optional mail threading based on obsmarker

pulkit added a comment. The code looks good. Since the whole obsmarker thing is experimental, the config option here should be made experimental too. Also, can you add tests when the config is set and `--in-reply-to` flag is also used and add info about that behavior in commit message?

D7922: rust-matchers: add function to generate a regex matcher function

pulkit added a comment. @martinvonz this seems accepted by you and Augie. Should I go ahead and push it or I missed some discussion on IRC about it? REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7922/new/ REVISION DETAIL

D8262: git: add readfast() method to manifest

This revision is now accepted and ready to land. pulkit added a comment. pulkit accepted this revision. Looks like we should test the interfaces. REPOSITORY rHG Mercurial BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8262/new/ REVISION DETAIL

D8261: git: hack around import checker being confused about the provenance of pygit2

pulkit added inline comments. INLINE COMMENTS > index.py:19 > +try: > +import pygit2 > +except ImportError: IIUC, we should access some attribute to trigger demandimport. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8261/new/ REVISION DETAIL

Mercurial shirts

Hello all, What do you think about printing some amount of Mercurial shirts to distribute at sprints and events for contributors and sympathizers? The 5.4 sprint is jeopardized at best, but this would be useful for later events. I personally had no Mercurial shirt/hoodie to show up in at