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

comparison mercurial/subrepo.py @ 43554: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	8ff1ecfadcd1
children	aeed2f106213

comparison

equal deleted inserted replaced

-:47fac1692ede
+:9f70512ae2cf
 class SubrepoAbort(error.Abort):
 """Exception class used to avoid handling a subrepo error more than once"""
 def __init__(self, *args, **kw):
-self.subrepo = kw.pop(r'subrepo', None)
+self.subrepo = kw.pop('subrepo', None)
-self.cause = kw.pop(r'cause', None)
+self.cause = kw.pop('cause', None)
 error.Abort.__init__(self, *args, **kw)
 def annotatesubrepoerror(func):
 def decoratedmethod(self, *args, **kargs):
 # 1. if the no_backup is not set, revert all modified
 #    files inside the subrepo
 # 2. update the subrepo to the revision specified in
 #    the corresponding substate dictionary
 self.ui.status(_(b'reverting subrepo %s\n') % substate[0])
-if not opts.get(r'no_backup'):
+if not opts.get('no_backup'):
 # Revert all files on the subrepo, creating backups
 # Note that this will not recursively revert subrepos
 # We could do it if there was a set:subrepos() predicate
 opts = opts.copy()
-opts[r'date'] = None
+opts['date'] = None
-opts[r'rev'] = substate[1]
+opts['rev'] = substate[1]
 self.filerevert(*pats, **opts)
 # Update the repo to the revision specified in the given substate
-if not opts.get(r'dry_run'):
+if not opts.get('dry_run'):
 self.get(substate, overwrite=True)
 def filerevert(self, *pats, **opts):
-ctx = self._repo[opts[r'rev']]
+ctx = self._repo[opts['rev']]
 parents = self._repo.dirstate.parents()
-if opts.get(r'all'):
+if opts.get('all'):
 pats = [b'set:modified()']
 else:
 pats = []
 cmdutil.revert(self.ui, self._repo, ctx, parents, *pats, **opts)
 cmd = [self._exe]
 extrakw = {}
 if not self.ui.interactive():
 # Making stdin be a pipe should prevent svn from behaving
 # interactively even if we can't pass --non-interactive.
-extrakw[r'stdin'] = subprocess.PIPE
+extrakw['stdin'] = subprocess.PIPE
 # Starting in svn 1.5 --non-interactive is a global flag
 # instead of being per-command, but we need to support 1.4 so
 # we have to be intelligent about what commands take
 # --non-interactive.
 if commands[0] in (b'update', b'checkout', b'commit'):
 # Get the working directory revision as well as the last
 # commit revision so we can compare the subrepo state with
 # both. We used to store the working directory one.
 output, err = self._svncommand([b'info', b'--xml'])
 doc = xml.dom.minidom.parseString(output)
-entries = doc.getElementsByTagName(r'entry')
+entries = doc.getElementsByTagName('entry')
 lastrev, rev = b'0', b'0'
 if entries:
