comparison hgext/eol.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 649d3ac37a12
children d38f9117ee15
comparison
equal deleted inserted replaced
43116:defabf63e969 43117:8ff1ecfadcd1
458 # be able to say "** = native" to automatically 458 # be able to say "** = native" to automatically
459 # have all non-binary files taken care of. 459 # have all non-binary files taken care of.
460 continue 460 continue
461 if inconsistenteol(data): 461 if inconsistenteol(data):
462 raise errormod.Abort( 462 raise errormod.Abort(
463 _(b"inconsistent newline style " b"in %s\n") % f 463 _(b"inconsistent newline style in %s\n") % f
464 ) 464 )
465 return super(eolrepo, self).commitctx(ctx, error, origctx) 465 return super(eolrepo, self).commitctx(ctx, error, origctx)
466 466
467 repo.__class__ = eolrepo 467 repo.__class__ = eolrepo
468 repo._hgcleardirstate() 468 repo._hgcleardirstate()