mercurial-devel | Pipeline #17783 has failed for branch/stable | 5d468879
Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/stable ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/stable ) Commit: 5d468879 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/5d468879953dae34ef5a9a30048c1b81ae00bcd7 ) Commit Message: rust-status: honor matcher when using the dirst... Commit Author: Raphaël Gomès Pipeline #17783 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/17783 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 2 failed builds. Job #165288 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165288/raw ) Stage: tests Name: test-py2-chg Job #165289 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165289/raw ) Stage: tests Name: test-py3-chg -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial-devel | Pipeline #17784 has failed for branch/default | 62d38e52
Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default ) Commit: 62d38e52 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/62d38e527647ac3b5748869cf163dccc9cac1f54 ) Commit Message: changegroup: don't convert revisions to node fo... Commit Author: Jörg Sonnenberger ( https://foss.heptapod.net/joerg ) Pipeline #17784 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/17784 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 4 failed builds. Job #165299 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165299/raw ) Stage: tests Name: test-py2-rust Job #165297 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165297/raw ) Stage: tests Name: test-py2-pure Job #165295 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165295/raw ) Stage: tests Name: test-py2 Job #165301 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165301/raw ) Stage: tests Name: test-py2-chg -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@46487: 14 new changesets (3 on stable)
14 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/dd926ce1de28 changeset: 46474:dd926ce1de28 branch: stable parent: 46464:32da58916fd0 user:Pierre-Yves David date:Mon Jan 18 10:20:58 2021 +0100 summary: relnote: remove the reference to `debugstrip` https://www.mercurial-scm.org/repo/hg/rev/f0982c76ef1b changeset: 46475:f0982c76ef1b branch: stable user:Pierre-Yves David date:Wed Feb 10 00:11:46 2021 +0100 summary: cmdutil: add a missing byte prefix to string introduce in 976b26bdd0d8 https://www.mercurial-scm.org/repo/hg/rev/4f5e9a77ff7a changeset: 46476:4f5e9a77ff7a parent: 46473:d6e73351533b user:Pierre-Yves David date:Fri Jan 29 15:23:07 2021 +0100 summary: debugdiscovery: add flags to run discovery on subsets of the local repo https://www.mercurial-scm.org/repo/hg/rev/3c360ab2688d changeset: 46477:3c360ab2688d user:Martin von Zweigbergk date:Wed Feb 03 13:55:58 2021 -0800 summary: narrow: add --no-backup option for narrowing https://www.mercurial-scm.org/repo/hg/rev/db9e33beb0fb changeset: 46478:db9e33beb0fb user:Martin von Zweigbergk date:Wed Feb 03 23:23:56 2021 -0800 summary: bundle2: print "error:abort" message to stderr instead of stdout https://www.mercurial-scm.org/repo/hg/rev/c2435280ca63 changeset: 46479:c2435280ca63 user:Pierre-Yves David date:Tue Feb 02 07:02:25 2021 +0100 summary: copy-tracing: add a --compute flag to debugchangedfiles https://www.mercurial-scm.org/repo/hg/rev/05dd091dfa6a changeset: 46480:05dd091dfa6a user:Martin von Zweigbergk date:Tue Feb 09 09:37:39 2021 -0800 summary: wireprotopeer: clarify some variable names now that we allow snake_case https://www.mercurial-scm.org/repo/hg/rev/0d734c0ae1cf changeset: 46481:0d734c0ae1cf user:Simon Sapin date:Mon Feb 01 12:25:53 2021 +0100 summary: rust: replace read_whole_file with std::fs::read https://www.mercurial-scm.org/repo/hg/rev/39128182f04e changeset: 46482:39128182f04e user:Simon Sapin date:Mon Feb 01 13:32:00 2021 +0100 summary: rust: Remove unnecessary check for absolute path before joining https://www.mercurial-scm.org/repo/hg/rev/2845892dd489 changeset: 46483:2845892dd489 user:Simon Sapin date:Thu Feb 04 13:16:21 2021 +0100 summary: rust: Parse system and user configuration https://www.mercurial-scm.org/repo/hg/rev/a6e4e4650bac changeset: 46484:a6e4e4650bac user:Simon Sapin date:Thu Feb 04 13:17:55 2021 +0100 summary: rhg: Parse system and user configuration at program start https://www.mercurial-scm.org/repo/hg/rev/f031fe1c6ede changeset: 46485:f031fe1c6ede user:Simon Sapin date:Thu Feb 04 14:29:47 2021 +0100 summary: rhg: Abort based on config on share-safe mismatch https://www.mercurial-scm.org/repo/hg/rev/d7685105e504 changeset: 46486:d7685105e504 bookmark:@ user:Simon Sapin date:Thu Feb 04 15:04:53 2021 +0100 summary: rhg: Parse per-repository configuration https://www.mercurial-scm.org/repo/hg/rev/839cacdff919 changeset: 46487:839cacdff919 branch: stable tag: tip parent: 46475:f0982c76ef1b user:Pierre-Yves David date:Wed Feb 10 19:23:56 2021 +0100 summary: tweak-default: no longer enable the experimental return code -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial-devel | Pipeline #17785 has failed for branch/default | b43b4663
Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default ) Commit: b43b4663 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/b43b4663a3fad30d803d8bc380765c075af6e84a ) Commit Message: tests: add a comment in a test that will hopefu... Commit Author: Kyle Lippincott ( https://foss.heptapod.net/spectral ) Pipeline #17785 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/17785 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 4 failed builds. Job #165314 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165314/raw ) Stage: tests Name: test-py2-chg Job #165312 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165312/raw ) Stage: tests Name: test-py2-rust Job #165310 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165310/raw ) Stage: tests Name: test-py2-pure Job #165308 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165308/raw ) Stage: tests Name: test-py2 -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9983: packaging: add Provides: python3-mercurial and Homepage to debian package
spectral created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY There are other packages that depend on python3-mercurial, like debian's mercurial-git, so we should mark ourselves as providing it. I compared the control file we generate to the one that the debian maintainers generate, and noticed several differences: - the Homepage bit. I included this, because why not - a more robust Suggests list that includes a graphical merge tool - a more robust Breaks list - debian's Recommends openssh-client, we only Recommends ca-certificates - a split into `mercurial` and `mercurial-common` (and possibly others?) - a slightly different description REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9983 AFFECTED FILES contrib/packaging/debian/control CHANGE DETAILS diff --git a/contrib/packaging/debian/control b/contrib/packaging/debian/control --- a/contrib/packaging/debian/control +++ b/contrib/packaging/debian/control @@ -25,7 +25,9 @@ Suggests: wish Replaces: mercurial-common Breaks: mercurial-common +Provides: python3-mercurial Architecture: any +Homepage: https://www.mercurial-scm.org/ Description: fast, easy to use, distributed revision control tool. Mercurial is a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects. To: spectral, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@46489: 2 new changesets (2 on stable)
2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/40c8ae49561d changeset: 46488:40c8ae49561d branch: stable user:Raphaël Gomès date:Wed Feb 10 22:01:23 2021 +0100 summary: status: add test that shows that the Rust implementation has a bug https://www.mercurial-scm.org/repo/hg/rev/fb6eca7b8c63 changeset: 46489:fb6eca7b8c63 branch: stable tag: tip user:Raphaël Gomès date:Wed Feb 10 21:46:29 2021 +0100 summary: rust-status: honor matcher when using the dirstate-only fast-path (issue6483) -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9984: softstrip: move _bookmarkmovements() call to where it's needed
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The call to `_bookmarkmovements()` is unrelated to the backup, so let's move it after. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9984 AFFECTED FILES mercurial/repair.py CHANGE DETAILS diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -308,11 +308,11 @@ if not tostrip: return None -newbmtarget, updatebm = _bookmarkmovements(repo, tostrip) if backup: node = tostrip[0] backupfile = _createstripbackup(repo, tostrip, node, topic) +newbmtarget, updatebm = _bookmarkmovements(repo, tostrip) with repo.transaction(b'strip') as tr: phases.retractboundary(repo, tr, phases.archived, tostrip) bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9985: softstrip: fix a reference to an undefined variable
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `backupfile` wasn't defined if no backup was requested. Let's set it to `None` by default, which matches what regular `repair.strip()` does. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9985 AFFECTED FILES mercurial/repair.py CHANGE DETAILS diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -308,6 +308,7 @@ if not tostrip: return None +backupfile = None if backup: node = tostrip[0] backupfile = _createstripbackup(repo, tostrip, node, topic) To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: Which parts of Evolve can be upstreamed?
On Mon, Feb 8, 2021 at 11:28 PM Pierre-Yves David wrote: > > The short answer is: > > They are comment in multiple source files about their status and the > part that can be uptreamed. > > > For a longer answer I need to double check my notes. > On a general basis : > - The user facing command is the most "mutable" part that we will likely > keep experimenting for a while. Sure, they may always change a bit, but I think obslog and prune have been quite stable for a while. I know that the obslog output was changed quite a bit recently, but that change could have been done in core instead if it had been there. Maybe I'll start upstreaming the changes to rewriteutil.py that have been added in since the last attempt. Then I'll see if I can upstream the prune command. > - The latest upstreaming effort was around the stack concept that proved > itself central for providing a consistent UX around `hg evolve` in > distributed context. I would be happy to see it get to conclusion. > - The change to heads computation and checking is a good candidate for > upstreaming is all the logic live in core and they "wrapping" in the > extension are neither very clean nor performant I looked into that a bit. It seems it's used for some experimental.single-head-per-branch that I had never heard of. If that's correct, it doesn't seem that useful to me at least. If others care about that option, they can upstream that part. Correct me if I misunderstood what the "heads computation and checking" is about, of course. > > On 2/8/21 11:59 PM, Martin von Zweigbergk wrote: > > Hi, > > > > We have talked about upstreaming the Evolve extension for years and some > > of it has been upstreamed, but most of it remains. I think most of us > > agree that it would be good to have it upstreamed at some point. Are > > there some uncontroversial parts that I can start moving upstream? The > > obslog and prune commands seem like good candidates to me. What do you > > think? > > > > -- > Pierre-Yves David ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@46493: 4 new changesets (4 on stable)
4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/86b019899737 changeset: 46490:86b019899737 branch: stable user:Pierre-Yves David date:Wed Feb 10 21:05:05 2021 +0100 summary: hooks: forbid ':' in hook name https://www.mercurial-scm.org/repo/hg/rev/0760282995cf changeset: 46491:0760282995cf branch: stable user:Pierre-Yves David date:Wed Feb 10 22:43:16 2021 +0100 summary: hooks: add some test about HGPLAIN setting and hooks https://www.mercurial-scm.org/repo/hg/rev/7289eac777ec changeset: 46492:7289eac777ec branch: stable user:Pierre-Yves David date:Wed Feb 10 23:21:21 2021 +0100 summary: hooks: introduce a `:run-with-plain` option for hooks https://www.mercurial-scm.org/repo/hg/rev/b910be772eb9 changeset: 46493:b910be772eb9 branch: stable tag: tip user:Pierre-Yves David date:Wed Feb 10 23:03:54 2021 +0100 summary: hooks: add a `auto` value for `hooks.*run-with-plain` -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial-devel | Pipeline #17805 has failed for branch/default | 77c87239
Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default ) Commit: 77c87239 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/77c87239a56c89c4f9b55adf745150e7e37f9d7d ) Commit Message: tests: add a comment in a test that will hopefu... Commit Author: Kyle Lippincott ( https://foss.heptapod.net/spectral ) Pipeline #17805 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/17805 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 4 failed builds. Job #165460 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165460/raw ) Stage: tests Name: test-py2 Job #165464 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165464/raw ) Stage: tests Name: test-py2-rust Job #165462 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165462/raw ) Stage: tests Name: test-py2-pure Job #165466 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165466/raw ) Stage: tests Name: test-py2-chg -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial-devel | Pipeline #17806 has failed for branch/stable | d16cd421
Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/stable ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/stable ) Commit: d16cd421 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/d16cd4217f1d3b787205728146f049590fddc889 ) Commit Message: hooks: add a `auto` value for `hooks.*run-with-... Commit Author: Pierre-Yves David ( https://foss.heptapod.net/marmoute ) Pipeline #17806 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/17806 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 1 failed build. Job #165475 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/165475/raw ) Stage: tests Name: test-py2-pure -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
