D11885: filemerge: stop returning always-`True` value

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Now that we've removed some more leftovers from "merge driver", it's clear that the first element of `filemerge()`'s return value is always `True`.

D11887: simplemerge: make `localorother` a "mode" instead of a separate thing

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `simplemerge()` takes a `mode` argument, which can be "union", "merge" or "mergediff", and a `localorother` argument, which can be `None`, "local", or

D11886: simplemerge: avoid a call to `pycompat.strkwargs()`

martinvonz 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/D11886 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git

D11883: directaccess: fix uses of commands.status() that don't go through flag parsing

spectral created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY When `commands.commit.post-status` is enabled, after commit/amend, commands.status() is called without any revs argument, which means that status gets None

D11884: status: when extracting arguments from `opts`, use the same default values

spectral created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Sometimes other code, such as commit when using `commands.commit.post-status`, calls `commands.status()` without going through the normal dispatch mechanism

mercurial-devel | Failed pipeline for branch/stable | 27ed4da6

Pipeline #29981 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/stable ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/stable ) Commit: 27ed4da6 (

D11882: rhg: fix a crash on non-generaldelta revlogs

aalekseyev created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D11882 AFFECTED FILES rust/hg-core/src/revlog/index.rs

D11881: rhg: centralize index header parsing

aalekseyev created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Centralize index header parsing, parse the generaldelta flag, and leave breadcrumbs to relate the code to python. REPOSITORY rHG Mercurial BRANCH

D11880: rhg: demonstrate that rhg breaks on non-generaldelta revlogs

aalekseyev created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D11880 AFFECTED FILES tests/test-rhg-no-generaldelta.t CHANGE DETAILS diff

mercurial-devel | Failed pipeline for branch/stable | 195e669a

Pipeline #29976 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/stable ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/stable ) Commit: 195e669a (

mercurial-devel | Failed pipeline for branch/default | c8d767db

Pipeline #29970 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: c8d767db (

mercurial-devel | Failed pipeline for branch/default | e659aaf3

Pipeline #29973 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: e659aaf3 (

D11878: filemerge: remove unused `orig` argument from tool functions

martinvonz 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/D11878 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git

D11879: simplemerge: stop merging file flags

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY As 384df4db6520 (merge: merge file flags together with file content,

D11877: filemerge: stop passing around 3 unused `None` values in `files` argument

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Since 67cfffbfb6a0 (filemerge: eliminate most uses of tempfiles, 2017-08-31),

D11876: filemerge: rename backup variables from `back` to `backup`

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `backup` seems like an obviously clearer name for something containing something related to a backup. REPOSITORY rHG Mercurial BRANCH default REVISION

mercurial-devel | Failed pipeline for branch/default | c8d767db

Pipeline #29970 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: c8d767db (

mercurial-devel | Failed pipeline for branch/default | ebcdc1f8

Pipeline #29969 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: ebcdc1f8 (

mercurial-devel | Failed pipeline for branch/stable | 40e53390

Pipeline #29965 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/stable ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/stable ) Commit: 40e53390 (

D11875: fsmonitor: fix criteria for nonnormalset computation

Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY ... oops. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D11875 AFFECTED FILES hgext/fsmonitor/__init__.py

D11874: rhg: support the new extension suboptions syntax

Alphare created this revision. Alphare added a comment. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. Pending CI refresh REVISION SUMMARY See inline comments REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D11873: upgrade: don't use `dd status=none` in the test

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This breaks on Windows, so lets use `>2 /dev/null` like in the other tests. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL

D11871: upgrade: only process revlogs that needs it by default

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We have more and more requirement that does not affect revlog or that only affect some of them. It is silly to force a full processing of all revlog to juste

D11872: upgrade: drop some dead code

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Everything done by this block is now done by earlier code. So we don't need it anymore. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D11870: upgrade: issue a message when a revlog type has to be upgraded

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is more explicite and prepare for a smoother transition to smarter picking of the revlog we will process. REPOSITORY rHG Mercurial BRANCH default

D11869: upgrade: explicitly warn when a `--no-xxx` flag is overwritten

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Some format upgrade/downgrades -needs- revlog to be recomputed. So we now detect that individually and warn when it contradict explicitly passed flag.

D11868: upgrade: make the list of explicitly specified revlog a dict

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This makes various logic simpler and will help making future patch clearer. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D11867: upgrade: move the revlog selection code longer down the chain

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We about about to make revlog section smarter. Moving the code around will make the next changesets clearer. REPOSITORY rHG Mercurial BRANCH default

D11866: dirstate-v2: fix upgrade on an empty repository

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This used to crash as the dirstate file does not exist in this case. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL

D11865: dirstate-v2: test upgrade without rust too

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY There is no reason to gate this anymore. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D11865 AFFECTED FILES

D11864: test-upgrade: narrow the `debugformat` call when upgrading to dirstate-v2

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make the test less noisy when new requirement are added. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL