Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 41768: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 |
line wrap: on
line diff
--- a/mercurial/merge.py Sun Jan 13 20:13:22 2019 -0500 +++ b/mercurial/merge.py Wed Feb 20 19:28:51 2019 -0500 @@ -391,9 +391,9 @@ """ # Check local variables before looking at filesystem for performance # reasons. - return bool(self._local) or bool(self._state) or \ - self._repo.vfs.exists(self.statepathv1) or \ - self._repo.vfs.exists(self.statepathv2) + return (bool(self._local) or bool(self._state) or + self._repo.vfs.exists(self.statepathv1) or + self._repo.vfs.exists(self.statepathv2)) def commit(self): """Write current state on disk (if necessary)"""