Show More
@@ -413,14 +413,7 b' class mergestate(object):' | |||||
413 | Returns True if there appears to be mergestate. This is a rough proxy |
|
413 | Returns True if there appears to be mergestate. This is a rough proxy | |
414 | for "is a merge in progress." |
|
414 | for "is a merge in progress." | |
415 | """ |
|
415 | """ | |
416 | # Check local variables before looking at filesystem for performance |
|
416 | return bool(self._local) or bool(self._state) | |
417 | # reasons. |
|
|||
418 | return ( |
|
|||
419 | bool(self._local) |
|
|||
420 | or bool(self._state) |
|
|||
421 | or self._repo.vfs.exists(self.statepathv1) |
|
|||
422 | or self._repo.vfs.exists(self.statepathv2) |
|
|||
423 | ) |
|
|||
424 |
|
417 | |||
425 | def commit(self): |
|
418 | def commit(self): | |
426 | """Write current state on disk (if necessary)""" |
|
419 | """Write current state on disk (if necessary)""" |
General Comments 0
You need to be logged in to leave comments.
Login now