Fri, 12 Feb 2021 16:05:02 -0800 rebase: calculate obsolescense-related info earlier
Martin von Zweigbergk <martinvonz@google.com> [Fri, 12 Feb 2021 16:05:02 -0800] rev 46832
rebase: calculate obsolescense-related info earlier My goal is to use `rewriteutil.precheck()` in the rebase code. Since rebase does its own handling of divergent commits (it skips them instead of erroring out), we need to have divergence-causing commits filtered out early. This patch helps prepare for that. Differential Revision: https://phab.mercurial-scm.org/D10247
Fri, 12 Feb 2021 16:19:33 -0800 rebase: let _handleskippingobsolete(self) read directly from self
Martin von Zweigbergk <martinvonz@google.com> [Fri, 12 Feb 2021 16:19:33 -0800] rev 46831
rebase: let _handleskippingobsolete(self) read directly from self The function already has `self` as an argument, so there's no need to pass data from `self` into it. Differential Revision: https://phab.mercurial-scm.org/D10246
Tue, 23 Mar 2021 10:12:58 -0700 tests: test divergence created during interrupted rebase
Martin von Zweigbergk <martinvonz@google.com> [Tue, 23 Mar 2021 10:12:58 -0700] rev 46830
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256
Tue, 23 Mar 2021 09:13:29 -0700 tests: split up test-rebase-obsolete.t in four pieces
Martin von Zweigbergk <martinvonz@google.com> [Tue, 23 Mar 2021 09:13:29 -0700] rev 46829
tests: split up test-rebase-obsolete.t in four pieces The test case took 42 seconds to run the test before this patch and 12 seconds after (wall time, of course). Differential Revision: https://phab.mercurial-scm.org/D10255
Wed, 24 Mar 2021 00:04:58 +0100 path: error out if the `path://` reference point to an unknown path
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 24 Mar 2021 00:04:58 +0100] rev 46828
path: error out if the `path://` reference point to an unknown path Differential Revision: https://phab.mercurial-scm.org/D10265
Tue, 23 Mar 2021 23:55:33 +0100 path: forbid chaining `path://` definitions
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 23 Mar 2021 23:55:33 +0100] rev 46827
path: forbid chaining `path://` definitions To have `path://xxx` referencing paths that use `path://` too, we need to analyze dependencies to initialize them in the right order (and to detect cycle). I don't want to deal with that right now, so I just disallow it for now. Differential Revision: https://phab.mercurial-scm.org/D10264
Thu, 18 Mar 2021 12:02:01 +0100 path: introduce a `path://` syntax to reference other path name
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 18 Mar 2021 12:02:01 +0100] rev 46826
path: introduce a `path://` syntax to reference other path name This make it easier for a path to reuse the same location of another path with different parameter. This is useful to create path "alias" with common config option. This will become very useful to create path that reference a list of other path. This changeset focus on implemented the basic feature, future changesets will deal with various error management (and associated testing). Differential Revision: https://phab.mercurial-scm.org/D10263
Sun, 21 Mar 2021 16:31:42 +0100 path: extract sub-option logic into its own method
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 21 Mar 2021 16:31:42 +0100] rev 46825
path: extract sub-option logic into its own method We will need to re-use this logic for `path://` so we first extract it into its own method. Differential Revision: https://phab.mercurial-scm.org/D10262
Sun, 21 Mar 2021 17:52:15 +0100 path: extract the path validation logic into its own submethod
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 21 Mar 2021 17:52:15 +0100] rev 46824
path: extract the path validation logic into its own submethod We will need to re-use this logic for `path://` so we first extract it into its own method. Differential Revision: https://phab.mercurial-scm.org/D10261
Thu, 18 Mar 2021 10:12:55 +0100 path: move handling of "default" (*) suboptions value inside __init__
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 18 Mar 2021 10:12:55 +0100] rev 46823
path: move handling of "default" (*) suboptions value inside __init__ With the introduction of `path://` scheme the handling of default value will need to be subtler. We do simple code movement first to clarify the future changes. Differential Revision: https://phab.mercurial-scm.org/D10260
(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 tip