( )⚙ D801 p4fastimport: do not break other extensions

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D801

p4fastimport: do not break other extensions
ClosedPublic

Authored by quark on Sep 22 2017, 4:43 PM.
Tags
None
Subscribers
None

Details

Reviewers
stash
durham
Group Reviewers
Restricted Project
Commits
rFBHGXa3775d94a17b: p4fastimport: do not break other extensions
Summary

p4fastimport's reposetup will break other lfs commands or verify. Let's
limit that side effect to p4fastimport related commands. So they won't
affect users with p4fastimport enabled.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Sep 22 2017, 4:43 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 22 2017, 4:43 PM
stash accepted this revision.Sep 26 2017, 3:28 AM
This revision is now accepted and ready to land.Sep 26 2017, 3:28 AM
durham accepted this revision.Sep 26 2017, 7:03 AM
Closed by commit rFBHGXa3775d94a17b: p4fastimport: do not break other extensions (authored by quark). · Explain WhySep 26 2017, 5:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/p4fastimport/__init__.py (22 lines)

Diff 2044

hgext3rd/p4fastimport/__init__.py

) )
def extsetup(): def extsetup():
# Writing multiple changelog entries in one transaction can lead to revlog # Writing multiple changelog entries in one transaction can lead to revlog
# caching issues when the inlined .i data is separated into a .d file. We # caching issues when the inlined .i data is separated into a .d file. We
# workaround by not allowing inlined revlogs at all. # workaround by not allowing inlined revlogs at all.
revlog.REVLOG_DEFAULT_VERSION = revlog.REVLOG_DEFAULT_FORMAT revlog.REVLOG_DEFAULT_VERSION = revlog.REVLOG_DEFAULT_FORMAT
def reposetup(ui, repo): def _reposetup(ui, repo):
def nothing(orig, *args, **kwargs): def nothing(orig, *args, **kwargs):
pass pass
def yoloverify(orig, *args, **kwargs): def yoloverify(orig, *args, **kwargs):
# We have to set it directly as repo is reading the config lfs.bypass # We have to set it directly as repo is reading the config lfs.bypass
# during their repo setup. # during their repo setup.
repo.svfs.options['lfsbypass'] = True repo.svfs.options['lfsbypass'] = True
return orig(*args, **kwargs) return orig(*args, **kwargs)
def handlelfs(loaded):
if loaded: extensions.wrapfunction(verify.verifier, 'verify', yoloverify)
try:
lfs = extensions.find('lfs') lfs = extensions.find('lfs')
except KeyError:
pass
else:
extensions.wrapfunction(lfs.blobstore.local, 'write', nothing) extensions.wrapfunction(lfs.blobstore.local, 'write', nothing)
extensions.wrapfunction(lfs.blobstore.local, 'read', nothing) extensions.wrapfunction(lfs.blobstore.local, 'read', nothing)
extensions.wrapfunction(verify.verifier, 'verify', yoloverify)
extensions.afterloaded('lfs', handlelfs)
def writebookmark(tr, repo, revisions, name): def writebookmark(tr, repo, revisions, name):
if len(revisions) > 0: if len(revisions) > 0:
__, hexnode = revisions[-1] __, hexnode = revisions[-1]
repo._bookmarks.applychanges(repo, tr, [(name, repo[hexnode].node())]) repo._bookmarks.applychanges(repo, tr, [(name, repo[hexnode].node())])
def writerevmetadata(revisions, outfile): def writerevmetadata(revisions, outfile):
"""Write the LFS mappings from OID to a depotpath and it's CLnum into """Write the LFS mappings from OID to a depotpath and it's CLnum into
sqlite. This way the LFS server can import the correct file from Perforce sqlite. This way the LFS server can import the correct file from Perforce
[('P', 'path', '.', _('path to the local depot store'), _('PATH')), [('P', 'path', '.', _('path to the local depot store'), _('PATH')),
('B', 'bookmark', '', _('bookmark to set'), _('NAME')), ('B', 'bookmark', '', _('bookmark to set'), _('NAME')),
('', 'base', '', _('base changeset (must exist in the repository)')), ('', 'base', '', _('base changeset (must exist in the repository)')),
('', 'limit', '', ('', 'limit', '',
_('number of changelists to import at a time'), _('N'))], _('number of changelists to import at a time'), _('N'))],
_('[-P PATH] [-B NAME] [--limit N] [CLIENT]'), _('[-P PATH] [-B NAME] [--limit N] [CLIENT]'),
inferrepo=True) inferrepo=True)
def p4fastimport(ui, repo, client, **opts): def p4fastimport(ui, repo, client, **opts):
_reposetup(ui, repo)
if 'fncache' in repo.requirements: if 'fncache' in repo.requirements:
raise error.Abort(_('fncache must be disabled')) raise error.Abort(_('fncache must be disabled'))
if opts.get('base') and not opts.get('bookmark'): if opts.get('base') and not opts.get('bookmark'):
raise error.Abort(_('must set --bookmark when using --base')) raise error.Abort(_('must set --bookmark when using --base'))
if opts.get('bookmark'): if opts.get('bookmark'):
scmutil.checknewlabel(repo, opts['bookmark'], 'bookmark') scmutil.checknewlabel(repo, opts['bookmark'], 'bookmark')
@command( @command(
'p4syncimport', 'p4syncimport',
[('P', 'path', '.', _('path to the local depot store'), _('PATH')), [('P', 'path', '.', _('path to the local depot store'), _('PATH')),
('B', 'bookmark', '', _('bookmark to set'), _('NAME'))], ('B', 'bookmark', '', _('bookmark to set'), _('NAME'))],
_('[-P PATH] client [-B NAME] bookmarkname'), _('[-P PATH] client [-B NAME] bookmarkname'),
) )
def p4syncimport(ui, repo, client, **opts): def p4syncimport(ui, repo, client, **opts):
_reposetup(ui, repo)
if opts.get('bookmark'): if opts.get('bookmark'):
scmutil.checknewlabel(repo, opts['bookmark'], 'bookmark') scmutil.checknewlabel(repo, opts['bookmark'], 'bookmark')
if len(repo) == 0: if len(repo) == 0:
raise error.Abort(_('p4 blob commit does not support empty repo yet.')) raise error.Abort(_('p4 blob commit does not support empty repo yet.'))
p1ctx, startcl, __ = startfrom(ui, repo, opts) p1ctx, startcl, __ = startfrom(ui, repo, opts)
finally: finally:
tr.release() tr.release()
@command('debugscanlfs', @command('debugscanlfs',
[('C', 'client', '', _('Perforce client to reverse lookup')), [('C', 'client', '', _('Perforce client to reverse lookup')),
('r', 'rev', '.', _('display LFS files in REV')), ('r', 'rev', '.', _('display LFS files in REV')),
('A', 'all', None, _('display LFS files all revisions'))]) ('A', 'all', None, _('display LFS files all revisions'))])
def debugscanlfs(ui, repo, **opts): def debugscanlfs(ui, repo, **opts):
_reposetup(ui, repo)
lfs = extensions.find('lfs') lfs = extensions.find('lfs')
def display(repo, filename, flog, rev): def display(repo, filename, flog, rev):
filenode = flog.node(rev) filenode = flog.node(rev)
rawtext = flog.revision(filenode, raw=True) rawtext = flog.revision(filenode, raw=True)
ptr = lfs.pointer.deserialize(rawtext) ptr = lfs.pointer.deserialize(rawtext)
linkrev = flog.linkrev(rev) linkrev = flog.linkrev(rev)
cl = int(repo[linkrev].extra()['p4changelist']) cl = int(repo[linkrev].extra()['p4changelist'])
return _('%d %s %s %d %s\n') % ( return _('%d %s %s %d %s\n') % (