This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6736

shelve: add method for storing mergestate in changeset extras
AbandonedPublic

Authored by navaneeth.suresh on Aug 17 2019, 4:38 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
of unresolved files.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Aug 19 2019, 11:06 AM
pulkit added inline comments.
mercurial/shelve.py
416

What do you think about refactoring the code to write mergestate v2 on disk and use that encoding to achieve this?

navaneeth.suresh added inline comments.Aug 20 2019, 9:23 AM
mercurial/shelve.py
416

i feel like the current approach is more simpler and easy to understand.

pulkit added inline comments.Sep 12 2019, 1:46 AM
mercurial/shelve.py
416

It will be nice to use only way to encode mergestates at all the places.

navaneeth.suresh added inline comments.Oct 4 2019, 4:48 PM
mercurial/shelve.py
416

Done and created D6966. Abandoning this.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (30 lines)

Diff 16252

mercurial/shelve.py

info = {'node': nodemod.hex(node)} info = {'node': nodemod.hex(node)}
shelvedfile(repo, name, 'shelve').writeinfo(info) shelvedfile(repo, name, 'shelve').writeinfo(info)
bases = list(mutableancestors(repo[node])) bases = list(mutableancestors(repo[node]))
shelvedfile(repo, name, 'hg').writebundle(bases, node) shelvedfile(repo, name, 'hg').writebundle(bases, node)
with shelvedfile(repo, name, patchextension).opener('wb') as fp: with shelvedfile(repo, name, patchextension).opener('wb') as fp:
cmdutil.exportfile(repo, [node], fp, opts=mdiff.diffopts(git=True), cmdutil.exportfile(repo, [node], fp, opts=mdiff.diffopts(git=True),
match=match) match=match)
def _encodemergerecords(records):
pulkitUnsubmitted
Not Done

What do you think about refactoring the code to write mergestate v2 on disk and use that encoding to achieve this?

pulkit: What do you think about refactoring the code to write mergestate v2 on disk and use that…
navaneeth.sureshAuthorUnsubmitted
Not Done

i feel like the current approach is more simpler and easy to understand.

navaneeth.suresh: i feel like the current approach is more simpler and easy to understand.
pulkitUnsubmitted
Not Done

It will be nice to use only way to encode mergestates at all the places.

pulkit: It will be nice to use only way to encode mergestates at all the places.
navaneeth.sureshAuthorUnsubmitted
Done

Done and created D6966. Abandoning this.

navaneeth.suresh: Done and created D6966. Abandoning this.
"""Encode mergestate records to store in changeset extras.
Takes list of tuples as input and returns str.
"""
items = [
'%s\033%s' % (rtype, record)
for rtype, record in sorted(records)
]
return "\n".join(items)
def _decodemergerecords(data):
"""Decode mergestate record from changeset extras to return
a list of tuples.
"""
records = []
for l in data.split('\n'):
rtype, record = l.split('\033')
records.append((rtype, record))
return records
def _storeunresolvedmerge(ui, repo, name=None, extra=None):
"""Store the mergestate information in changeset extra
This will clear the mergestate and also stores the mergestate
information for later restoration.
"""
ms = merge.mergestate.read(repo)
extra['mergerecords'] = _encodemergerecords(ms._readrecords())
ms.reset()
def _includeunknownfiles(repo, pats, opts, extra): def _includeunknownfiles(repo, pats, opts, extra):
s = repo.status(match=scmutil.match(repo[None], pats, opts), s = repo.status(match=scmutil.match(repo[None], pats, opts),
unknown=True) unknown=True)
if s.unknown: if s.unknown:
extra['shelve_unknown'] = '\0'.join(s.unknown) extra['shelve_unknown'] = '\0'.join(s.unknown)
repo[None].add(s.unknown) repo[None].add(s.unknown)
def _finishshelve(repo, tr): def _finishshelve(repo, tr):