mercurial-scm/hg: mercurial/commands.py comparison

comparison mercurial/commands.py @ 43506:9f70512ae2cf

cleanup: remove pointless r-prefixes on single-quoted strings This is the promised second step on single-quoted strings. These had existed because our source transformer didn't turn r'' into b'', so we had tagged some strings as r-strings to get "native" strings on both Pythons. Now that the transformer is gone, we can dispense with this nonsense. Methodology: I ran hg locate 'set:added() or modified() or clean()' | egrep '.*\.py$' | xargs egrep --color=never -n -- \[\^b\]\[\^a-z\]r\'\[\^\'\\\\\]\*\'\[\^\'\ in an emacs grep-mode buffer, and then used a keyboard macro to iterate over the results and remove the r prefix as needed. # skip-blame removing unneeded r prefixes left over from Python 3 migration. Differential Revision: https://phab.mercurial-scm.org/D7306

author	Augie Fackler <augie@google.com>
date	Fri, 08 Nov 2019 11:19:20 -0800
parents	93f74a7d3f07
children	8e175a3d64bd

comparison

equal deleted inserted replaced

-:47fac1692ede
+:9f70512ae2cf
 Aborts a multistep operation like graft, histedit, rebase, merge,
 and unshelve if they are in an unfinished state.
 use --dry-run/-n to dry run the command.
 """
-dryrun = opts.get(r'dry_run')
+dryrun = opts.get('dry_run')
 abortstate = cmdutil.getunfinishedstate(repo)
 if not abortstate:
 raise error.Abort(_(b'no operation in progress'))
 if not abortstate.abortfunc:
 raise error.Abort(
 with repo.wlock(), repo.lock():
 return _docommit(ui, repo, *pats, **opts)
 def _docommit(ui, repo, *pats, **opts):
-if opts.get(r'interactive'):
+if opts.get('interactive'):
-opts.pop(r'interactive')
+opts.pop('interactive')
 ret = cmdutil.dorecord(
 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
 )
 # ret can be 0 (no changes to record) or the value returned by
 # commit(), 1 if nothing changed or None on success.
 Finishes a multistep operation like graft, histedit, rebase, merge,
 and unshelve if they are in an interrupted state.
 use --dry-run/-n to dry run the command.
 """
-dryrun = opts.get(r'dry_run')
+dryrun = opts.get('dry_run')
 contstate = cmdutil.getunfinishedstate(repo)
 if not contstate:
 raise error.Abort(_(b'no operation in progress'))
 if not contstate.continuefunc:
 raise error.Abort(
 norepo=True,
 )
 def debugcomplete(ui, cmd=b'', **opts):
 """returns the completion list associated with the given command"""
-if opts.get(r'options'):
+if opts.get('options'):
 options = []
 otables = [globalopts]
 if cmd:
 aliases, entry = cmdutil.findcmd(cmd, table, False)
 otables.append(entry[1])
 m.append(s)
 def difflinestates(a, b):
 sm = difflib.SequenceMatcher(None, a, b)
 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
-if tag == r'insert':
+if tag == 'insert':
 for i in pycompat.xrange(blo, bhi):
 yield (b'+', b[i])
-elif tag == r'delete':
+elif tag == 'delete':
 for i in pycompat.xrange(alo, ahi):
 yield (b'-', a[i])
-elif tag == r'replace':
+elif tag == 'replace':
 for i in pycompat.xrange(alo, ahi):
 yield (b'-', a[i])
 for i in pycompat.xrange(blo, bhi):
 yield (b'+', b[i])
 topic.
 Returns 0 if successful.
 """
-keep = opts.get(r'system') or []
+keep = opts.get('system') or []
 if len(keep) == 0:
 if pycompat.sysplatform.startswith(b'win'):
 keep.append(b'windows')
 elif pycompat.sysplatform == b'OpenVMS':
 keep.append(b'vms')
 Returns 0 if successful, 1 if nothing to recover or verify fails.
 """
 ret = repo.recover()
 if ret:
-if opts[r'verify']:
+if opts['verify']:
 return hg.verify(repo)
 else:
 msg = _(
 b"(verify step skipped, run  `hg verify` to check your "
 b"repository content)\n"
 if not ui.configbool(b'ui', b'rollback'):
 raise error.Abort(
 _(b'rollback is disabled because it is unsafe'),
 hint=b'see `hg help -v rollback` for information',
 )
-return repo.rollback(dryrun=opts.get(r'dry_run'), force=opts.get(r'force'))
+return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
 @command(
 b'root',
 [] + formatteropts,
 b"information"
 ),
 )
 modheads = bundle2.combinechangegroupresults(op)
-return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
+return postincoming(ui, repo, modheads, opts.get('update'), None, None)
 @command(
 b'unshelve',
 [
 See :hg:`help dates` for a list of formats valid for -d/--date.
 Returns 0 on success, 1 if there are unresolved files.
 """
-rev = opts.get(r'rev')
+rev = opts.get('rev')
-date = opts.get(r'date')
+date = opts.get('date')
-clean = opts.get(r'clean')
+clean = opts.get('clean')
-check = opts.get(r'check')
+check = opts.get('check')
-merge = opts.get(r'merge')
+merge = opts.get('merge')
 if rev and node:
 raise error.Abort(_(b"please specify just one revision"))
 if ui.configbool(b'commands', b'update.requiredest'):
 if not node and not rev and not date:
 if rev:
 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
 ctx = scmutil.revsingle(repo, rev, default=None)
 rev = ctx.rev()
 hidden = ctx.hidden()
-overrides = {(b'ui', b'forcemerge'): opts.get(r'tool', b'')}
+overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
 with ui.configoverride(overrides, b'update'):
 ret = hg.updatetotally(
 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
 )
 if hidden:

Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 43506:9f70512ae2cf