Closed Bug 1593271 (hg52) Opened 3 years ago Closed 7 months ago

[meta] Mercurial 5.2 upgrade and compatibility

Categories

(Developer Services :: Mercurial: hg.mozilla.org, enhancement)

enhancement
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: sheehan, Assigned: sheehan)

References

Details

(Keywords: leave-open, meta)

Attachments

(3 files)

No description provided.
Blocks: 1593323

No major code changes required for compatibility with Mercurial 5.2,
however many tests have slightly changed output under the new Mercurial
version. Most of the changes come from changeset d7304434390f in upstream
Mercurial[1]. This changeset moves the line about added changes into the
transaction summary output. As a result, our pretxnchangegroup hook
output for the pushlog appears slightly earlier in the output. In some
other cases, the "added changes" line disappears as the transaction output
does not display when the transaction fails due to a hook or some other
reason, which is more correct behaviour in my opinion.

A few tests output changes are left out of this upgrade for now, specifically
tests with lots of output conditional on various versions of Mercurial.
Rather than tinker with updating the test output, I'm going to clean up
all those tests after the 5.2 upgrade on hg.mo is complete.

[1] https://mercurial-scm.org/repo/hg-committed/rev/d7304434390f

The function signature used in mercurial.changelog.changelog.add
changed between 5.1 and 5.2. Adding *args and **kwargs papers
over the issue.

Pushed by cosheehan@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/025a9255b998
hgext: mark extensions as 5.2 compatible and update various tests r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/45833ba5ee20
hghooks: fix `test-changelog-correctness.t` r=glob
Depends on: 1607956

This output now appears later, and has been updated in other tests
in changeset 025a9255b998b82f8.

Assignee: nobody → sheehan
Status: NEW → ASSIGNED
Blocks: hg53
Pushed by cosheehan@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/97bafa0e4e66
vcsreplicator/bootstrap: update output to reflect new order in Mercurial 5.2 r=mhentges
Status: ASSIGNED → RESOLVED
Closed: 7 months ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.