Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 16:11:42 +0100] rev 48723
large-file: use the merge action constant
The constant exists, lets use them. Otherwise we cannot make these constant more
powerful.
Differential Revision: https://phab.mercurial-scm.org/D12112
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 16:41:45 +0100] rev 48722
merge: stop using merge action for pathconflict option
This is not the b'r' you are looking for.
Differential Revision: https://phab.mercurial-scm.org/D12111
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:51 +0100] rev 48721
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12110
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:45 +0100] rev 48720
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12109
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:39 +0100] rev 48719
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12108
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:32 +0100] rev 48718
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12107
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:05 +0100] rev 48717
merge: break up two not-so-one-liner for extra readability
Differential Revision: https://phab.mercurial-scm.org/D12106
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:24:41 +0100] rev 48716
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12105
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:24:30 +0100] rev 48715
merge: break up a not-so-one-liner for readability
(even if not fully satisfied this time)
Differential Revision: https://phab.mercurial-scm.org/D12104
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:23:56 +0100] rev 48714
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12103
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:23:49 +0100] rev 48713
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12102
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:23:37 +0100] rev 48712
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12101
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 03 Feb 2022 06:49:48 +0100] rev 48711
phabricator-refresh: add a magic value to skip it in the CI
When maintaining (light) fork, it is useful to be able to disable this.
Differential Revision: https://phab.mercurial-scm.org/D12133
Anton Shestakov <av6@dwimlabs.net> [Thu, 27 Jan 2022 20:04:56 +0300] rev 48710
interfaces: add missing caches kwarg of localrepo.updatecaches()
Added to localrepo: in 1337bfaa88ca, added to the interface: now.
Differential Revision: https://phab.mercurial-scm.org/D12092
Anton Shestakov <av6@dwimlabs.net> [Mon, 31 Jan 2022 18:05:36 +0300] rev 48709
obsolete: don't import from .node twice
See d55b71393907.
Differential Revision: https://phab.mercurial-scm.org/D12121
Anton Shestakov <av6@dwimlabs.net> [Mon, 31 Jan 2022 18:04:11 +0300] rev 48708
dagop: don't import nullrev from .node twice
See 59fa3890d40a.
Differential Revision: https://phab.mercurial-scm.org/D12120