D5812: py3: pass str into ValueError to prevent b'' prefix in output
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sun Feb 3 12:13:55 UTC 2019
pulkit created this revision.
Herald added a reviewer: durin42.
Herald added a reviewer: martinvonz.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
1. skip-blame because mostly just r'' prefixes
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5812
AFFECTED FILES
hgext/narrow/narrowbundle2.py
mercurial/exchange.py
CHANGE DETAILS
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -920,7 +920,7 @@
if v in changegroup.supportedoutgoingversions(
pushop.repo)]
if not cgversions:
- raise ValueError(_('no common changegroup version'))
+ raise ValueError(_(r'no common changegroup version'))
version = max(cgversions)
cgstream = changegroup.makestream(pushop.repo, pushop.outgoing, version,
'push')
@@ -2130,22 +2130,22 @@
Returns a 2-tuple of a dict with metadata about the generated bundle
and an iterator over raw chunks (of varying sizes).
"""
- kwargs = pycompat.byteskwargs(kwargs)
info = {}
usebundle2 = bundle2requested(bundlecaps)
# bundle10 case
if not usebundle2:
- if bundlecaps and not kwargs.get('cg', True):
- raise ValueError(_('request for bundle10 must include changegroup'))
+ if bundlecaps and not kwargs.get(r'cg', True):
+ raise ValueError(_(r'request for bundle10 must include changegroup'))
if kwargs:
- raise ValueError(_('unsupported getbundle arguments: %s')
- % ', '.join(sorted(kwargs.keys())))
+ raise ValueError(_(r'unsupported getbundle arguments: %s')
+ % r', '.join(sorted(kwargs.keys())))
outgoing = _computeoutgoing(repo, heads, common)
info['bundleversion'] = 1
return info, changegroup.makestream(repo, outgoing, '01', source,
bundlecaps=bundlecaps)
+ kwargs = pycompat.byteskwargs(kwargs)
# bundle20 case
info['bundleversion'] = 2
b2caps = {}
@@ -2184,7 +2184,7 @@
cgversions = [v for v in cgversions
if v in changegroup.supportedoutgoingversions(repo)]
if not cgversions:
- raise ValueError(_('no common changegroup version'))
+ raise ValueError(_(r'no common changegroup version'))
version = max(cgversions)
outgoing = _computeoutgoing(repo, heads, common)
@@ -2228,7 +2228,7 @@
if not kwargs.get(r'bookmarks', False):
return
if 'bookmarks' not in b2caps:
- raise ValueError(_('no common bookmarks exchange method'))
+ raise ValueError(_(r'no common bookmarks exchange method'))
books = bookmod.listbinbookmarks(repo)
data = bookmod.binaryencode(books)
if data:
@@ -2263,7 +2263,7 @@
"""add phase heads part to the requested bundle"""
if kwargs.get(r'phases', False):
if not 'heads' in b2caps.get('phases'):
- raise ValueError(_('no common phases exchange method'))
+ raise ValueError(_(r'no common phases exchange method'))
if heads is None:
heads = repo.heads()
diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py
+++ b/hgext/narrow/narrowbundle2.py
@@ -54,11 +54,11 @@
cgversions = [v for v in cgversions
if v in changegroup.supportedoutgoingversions(repo)]
if not cgversions:
- raise ValueError(_('no common changegroup version'))
+ raise ValueError(_(r'no common changegroup version'))
version = max(cgversions)
else:
- raise ValueError(_("server does not advertise changegroup version,"
- " can't negotiate support for ellipsis nodes"))
+ raise ValueError(_(r"server does not advertise changegroup version,"
+ r" can't negotiate support for ellipsis nodes"))
include = sorted(filter(bool, kwargs.get(r'includepats', [])))
exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
To: pulkit, durin42, martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list