This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5755

wireprotov1server: use binascii.unhexlify
ClosedPublic

Authored by indygreg on Jan 30 2019, 4:07 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9cb51e74e9ad: wireprotov1server: use binascii.unhexlify
rHGfb28dc97e38f: wireprotov1server: use binascii.unhexlify
Summary

The "hex" codec doesn't exist in Python 3. We could use
codecs.decode(h, 'hex_codec'). But binascii.unhexlify()
exists and should work the same on Python 2 and 3.

Diff Detail

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

Event Timeline

indygreg created this revision.Jan 30 2019, 4:07 PM
Closed by commit rHGfb28dc97e38f: wireprotov1server: use binascii.unhexlify (authored by indygreg). · Explain WhyJan 30 2019, 4:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13592

contrib/python3-whitelist

test-pending.t test-pending.t
test-permissions.t test-permissions.t
test-phases-exchange.t test-phases-exchange.t
test-phases.t test-phases.t
test-profile.t test-profile.t
test-progress.t test-progress.t
test-propertycache.py test-propertycache.py
test-pull-branch.t test-pull-branch.t
test-pull-bundle.t
test-pull-http.t test-pull-http.t
test-pull-permission.t test-pull-permission.t
test-pull-pull-corruption.t test-pull-pull-corruption.t
test-pull-r.t test-pull-r.t
test-pull-update.t test-pull-update.t
test-pull.t test-pull.t
test-purge.t test-purge.t
test-push-cgi.t test-push-cgi.t

mercurial/wireprotov1server.py

# wireprotov1server.py - Wire protocol version 1 server functionality # wireprotov1server.py - Wire protocol version 1 server functionality
# #
# Copyright 2005-2010 Matt Mackall <mpm@selenic.com> # Copyright 2005-2010 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import binascii
import os import os
from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
nullid, nullid,
) )
A bundle can be applied only if all its base revisions are known by A bundle can be applied only if all its base revisions are known by
the client. the client.
- At least one leaf of the bundle's DAG is missing on the client. - At least one leaf of the bundle's DAG is missing on the client.
- Every leaf of the bundle's DAG is part of node set the client wants. - Every leaf of the bundle's DAG is part of node set the client wants.
E.g. do not send a bundle of all changes if the client wants only E.g. do not send a bundle of all changes if the client wants only
one specific branch of many. one specific branch of many.
""" """
def decodehexstring(s): def decodehexstring(s):
return set([h.decode('hex') for h in s.split(';')]) return set([binascii.unhexlify(h) for h in s.split(';')])
manifest = repo.vfs.tryread('pullbundles.manifest') manifest = repo.vfs.tryread('pullbundles.manifest')
if not manifest: if not manifest:
return None return None
res = exchange.parseclonebundlesmanifest(repo, manifest) res = exchange.parseclonebundlesmanifest(repo, manifest)
res = exchange.filterclonebundleentries(repo, res) res = exchange.filterclonebundleentries(repo, res)
if not res: if not res:
return None return None