Mercurial > hg
comparison hgext/commitextras.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 | 4aa72cdf616f |
children | 45a073af50a2 |
comparison
equal
deleted
inserted
replaced
43505:47fac1692ede | 43506:9f70512ae2cf |
---|---|
56 if util.safehasattr(repo, 'unfiltered'): | 56 if util.safehasattr(repo, 'unfiltered'): |
57 repo = repo.unfiltered() | 57 repo = repo.unfiltered() |
58 | 58 |
59 class repoextra(repo.__class__): | 59 class repoextra(repo.__class__): |
60 def commit(self, *innerpats, **inneropts): | 60 def commit(self, *innerpats, **inneropts): |
61 extras = opts.get(r'extra') | 61 extras = opts.get('extra') |
62 for raw in extras: | 62 for raw in extras: |
63 if b'=' not in raw: | 63 if b'=' not in raw: |
64 msg = _( | 64 msg = _( |
65 b"unable to parse '%s', should follow " | 65 b"unable to parse '%s', should follow " |
66 b"KEY=VALUE format" | 66 b"KEY=VALUE format" |
80 msg = _( | 80 msg = _( |
81 b"key '%s' is used internally, can't be set " | 81 b"key '%s' is used internally, can't be set " |
82 b"manually" | 82 b"manually" |
83 ) | 83 ) |
84 raise error.Abort(msg % k) | 84 raise error.Abort(msg % k) |
85 inneropts[r'extra'][k] = v | 85 inneropts['extra'][k] = v |
86 return super(repoextra, self).commit(*innerpats, **inneropts) | 86 return super(repoextra, self).commit(*innerpats, **inneropts) |
87 | 87 |
88 repo.__class__ = repoextra | 88 repo.__class__ = repoextra |
89 return orig(ui, repo, *pats, **opts) | 89 return orig(ui, repo, *pats, **opts) |