--- a/mercurial/debugcommands.py Sun Nov 10 07:30:14 2019 -0800
+++ b/mercurial/debugcommands.py Fri Nov 08 11:19:20 2019 -0800
@@ -393,7 +393,7 @@
if not isinstance(gen, bundle2.unbundle20):
raise error.Abort(_(b'not a bundle2 file'))
ui.write((b'Stream params: %s\n' % _quasirepr(gen.params)))
- parttypes = opts.get(r'part_type', [])
+ parttypes = opts.get('part_type', [])
for part in gen.iterparts():
if parttypes and part.type not in parttypes:
continue
@@ -492,7 +492,7 @@
def debugcolor(ui, repo, **opts):
"""show available color, effects or style"""
ui.writenoi18n(b'color mode: %s\n' % stringutil.pprint(ui._colormode))
- if opts.get(r'style'):
+ if opts.get('style'):
return _debugdisplaystyle(ui)
else:
return _debugdisplaycolor(ui)
@@ -573,8 +573,8 @@
Otherwise, the changelog DAG of the current repo is emitted.
"""
- spaces = opts.get(r'spaces')
- dots = opts.get(r'dots')
+ spaces = opts.get('spaces')
+ dots = opts.get('dots')
if file_:
rlog = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), file_)
revs = set((int(r) for r in revs))
@@ -587,8 +587,8 @@
elif repo:
cl = repo.changelog
- tags = opts.get(r'tags')
- branches = opts.get(r'branches')
+ tags = opts.get('tags')
+ branches = opts.get('branches')
if tags:
labels = {}
for l, n in repo.tags().items():
@@ -861,10 +861,10 @@
def debugstate(ui, repo, **opts):
"""show the contents of the current dirstate"""
- nodates = not opts[r'dates']
- if opts.get(r'nodates') is not None:
+ nodates = not opts['dates']
+ if opts.get('nodates') is not None:
nodates = True
- datesort = opts.get(r'datesort')
+ datesort = opts.get('datesort')
if datesort:
keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
@@ -1298,11 +1298,11 @@
raise error.Abort(b"getbundle() not supported by target repository")
args = {}
if common:
- args[r'common'] = [bin(s) for s in common]
+ args['common'] = [bin(s) for s in common]
if head:
- args[r'heads'] = [bin(s) for s in head]
+ args['heads'] = [bin(s) for s in head]
# TODO: get desired bundlecaps from command line.
- args[r'bundlecaps'] = None
+ args['bundlecaps'] = None
bundle = repo.getbundle(b'debug', **args)
bundletype = opts.get(b'type', b'bzip2').lower()
@@ -1775,21 +1775,21 @@
"""
- if opts.get(r'force_lock'):
+ if opts.get('force_lock'):
repo.svfs.unlink(b'lock')
- if opts.get(r'force_wlock'):
+ if opts.get('force_wlock'):
repo.vfs.unlink(b'wlock')
- if opts.get(r'force_lock') or opts.get(r'force_wlock'):
+ if opts.get('force_lock') or opts.get('force_wlock'):
return 0
locks = []
try:
- if opts.get(r'set_wlock'):
+ if opts.get('set_wlock'):
try:
locks.append(repo.wlock(False))
except error.LockHeld:
raise error.Abort(_(b'wlock is already held'))
- if opts.get(r'set_lock'):
+ if opts.get('set_lock'):
try:
locks.append(repo.lock(False))
except error.LockHeld:
@@ -1871,7 +1871,7 @@
)
raise error.Abort(msg)
- if opts.get(r'clear'):
+ if opts.get('clear'):
with repo.wlock():
cache = getcache()
cache.clear(clear_persisted_data=True)
@@ -2265,7 +2265,7 @@
if fixpaths:
spec = spec.replace(pycompat.ossep, b'/')
speclen = len(spec)
- fullpaths = opts[r'full']
+ fullpaths = opts['full']
files, dirs = set(), set()
adddir, addfile = dirs.add, files.add
for f, st in pycompat.iteritems(dirstate):
@@ -2283,11 +2283,11 @@
return files, dirs
acceptable = b''
- if opts[r'normal']:
+ if opts['normal']:
acceptable += b'nm'
- if opts[r'added']:
+ if opts['added']:
acceptable += b'a'
- if opts[r'removed']:
+ if opts['removed']:
acceptable += b'r'
cwd = repo.getcwd()
if not specs:
@@ -2526,7 +2526,7 @@
dirstate = repo.dirstate
changedfiles = None
# See command doc for what minimal does.
- if opts.get(r'minimal'):
+ if opts.get('minimal'):
manifestfiles = set(ctx.manifest().keys())
dirstatefiles = set(dirstate)
manifestonly = manifestfiles - dirstatefiles
@@ -3147,13 +3147,13 @@
ui.writenoi18n(b'+++ optimized\n', label=b'diff.file_b')
sm = difflib.SequenceMatcher(None, arevs, brevs)
for tag, alo, ahi, blo, bhi in sm.get_opcodes():
- if tag in (r'delete', r'replace'):
+ if tag in ('delete', 'replace'):
for c in arevs[alo:ahi]:
ui.write(b'-%d\n' % c, label=b'diff.deleted')
- if tag in (r'insert', r'replace'):
+ if tag in ('insert', 'replace'):
for c in brevs[blo:bhi]:
ui.write(b'+%d\n' % c, label=b'diff.inserted')
- if tag == r'equal':
+ if tag == 'equal':
for c in arevs[alo:ahi]:
ui.write(b' %d\n' % c)
return 1
@@ -3202,12 +3202,12 @@
if opts[b'logiofd']:
# Line buffered because output is line based.
try:
- logfh = os.fdopen(int(opts[b'logiofd']), r'ab', 1)
+ logfh = os.fdopen(int(opts[b'logiofd']), 'ab', 1)
except OSError as e:
if e.errno != errno.ESPIPE:
raise
# can't seek a pipe, so `ab` mode fails on py3
- logfh = os.fdopen(int(opts[b'logiofd']), r'wb', 1)
+ logfh = os.fdopen(int(opts[b'logiofd']), 'wb', 1)
elif opts[b'logiofile']:
logfh = open(opts[b'logiofile'], b'ab', 1)
@@ -3391,7 +3391,7 @@
ctx = repo[rev]
ui.write(b'%s\n' % ctx2str(ctx))
for succsset in obsutil.successorssets(
- repo, ctx.node(), closest=opts[r'closest'], cache=cache
+ repo, ctx.node(), closest=opts['closest'], cache=cache
):
if succsset:
ui.write(b' ')
@@ -3421,15 +3421,15 @@
Use --verbose to print the parsed tree.
"""
revs = None
- if opts[r'rev']:
+ if opts['rev']:
if repo is None:
raise error.RepoError(
_(b'there is no Mercurial repository here (.hg not found)')
)
- revs = scmutil.revrange(repo, opts[r'rev'])
+ revs = scmutil.revrange(repo, opts['rev'])
props = {}
- for d in opts[r'define']:
+ for d in opts['define']:
try:
k, v = (e.strip() for e in d.split(b'=', 1))
if not k or k == b'ui':
@@ -3985,27 +3985,27 @@
url, authinfo = u.authinfo()
openerargs = {
- r'useragent': b'Mercurial debugwireproto',
+ 'useragent': b'Mercurial debugwireproto',
}
# Turn pipes/sockets into observers so we can log I/O.
if ui.verbose:
openerargs.update(
{
- r'loggingfh': ui,
- r'loggingname': b's',
- r'loggingopts': {r'logdata': True, r'logdataapis': False,},
+ 'loggingfh': ui,
+ 'loggingname': b's',
+ 'loggingopts': {'logdata': True, 'logdataapis': False,},
}
)
if ui.debugflag:
- openerargs[r'loggingopts'][r'logdataapis'] = True
+ openerargs['loggingopts']['logdataapis'] = True
# Don't send default headers when in raw mode. This allows us to
# bypass most of the behavior of our URL handling code so we can
# have near complete control over what's sent on the wire.
if opts[b'peer'] == b'raw':
- openerargs[r'sendaccept'] = False
+ openerargs['sendaccept'] = False
opener = urlmod.opener(ui, authinfo, **openerargs)
@@ -4105,7 +4105,7 @@
ui.status(_(b'sending %s command\n') % command)
if b'PUSHFILE' in args:
- with open(args[b'PUSHFILE'], r'rb') as fh:
+ with open(args[b'PUSHFILE'], 'rb') as fh:
del args[b'PUSHFILE']
res, output = peer._callpush(
command, fh, **pycompat.strkwargs(args)
@@ -4213,8 +4213,8 @@
getattr(e, 'read', lambda: None)()
continue
- ct = res.headers.get(r'Content-Type')
- if ct == r'application/mercurial-cbor':
+ ct = res.headers.get('Content-Type')
+ if ct == 'application/mercurial-cbor':
ui.write(
_(b'cbor> %s\n')
% stringutil.pprint(