-rev = pycompat.bytestr(entries[0].getAttribute(r'revision')) or b'0'
+rev = pycompat.bytestr(entries[0].getAttribute('revision')) or b'0'
-commits = entries[0].getElementsByTagName(r'commit')
+commits = entries[0].getElementsByTagName('commit')
 if commits:
 lastrev = (
-pycompat.bytestr(commits[0].getAttribute(r'revision'))
+pycompat.bytestr(commits[0].getAttribute('revision'))
 or b'0'
 )
 return (lastrev, rev)
 def _wcrev(self):
 is True if any change is a missing entry.
 """
 output, err = self._svncommand([b'status', b'--xml'])
 externals, changes, missing = [], [], []
 doc = xml.dom.minidom.parseString(output)
-for e in doc.getElementsByTagName(r'entry'):
+for e in doc.getElementsByTagName('entry'):
-s = e.getElementsByTagName(r'wc-status')
+s = e.getElementsByTagName('wc-status')
 if not s:
 continue
-item = s[0].getAttribute(r'item')
+item = s[0].getAttribute('item')
-props = s[0].getAttribute(r'props')
+props = s[0].getAttribute('props')
-path = e.getAttribute(r'path').encode('utf8')
+path = e.getAttribute('path').encode('utf8')
-if item == r'external':
+if item == 'external':
 externals.append(path)
-elif item == r'missing':
+elif item == 'missing':
 missing.append(path)
 if item not in (
-r'',
+'',
-r'normal',
+'normal',
-r'unversioned',
+'unversioned',
-r'external',
+'external',
-) or props not in (r'', r'none', r'normal'):
+) or props not in ('', 'none', 'normal'):
 changes.append(path)
 for path in changes:
 for ext in externals:
 if path == ext or path.startswith(ext + pycompat.ossep):
 return True, True, bool(missing)
 @annotatesubrepoerror
 def files(self):
 output = self._svncommand([b'list', b'--recursive', b'--xml'])[0]
 doc = xml.dom.minidom.parseString(output)
 paths = []
-for e in doc.getElementsByTagName(r'entry'):
+for e in doc.getElementsByTagName('entry'):
-kind = pycompat.bytestr(e.getAttribute(r'kind'))
+kind = pycompat.bytestr(e.getAttribute('kind'))
 if kind != b'file':
 continue
-name = r''.join(
+name = ''.join(
 c.data
-for c in e.getElementsByTagName(r'name')[0].childNodes
+for c in e.getElementsByTagName('name')[0].childNodes
 if c.nodeType == c.TEXT_NODE
 )
 paths.append(name.encode('utf8'))
 return paths
 if f in tracked:  # hg prints 'adding' even if already tracked
 if exact:
 rejected.append(f)
 continue
-if not opts.get(r'dry_run'):
+if not opts.get('dry_run'):
 self._gitcommand(command + [f])
 for f in rejected:
 ui.warn(_(b"%s already tracked!\n") % uipathfn(f))
 # Parse git's native archive command.
 # This should be much faster than manually traversing the trees
 # and objects with many subprocess calls.
 tarstream = self._gitcommand([b'archive', revision], stream=True)
-tar = tarfile.open(fileobj=tarstream, mode=r'r|')
+tar = tarfile.open(fileobj=tarstream, mode='r|')
 relpath = subrelpath(self)
 progress = self.ui.makeprogress(
 _(b'archiving (%s)') % relpath, unit=_(b'files')
 )
 progress.update(0)
 removed.append(f)
 deleted, unknown, ignored, clean = [], [], [], []
 command = [b'status', b'--porcelain', b'-z']
-if opts.get(r'unknown'):
+if opts.get('unknown'):
 command += [b'--untracked-files=all']
-if opts.get(r'ignored'):
+if opts.get('ignored'):
 command += [b'--ignored']
 out = self._gitcommand(command)
 changedfiles = set()
 changedfiles.update(modified)
 if st == b'??':
 unknown.append(filename1)
 elif st == b'!!':
 ignored.append(filename1)
-if opts.get(r'clean'):
+if opts.get('clean'):
 out = self._gitcommand([b'ls-files'])
 for f in out.split(b'\n'):
 if not f in changedfiles:
 clean.append(f)
 @annotatesubrepoerror
 def diff(self, ui, diffopts, node2, match, prefix, **opts):
 node1 = self._state[1]
 cmd = [b'diff', b'--no-renames']
-if opts[r'stat']:
+if opts['stat']:
 cmd.append(b'--stat')
 else:
 # for Git, this also implies '-p'
 cmd.append(b'-U%d' % diffopts.context)
 ui.write(output)
 @annotatesubrepoerror
 def revert(self, substate, *pats, **opts):
 self.ui.status(_(b'reverting subrepo %s\n') % substate[0])
-if not opts.get(r'no_backup'):
+if not opts.get('no_backup'):
 status = self.status(None)
 names = status.modified
 for name in names:
 # backuppath() expects a path relative to the parent repo (the
 # repo that ui.origbackuppath is relative to)
 _(b'saving current version of %s as %s\n')
 % (name, os.path.relpath(bakname))
 )
 util.rename(self.wvfs.join(name), bakname)
-if not opts.get(r'dry_run'):
+if not opts.get('dry_run'):
 self.get(substate, overwrite=True)
 return []
 def shortid(self, revid):
 return revid[:7]

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 43554:9f70512ae2cf