RFR: 2312: Do not require re-review for a simple merge [v2]

Pavel Rappo prappo at openjdk.org
Tue Jul 9 09:40:16 UTC 2024


On Tue, 9 Jul 2024 00:08:12 GMT, Zhao Song <zsong at openjdk.org> wrote:

>> If we add this method to `ReadOnlyRepository`, then we'll need to provide some implementation of it for `HgRepository`, which is a subclass of `ReadOnlyRepository`. Not only does `HgRepository` need no such functionality (AFAIK, PRs are not modelled to work in Mercurial repos), a Mercurial implementation will likely be more involved than that of Git.
>
> Yes, for `HgRepository`,  you just need to put `throw new UnsupportedOperationException();` in the implementation

Here's what I'm going to do:

  - pull up new `Commits commits(List<Hash> reachableFrom, List<Hash> unreachableFrom)` to `ReadOnlyRepository`,
  - pull up `boolean isRemergeDiffEmpty(Hash mergeCommitHash)` to `Repository`.

`isRemergeDiffEmpty` is not a good fit for `ReadOnlyRepository` as far as I understand it. Additionally, if in the future we decide to implement `--remerge-diff` manually, for whatever reason, it'll be even less fit.

-------------

PR Review Comment: https://git.openjdk.org/skara/pull/1672#discussion_r1670140743


More information about the skara-dev mailing list