Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.0 on 2022-01-18 at 14:00 UTC+1 (a few minutes of down time)

mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)

Storing that a file is resolved for the other parent while merging is just one
case of things we will like to store in the mergestate. There are more which we
will like to store.

This patch replaces `addmergedother()` with a much more generic
`addcommitinfo()`. Doing this, we also blinding stores the same key value pair
generated by the merge code instead of touching them.

Differential Revision: https://phab.mercurial-scm.org/D8923
11 jobs for topic/default/merge-refactor in 25 minutes and 42 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
passed checks-py2 #90371

00:03:32

passed checks-py3 #90372

00:03:10

passed rust-cargo-test-py2 #90373

00:02:08

passed rust-cargo-test-py3 #90374

00:02:11

passed test-py2 #90375

00:24:14

passed test-py2-chg #90381

00:18:20

passed test-py2-pure #90377

00:18:25

passed test-py2-rust #90379

00:25:40

failed test-py3 #90376

00:20:15

passed test-py3-pure #90378

00:15:52

failed test-py3-rust #90380

00:21:33

 
Name Stage Failure
failed
test-py3-rust Test
Skipped test-sqlitestore.t: missing feature: sqlite3 module is available
Skipped test-verify-repo-operations.py: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-wireproto-exchangev2-shallow.t: missing feature: sqlite3 module is available
Failed test-check-py3-compat.t: output changed
# Ran 869 tests, 60 skipped, 1 failed.
python hash seed: 1440330342
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1
failed
test-py3 Test
Skipped test-sqlitestore.t: missing feature: sqlite3 module is available
Skipped test-verify-repo-operations.py: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-wireproto-exchangev2-shallow.t: missing feature: sqlite3 module is available
Failed test-check-py3-compat.t: output changed
# Ran 868 tests, 61 skipped, 1 failed.
python hash seed: 4007008883
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1