Page MenuHomePhabricator

shelve: add method for storing mergestate in changeset extras
Needs ReviewPublic

Authored by navaneeth.suresh on Oct 4 2019, 4:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

We store mergestate records in .hg/merge. This patch adds a method
of storage in changeset extras. This will help in the exchange of
mergestate records to other repos. Also, this can be used by
shelve --unresolved to store the mergestate records.

It uses the storage format supported for hg versions 3.7 or later. For the
time being, I have omitted the storage of the content of the local version

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz added inline comments.
mercurial/shelve.py
61

Seems unused

73–112

Most of these seem unused. I would prefer if they were added in a later patch where they are used

475

need a r'' prefix here for py3?

476

''.join(a,b) can be written more simply as a + b

478

This seems surprising in this method. Consider moving it out.

navaneeth.suresh edited the summary of this revision. (Show Details)Oct 5 2019, 9:52 AM
navaneeth.suresh updated this revision to Diff 16813.
navaneeth.suresh marked 5 inline comments as done.Oct 5 2019, 9:53 AM