mercurial-devel merge requestshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests2021-10-15T11:04:57Zhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/93precheck: fix false warning about content-divergence creation2021-10-15T11:04:57ZSushil Khanchiprecheck: fix false warning about content-divergence creationBefore this patch, if we try to `hg prune` (without any successors) an
already obsoleted cset which has at least one successor, it would false
warn about new content-divergence. As we know pruning cset without any
successors can not crea...Before this patch, if we try to `hg prune` (without any successors) an
already obsoleted cset which has at least one successor, it would false
warn about new content-divergence. As we know pruning cset without any
successors can not create any divergence.Anton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/92test: remove `sleep` usage in `test-nointerrupt.t` (issue6271)2021-07-20T21:14:58ZPierre-Yves Davidtest: remove `sleep` usage in `test-nointerrupt.t` (issue6271)We move from sleep based synchronisation to file creation based synchronisation.
Sleeps is the path to the dark side.
Sleeps leads to flakiness.
Flakiness leads to anger.
Anger leads to hate.
Hate leads to suffering.
--HG--
branch : st...We move from sleep based synchronisation to file creation based synchronisation.
Sleeps is the path to the dark side.
Sleeps leads to flakiness.
Flakiness leads to anger.
Anger leads to hate.
Hate leads to suffering.
--HG--
branch : stablehttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/91Store Walk regression2021-07-20T12:06:03ZPierre-Yves DavidStore Walk regressionThis MR is here to track the testing and fixing of the regression introduced in (futur 5.9) regarding streamclone and upgrade for repository files starting with `undo.`This MR is here to track the testing and fixing of the regression introduced in (futur 5.9) regarding streamclone and upgrade for repository files starting with `undo.`Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/90largefile: synchronise the dirstate within a `parentchange` context2021-07-16T13:20:18ZPierre-Yves Davidlargefile: synchronise the dirstate within a `parentchange` contextSemantically these changes are made to adjust the dirstate after a commit, so it
should be in a `parentchange` context.Semantically these changes are made to adjust the dirstate after a commit, so it
should be in a `parentchange` context.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/89dirstate update file API2021-07-15T16:26:11ZPulkit Goyaldirstate update file APIAlso introduces another function so should be split.Also introduces another function so should be split.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/88dirstate: drop the last explicit `state` usage in the module2021-07-13T10:45:20ZPulkit Goyaldirstate: drop the last explicit `state` usage in the moduleThe internal detail of the `state` bytes is not longer exposed to the dirstate
layer.
Differential Revision: https://phab.mercurial-scm.org/D10977The internal detail of the `state` bytes is not longer exposed to the dirstate
layer.
Differential Revision: https://phab.mercurial-scm.org/D10977https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/87dirstate: add a basic update_file function2021-07-08T08:02:38ZPulkit Goyaldirstate: add a basic update_file functionhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/86test: drop an unnecessary mkdir2021-06-28T13:02:42ZPierre-Yves Davidtest: drop an unnecessary mkdirmut mutmut mutDan Villiom Podlaski Christiansendanchr@gmail.comDan Villiom Podlaski Christiansendanchr@gmail.comhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/85rhg review ready2021-10-11T18:17:47ZPulkit Goyalrhg review ready`rhg status` is experimental right now and does not support all functionalities.
While the long term target is to implement them, for now we add a fallback to
have all tests pass with `rhg status` enabled.
Differential Revision: https:/...`rhg status` is experimental right now and does not support all functionalities.
While the long term target is to implement them, for now we add a fallback to
have all tests pass with `rhg status` enabled.
Differential Revision: https://phab.mercurial-scm.org/D10906https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/84status relative rhg2021-06-25T09:33:21ZPulkit Goyalstatus relative rhg`rhg status` is experimental right now and does not support all functionalities.
While the long term target is to implement them, for now we add a fallback to
have all tests pass with `rhg status` enabled.
Differential Revision: https:/...`rhg status` is experimental right now and does not support all functionalities.
While the long term target is to implement them, for now we add a fallback to
have all tests pass with `rhg status` enabled.
Differential Revision: https://phab.mercurial-scm.org/D10906https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/83rhg: show warnings coming from ignore patterns2022-05-12T15:04:28ZPulkit Goyalrhg: show warnings coming from ignore patternshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/82exit code2021-06-11T07:30:09ZPulkit Goyalexit codeThis will help us in better handling of error caused when trying to
load `--config` values.
Differential Revision: https://phab.mercurial-scm.org/D10837This will help us in better handling of error caused when trying to
load `--config` values.
Differential Revision: https://phab.mercurial-scm.org/D10837https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/81Draft: sidedata: register copies sidedata computer regardless of the revlog v...2021-04-29T22:21:36ZPierre-Yves DavidDraft: sidedata: register copies sidedata computer regardless of the revlog versionRepositories should not gate their sidedata computers based on any requirement,
only their wanted sidedata. A repository might need to generate sidedata wanted
by the peer that it itself does not want.
Differential Revision: https://pha...Repositories should not gate their sidedata computers based on any requirement,
only their wanted sidedata. A repository might need to generate sidedata wanted
by the peer that it itself does not want.
Differential Revision: https://phab.mercurial-scm.org/D10340https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/80rhg: try read [paths] for `--repository` value2021-06-09T09:38:03ZPulkit Goyalrhg: try read [paths] for `--repository` valuehg parses -R and --repository CLI arguments "early" in order to know which
local repository to load config from. (Config can then affect whether or how to
fall back.)
The value of of those arguments can be not only a filesystem path, bu...hg parses -R and --repository CLI arguments "early" in order to know which
local repository to load config from. (Config can then affect whether or how to
fall back.)
The value of of those arguments can be not only a filesystem path, but also an
alias configured in the [paths] section. This part was missing in rhg and this
patch implements that.
The `#if no-rhg` is still not removed completely as those two `[paths]` are read
from `.hg/hgrc` of directory in which the command is running. That will be
implemented in the next patch.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/79rhg: add support for detailed exit code for ConfigParseError2021-03-25T21:42:30ZPulkit Goyalrhg: add support for detailed exit code for ConfigParseErrorThis patch adds basic support for detailed exit code to rhg with support for
ConfigParseError.
rhg right not does not seem to have all and same errors as core hg now which
makes sense since it only implements part of things.This patch adds basic support for detailed exit code to rhg with support for
ConfigParseError.
rhg right not does not seem to have all and same errors as core hg now which
makes sense since it only implements part of things.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/78Topic/default/fix chg2021-12-13T14:55:03ZJörg SonnenbergerTopic/default/fix chghttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/77Topic/default/merge filelog two parents2022-05-12T15:05:05ZPulkit GoyalTopic/default/merge filelog two parentshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/76commit: reorder if-else conditional to give mergestate info priority2021-03-22T18:42:24ZPulkit Goyalcommit: reorder if-else conditional to give mergestate info priorityLooking at the code now, I was unable to find a good reason as why we only rely
on mergestate extras info after checking whether a filelog parent is ancestor of
other or not.
I mean if we have stored in mergestate that `other` was chose...Looking at the code now, I was unable to find a good reason as why we only rely
on mergestate extras info after checking whether a filelog parent is ancestor of
other or not.
I mean if we have stored in mergestate that `other` was chosed, we should
blindly pick that one.
This cleanup will also help introduce more cases when both `fparent1` and
`fparent2` are non-null but using info from mergestate, we can fastpath.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/75exchange: stop advertising rev-branch-cache bundle capability2021-03-05T04:12:19ZJörg Sonnenbergerexchange: stop advertising rev-branch-cache bundle capabilitySince Mercurial 5.7, the corresponding bundle part is ignored as
redundant. Stop advertising it so that peers don't have to spend time
creating or transfering it.
Differential Revision: https://phab.mercurial-scm.org/D10114Since Mercurial 5.7, the corresponding bundle part is ignored as
redundant. Stop advertising it so that peers don't have to spend time
creating or transfering it.
Differential Revision: https://phab.mercurial-scm.org/D10114https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/74Topic/default/merge copies fix attempt2022-05-12T15:04:32ZPulkit GoyalTopic/default/merge copies fix attempt