This is an archive of the discontinued Mercurial Phabricator instance.

Differential D701

gitlookup: using util.urlreq instead of importing urllib
ClosedPublic

Authored by singhsrb on Sep 13 2017, 5:48 PM.
Tags
None
Subscribers
durham

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX845dc7826b85: gitlookup: using util.urlreq instead of importing urllib
Summary

I was reorganising the imports of gitlookup.py. After reorganising, the test
test-check-code-hg.t was probably able to recognise the imports and suggested
that we should using util.urlreq instead of urllib. Therefore, I am making the
suggested change in this commit and removing the urllib dependency.

I will be reorganising the imports in a later commit.

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 13 2017, 5:48 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 13 2017, 5:48 PM
durham accepted this revision.Sep 13 2017, 7:57 PM
durham added a subscriber: durham.
durham added inline comments.
hgext3rd/gitlookup.py
109

Do we need to drop the urllib import?

This revision is now accepted and ready to land.Sep 13 2017, 7:57 PM
singhsrb edited the summary of this revision. (Show Details)Sep 13 2017, 8:06 PM
singhsrb updated this revision to Diff 1798.
Closed by commit rFBHGX845dc7826b85: gitlookup: using util.urlreq instead of importing urllib (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 (4 lines)

Diff 1854

hgext3rd/gitlookup.py

onlymapdelta = False onlymapdelta = False
''' '''
from mercurial import bundle2, exchange, encoding, extensions, hg from mercurial import bundle2, exchange, encoding, extensions, hg
from mercurial import localrepo, util, wireproto, error, registrar from mercurial import localrepo, util, wireproto, error, registrar
from mercurial.node import bin, hex, nullid from mercurial.node import bin, hex, nullid
from mercurial.i18n import _ from mercurial.i18n import _
import errno, json, urllib import errno, json
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
def wrapwireprotocommand(command, wrapper): def wrapwireprotocommand(command, wrapper):
'''Wrap the wire proto command named `command' in table '''Wrap the wire proto command named `command' in table
Just like extensions.wrapcommand, except for wire protocol commands. Just like extensions.wrapcommand, except for wire protocol commands.
'''get git metadata from a server that supports fb_gitmeta''' '''get git metadata from a server that supports fb_gitmeta'''
source, branch = hg.parseurl(ui.expandpath(source)) source, branch = hg.parseurl(ui.expandpath(source))
other = hg.peer(repo, {}, source) other = hg.peer(repo, {}, source)
ui.status(_('getting git metadata from %s\n') % ui.status(_('getting git metadata from %s\n') %
util.hidepassword(source)) util.hidepassword(source))
kwargs = {'bundlecaps': exchange.caps20to10(repo)} kwargs = {'bundlecaps': exchange.caps20to10(repo)}
capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo)) capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo))
kwargs['bundlecaps'].add('bundle2=' + urllib.quote(capsblob)) kwargs['bundlecaps'].add('bundle2=' + util.urlreq.quote(capsblob))
durhamUnsubmitted
Not Done

Do we need to drop the urllib import?

durham: Do we need to drop the urllib import?
# this would ideally not be in the bundlecaps at all, but adding new kwargs # this would ideally not be in the bundlecaps at all, but adding new kwargs
# for wire transmissions is not possible as of Mercurial d19164a018a1 # for wire transmissions is not possible as of Mercurial d19164a018a1
kwargs['bundlecaps'].add('fb_gitmeta') kwargs['bundlecaps'].add('fb_gitmeta')
kwargs['heads'] = [nullid] kwargs['heads'] = [nullid]
kwargs['cg'] = False kwargs['cg'] = False
kwargs['common'] = _getcommonheads(repo) kwargs['common'] = _getcommonheads(repo)
bundle = other.getbundle('pull', **kwargs) bundle = other.getbundle('pull', **kwargs)
try: try: