Mercurial > public > mercurial-scm > hg
comparison hgext/fastannotate/support.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 | de358da72eb1 |
comparison
equal
deleted
inserted
replaced
| 43116:defabf63e969 | 43117:8ff1ecfadcd1 |
|---|---|
| 114 ) | 114 ) |
| 115 try: | 115 try: |
| 116 return _doannotate(self, follow, diffopts) | 116 return _doannotate(self, follow, diffopts) |
| 117 except Exception as ex: | 117 except Exception as ex: |
| 118 self._repo.ui.debug( | 118 self._repo.ui.debug( |
| 119 b'fastannotate: falling back to the vanilla ' b'annotate: %r\n' % ex | 119 b'fastannotate: falling back to the vanilla annotate: %r\n' % ex |
| 120 ) | 120 ) |
| 121 return orig(self, follow=follow, skiprevs=skiprevs, diffopts=diffopts) | 121 return orig(self, follow=follow, skiprevs=skiprevs, diffopts=diffopts) |
| 122 | 122 |
| 123 | 123 |
| 124 def _remotefctxannotate(orig, self, follow=False, skiprevs=None, diffopts=None): | 124 def _remotefctxannotate(orig, self, follow=False, skiprevs=None, diffopts=None): |