This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6966

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

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

Details

Reviewers
baymax
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 a subscriber: martinvonz.Oct 5 2019, 12:14 AM
martinvonz added inline comments.
mercurial/shelve.py
61

Seems unused

72–111

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

439

need a r'' prefix here for py3?

440

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

442

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
baymax requested changes to this revision.Jan 24 2020, 12:31 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:31 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (25 lines)

Diff 16813

mercurial/shelve.py

shelve". shelve".
""" """
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import errno import errno
import itertools import itertools
import stat import stat
import struct
from .i18n import _ from .i18n import _
from . import ( from . import (
bookmarks, bookmarks,
bundle2, bundle2,
bundlerepo, bundlerepo,
changegroup, changegroup,
cmdutil, cmdutil,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from .utils import ( from .utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
_pack = struct.pack
martinvonzUnsubmitted
Done

Seems unused

martinvonz: Seems unused
backupdir = 'shelve-backup' backupdir = 'shelve-backup'
shelvedir = 'shelved' shelvedir = 'shelved'
shelvefileextensions = ['hg', 'patch', 'shelve'] shelvefileextensions = ['hg', 'patch', 'shelve']
# universal extension is present in all types of shelves # universal extension is present in all types of shelves
patchextension = 'patch' patchextension = 'patch'
# we never need the user, so we use a # we never need the user, so we use a
# generic user for all shelve operations # generic user for all shelve operations
shelveuser = 'shelve@localhost' shelveuser = 'shelve@localhost'
# Merge state record types. See ``mergestate`` docs for more.
RECORD_LOCAL = b'L'
RECORD_OTHER = b'O'
RECORD_MERGED = b'F'
RECORD_OVERRIDE = b't'
class shelvedfile(object): class shelvedfile(object):
"""Helper for the file storing a single shelve """Helper for the file storing a single shelve
Handles common functions on shelve files (.hg/.patch) using Handles common functions on shelve files (.hg/.patch) using
the vfs layer""" the vfs layer"""
def __init__(self, repo, name, filetype=None): def __init__(self, repo, name, filetype=None):
self.repo = repo self.repo = repo
self.name = name self.name = name
self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir)) self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir))
self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir)) self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir))
self.ui = self.repo.ui self.ui = self.repo.ui
if filetype: if filetype:
self.fname = name + '.' + filetype self.fname = name + '.' + filetype
else: else:
self.fname = name self.fname = name
def exists(self): def exists(self):
return self.vfs.exists(self.fname) return self.vfs.exists(self.fname)
def filename(self): def filename(self):
return self.vfs.join(self.fname) return self.vfs.join(self.fname)
def backupfilename(self): def backupfilename(self):
def gennames(base): def gennames(base):
yield base yield base
base, ext = base.rsplit('.', 1) base, ext = base.rsplit('.', 1)
for i in itertools.count(1): for i in itertools.count(1):
yield '%s-%d.%s' % (base, i, ext) yield '%s-%d.%s' % (base, i, ext)
name = self.backupvfs.join(self.fname) name = self.backupvfs.join(self.fname)
for n in gennames(name): for n in gennames(name):
if not self.backupvfs.exists(n): if not self.backupvfs.exists(n):
return n return n
martinvonzUnsubmitted
Done

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

martinvonz: Most of these seem unused. I would prefer if they were added in a later patch where they are…
def movetobackup(self): def movetobackup(self):
if not self.backupvfs.isdir(): if not self.backupvfs.isdir():
self.backupvfs.makedir() self.backupvfs.makedir()
util.rename(self.filename(), self.backupfilename()) util.rename(self.filename(), self.backupfilename())
def stat(self): def stat(self):
return self.vfs.stat(self.fname) return self.vfs.stat(self.fname)
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 _storeunresolvedmerge(ui, repo, name=None, extra=None):
"""Store the mergestate information in changeset extra
for later restoration.
"""
ms = merge.mergestate.read(repo)
records = ms._readrecords()
allowlist = (RECORD_LOCAL, RECORD_OTHER, RECORD_MERGED)
mergedata = ''
for key, data in records:
assert len(key) == 1
if key not in allowlist:
key, data = RECORD_OVERRIDE, '%s%s' % (key, data)
format = r'>sI%is' % len(data)
mergedata = mergedata + _pack(format, key, len(data), data)
extra['mergerecords'] = mergedata
martinvonzUnsubmitted
Done

need a r'' prefix here for py3?

martinvonz: need a `r''` prefix here for py3?
martinvonzUnsubmitted
Done

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

martinvonz: `''.join(a,b)` can be written more simply as `a + b`
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),
martinvonzUnsubmitted
Done

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

martinvonz: This seems surprising in this method. Consider moving it out.
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):
if phases.supportinternal(repo): if phases.supportinternal(repo):
tr.close() tr.close()