This is an archive of the discontinued Mercurial Phabricator instance.

Differential D692

gitgetmeta: refactor code in gitlookup.py
ClosedPublic

Authored by singhsrb on Sep 12 2017, 2:15 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGXbdbab4cc6fa0: gitgetmeta: refactor code in gitlookup.py
Summary

This commit just refactors some code to setup nicely for handling a
new type of bundle part. The refactoring essentially moves out the parts that
can be reused later.

Test Plan

Ran all the tests.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

singhsrb created this revision.Sep 12 2017, 2:15 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 12 2017, 2:15 PM
durham accepted this revision.Sep 12 2017, 4:27 PM
This revision is now accepted and ready to land.Sep 12 2017, 4:27 PM
Closed by commit rFBHGXbdbab4cc6fa0: gitgetmeta: refactor code in gitlookup.py (authored by singhsrb). · Explain WhySep 15 2017, 12:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/gitlookup.py (53 lines)

Diff 1851

hgext3rd/gitlookup.py

raise error.Abort('missing support for %s' % exc) raise error.Abort('missing support for %s' % exc)
writebytes = op.records['fb:gitmeta:writebytes'] writebytes = op.records['fb:gitmeta:writebytes']
ui.status(_('wrote %d files (%d bytes)\n') % ui.status(_('wrote %d files (%d bytes)\n') %
(len(writebytes), sum(writebytes))) (len(writebytes), sum(writebytes)))
gitmetafiles = set(['git-mapfile', 'git-named-branches', 'git-tags', gitmetafiles = set(['git-mapfile', 'git-named-branches', 'git-tags',
'git-remote-refs']) 'git-remote-refs'])
def _getfile(repo, filename):
try:
return repo.vfs(filename)
except (IOError, OSError) as e:
if e.errno != errno.ENOENT:
repo.ui.warn(_("warning: unable to read %s: %s\n") % (filename, e))
return None
@exchange.getbundle2partsgenerator('b2x:fb:gitmeta') @exchange.getbundle2partsgenerator('b2x:fb:gitmeta')
def _getbundlegitmetapart(bundler, repo, source, bundlecaps=None, **kwargs): def _getbundlegitmetapart(bundler, repo, source, bundlecaps=None, **kwargs):
'''send git metadata via bundle2''' '''send git metadata via bundle2'''
if 'fb_gitmeta' in bundlecaps: if 'fb_gitmeta' in bundlecaps:
for fname in sorted(gitmetafiles): for fname in sorted(gitmetafiles):
try: f = _getfile(repo, fname)
f = repo.vfs(fname) if not f:
except (IOError, OSError) as e:
if e.errno != errno.ENOENT:
repo.ui.warn(_("warning: unable to read %s: %s\n") %
(fname, e))
continue continue
part = bundle2.bundlepart('b2x:fb:gitmeta', part = bundle2.bundlepart('b2x:fb:gitmeta',
[('filename', fname)], [('filename', fname)],
data=f.read()) data=f.read())
bundler.addpart(part) bundler.addpart(part)
def _writefile(op, filename, data):
with op.repo.vfs(filename, 'w+', atomictemp=True) as f:
op.repo.ui.note(_('writing .hg/%s\n') % filename)
f.write(data)
op.records.add('fb:gitmeta:writebytes', len(data))
def _validatepartparams(op, params):
if 'filename' not in params:
raise error.Abort(_("gitmeta: 'filename' missing"))
fname = params['filename']
if fname not in gitmetafiles:
op.repo.ui.warn(
_("warning: gitmeta: unknown file '%s' skipped\n") % fname)
return False
return True
@bundle2.parthandler('b2x:fb:gitmeta', ('filename',)) @bundle2.parthandler('b2x:fb:gitmeta', ('filename',))
@bundle2.parthandler('fb:gitmeta', ('filename',)) @bundle2.parthandler('fb:gitmeta', ('filename',))
def bundle2getgitmeta(op, part): def bundle2getgitmeta(op, part):
'''unbundle a bundle2 containing git metadata on the client''' '''unbundle a bundle2 containing git metadata on the client'''
params = dict(part.mandatoryparams) params = dict(part.mandatoryparams)
if 'filename' not in params: if _validatepartparams(op, params):
raise error.Abort(_("gitmeta: 'filename' missing")) filename = params['filename']
fname = params['filename'] with op.repo.wlock():
if fname not in gitmetafiles:
op.repo.ui.warn(_("warning: gitmeta: unknown file '%s' skipped\n")
% fname)
return
with op.repo.wlock(), op.repo.vfs(fname, 'w+', atomictemp=True) as f:
data = part.read() data = part.read()
op.repo.ui.note(_('writing .hg/%s\n') % fname) _writefile(op, filename, data)
f.write(data)
op.records.add('fb:gitmeta:writebytes', len(data))
def extsetup(ui): def extsetup(ui):
wrapwireprotocommand('lookup', remotelookup) wrapwireprotocommand('lookup', remotelookup)
extensions.wrapfunction(localrepo.localrepository, 'lookup', locallookup) extensions.wrapfunction(localrepo.localrepository, 'lookup', locallookup)