Mercurial > hg
comparison mercurial/merge.py @ 41759:aaad36b88298
cleanup: use () to wrap long lines instead of \
This is a little less brittle, and often helps indentation. In a
surprising number of cases the entire cleanup was deleting the \, as
the expression was *already* parenthesized in a workable way.
Differential Revision: https://phab.mercurial-scm.org/D5993
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 20 Feb 2019 19:28:51 -0500 |
parents | ac8cf125d8d5 |
children | 02fa567f8a3c |
comparison
equal
deleted
inserted
replaced
41758:15d3facfa40a | 41759:aaad36b88298 |
---|---|
389 Returns True if there appears to be mergestate. This is a rough proxy | 389 Returns True if there appears to be mergestate. This is a rough proxy |
390 for "is a merge in progress." | 390 for "is a merge in progress." |
391 """ | 391 """ |
392 # Check local variables before looking at filesystem for performance | 392 # Check local variables before looking at filesystem for performance |
393 # reasons. | 393 # reasons. |
394 return bool(self._local) or bool(self._state) or \ | 394 return (bool(self._local) or bool(self._state) or |
395 self._repo.vfs.exists(self.statepathv1) or \ | 395 self._repo.vfs.exists(self.statepathv1) or |
396 self._repo.vfs.exists(self.statepathv2) | 396 self._repo.vfs.exists(self.statepathv2)) |
397 | 397 |
398 def commit(self): | 398 def commit(self): |
399 """Write current state on disk (if necessary)""" | 399 """Write current state on disk (if necessary)""" |
400 if self._dirty: | 400 if self._dirty: |
401 records = self._makerecords() | 401 records = self._makerecords() |