Mercurial > hg
comparison mercurial/mdiff.py @ 43117:8ff1ecfadcd1
cleanup: join string literals that are already on one line
Thanks to Kyle for noticing this and for providing the regular
expression to run on the codebase.
This patch has been reviewed by the test suite and they approved of
it.
# skip-blame: fallout from mass reformatting
Differential Revision: https://phab.mercurial-scm.org/D7028
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 08 Oct 2019 15:06:18 -0700 |
parents | c59eb1560c44 |
children | f2f460cdb4f5 |
comparison
equal
deleted
inserted
replaced
43116:defabf63e969 | 43117:8ff1ecfadcd1 |
---|---|
81 | 81 |
82 try: | 82 try: |
83 self.context = int(self.context) | 83 self.context = int(self.context) |
84 except ValueError: | 84 except ValueError: |
85 raise error.Abort( | 85 raise error.Abort( |
86 _(b'diff context lines count must be ' b'an integer, not %r') | 86 _(b'diff context lines count must be an integer, not %r') |
87 % pycompat.bytestr(self.context) | 87 % pycompat.bytestr(self.context) |
88 ) | 88 ) |
89 | 89 |
90 def copy(self, **kwargs): | 90 def copy(self, **kwargs): |
91 opts = dict((k, getattr(self, k)) for k in self.defaults) | 91 opts = dict((k, getattr(self, k)) for k in self.defaults) |