equal
deleted
inserted
replaced
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() |