mercurial-scm/hg-stable: mercurial/debugcommands.py comparison

comparison mercurial/debugcommands.py @ 33113:b257aaa0743a

py3: use r'' to prevent the addition of b'' by transformer There are cases in opts handling in debugcommands.py where we don't need to convert opts keys back to bytes as there are some handful cases and no other function using opts value. Using r'', we prevent the transformer to add a b'' which will keep the value str.

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Tue, 27 Jun 2017 00:15:56 +0530
parents	05906b8e1d23
children	1b6946f87c50

comparison

equal deleted inserted replaced

-:05906b8e1d23
+:b257aaa0743a
 def _debugbundle2(ui, gen, all=None, **opts):
 """lists the contents of a bundle2"""
 if not isinstance(gen, bundle2.unbundle20):
 raise error.Abort(_('not a bundle2 file'))
 ui.write(('Stream params: %s\n' % repr(gen.params)))
-parttypes = opts.get('part_type', [])
+parttypes = opts.get(r'part_type', [])
 for part in gen.iterparts():
 if parttypes and part.type not in parttypes:
 continue
 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
 if part.type == 'changegroup':
 [('', 'style', None, _('show all configured styles'))],
 'hg debugcolor')
 def debugcolor(ui, repo, **opts):
 """show available color, effects or style"""
 ui.write(('color mode: %s\n') % ui._colormode)
-if opts.get('style'):
+if opts.get(r'style'):
 return _debugdisplaystyle(ui)
 else:
 return _debugdisplaycolor(ui)
 def _debugdisplaycolor(ui):
 If you pass a revlog index, the revlog's DAG is emitted. If you list
 revision numbers, they get labeled in the output as rN.
 Otherwise, the changelog DAG of the current repo is emitted.
 """
-spaces = opts.get('spaces')
+spaces = opts.get(r'spaces')
-dots = opts.get('dots')
+dots = opts.get(r'dots')
 if file_:
 rlog = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
 file_)
 revs = set((int(r) for r in revs))
 def events():
 if p != -1))
 if r in revs:
 yield 'l', (r, "r%i" % r)
 elif repo:
 cl = repo.changelog
-tags = opts.get('tags')
+tags = opts.get(r'tags')
-branches = opts.get('branches')
+branches = opts.get(r'branches')
 if tags:
 labels = {}
 for l, n in repo.tags().items():
 labels.setdefault(cl.rev(n), []).append(l)
 def events():
 [('e', 'extended', None, _('try extended date formats'))],
 _('[-e] DATE [RANGE]'),
 norepo=True, optionalrepo=True)
 def debugdate(ui, date, range=None, **opts):
 """parse and display a date"""
-if opts["extended"]:
+if opts[r"extended"]:
 d = util.parsedate(date, util.extendeddateformats)
 else:
 d = util.parsedate(date)
 ui.write(("internal: %s %s\n") % d)
 ui.write(("standard: %s\n") % util.datestr(d))
 ('', 'datesort', None, _('sort by saved mtime'))],
 _('[OPTION]...'))
 def debugstate(ui, repo, **opts):
 """show the contents of the current dirstate"""
-nodates = opts.get('nodates')
+nodates = opts.get(r'nodates')
-datesort = opts.get('datesort')
+datesort = opts.get(r'datesort')
 timestr = ""
 if datesort:
 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
 else:
 @command('debugfileset',
 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
 _('[-r REV] FILESPEC'))
 def debugfileset(ui, repo, expr, **opts):
 '''parse and apply a fileset specification'''
-ctx = scmutil.revsingle(repo, opts.get('rev'), None)
+ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
 if ui.verbose:
 tree = fileset.parse(expr)
 ui.note(fileset.prettyformat(tree), "\n")
 for f in ctx.getfileset(expr):
 repo = hg.peer(ui, opts, repopath)
 if not repo.capable('getbundle'):
 raise error.Abort("getbundle() not supported by target repository")
 args = {}
 if common:
-args['common'] = [bin(s) for s in common]
+args[r'common'] = [bin(s) for s in common]
 if head:
-args['heads'] = [bin(s) for s in head]
+args[r'heads'] = [bin(s) for s in head]
 # TODO: get desired bundlecaps from command line.
-args['bundlecaps'] = None
+args[r'bundlecaps'] = None
 bundle = repo.getbundle('debug', **args)
 bundletype = opts.get('type', 'bzip2').lower()
 btypes = {'none': 'HG10UN',
 'bzip2': 'HG10BZ',
 Returns 0 if no locks are held.
 """
-if opts.get('force_lock'):
+if opts.get(r'force_lock'):
 repo.svfs.unlink('lock')
-if opts.get('force_wlock'):
+if opts.get(r'force_wlock'):
 repo.vfs.unlink('wlock')
-if opts.get('force_lock') or opts.get('force_lock'):
+if opts.get(r'force_lock') or opts.get(r'force_lock'):
 return 0
 now = time.time()
 held = 0
 spec = spec[len(rootdir):]
 fixpaths = pycompat.ossep != '/'
 if fixpaths:
 spec = spec.replace(pycompat.ossep, '/')
 speclen = len(spec)
-fullpaths = opts['full']
+fullpaths = opts[r'full']
 files, dirs = set(), set()
 adddir, addfile = dirs.add, files.add
 for f, st in dirstate.iteritems():
 if f.startswith(spec) and st[0] in acceptable:
 if fixpaths:
 else:
 addfile(f)
 return files, dirs
 acceptable = ''
-if opts['normal']:
+if opts[r'normal']:
 acceptable += 'nm'
-if opts['added']:
+if opts[r'added']:
 acceptable += 'a'
-if opts['removed']:
+if opts[r'removed']:
 acceptable += 'r'
 cwd = repo.getcwd()
 if not specs:
 specs = ['.']
 ctx = scmutil.revsingle(repo, rev)
 with repo.wlock():
 dirstate = repo.dirstate
 changedfiles = None
 # See command doc for what minimal does.
-if opts.get('minimal'):
+if opts.get(r'minimal'):
 manifestfiles = set(ctx.manifest().keys())
 dirstatefiles = set(dirstate)
 manifestonly = manifestfiles - dirstatefiles
 dsonly = dirstatefiles - manifestfiles
 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
 template.
 Use --verbose to print the parsed tree.
 """
 revs = None
-if opts['rev']:
+if opts[r'rev']:
 if repo is None:
 raise error.RepoError(_('there is no Mercurial repository here '
 '(.hg not found)'))
-revs = scmutil.revrange(repo, opts['rev'])
+revs = scmutil.revrange(repo, opts[r'rev'])
 props = {}
-for d in opts['define']:
+for d in opts[r'define']:
 try:
 k, v = (e.strip() for e in d.split('=', 1))
 if not k or k == 'ui':
 raise ValueError
 props[k] = v

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/debugcommands.py @ 33113:b257aaa0743a