Show More
@@ -460,7 +460,7 b' def overridestatus(' | |||||
460 | f = open(fn, 'wb') |
|
460 | f = open(fn, 'wb') | |
461 | else: |
|
461 | else: | |
462 | fn = 'fsmonitorfail.log' |
|
462 | fn = 'fsmonitorfail.log' | |
463 |
f = self.open |
|
463 | f = self.vfs.open(fn, 'wb') | |
464 | except (IOError, OSError): |
|
464 | except (IOError, OSError): | |
465 | self.ui.warn(_('warning: unable to write to %s\n') % fn) |
|
465 | self.ui.warn(_('warning: unable to write to %s\n') % fn) | |
466 | return |
|
466 | return | |
@@ -564,8 +564,10 b' def overridestatus(' | |||||
564 | self.ui.fout, self.ui.ferr = fout, ferr |
|
564 | self.ui.fout, self.ui.ferr = fout, ferr | |
565 |
|
565 | |||
566 | # clean isn't tested since it's set to True above |
|
566 | # clean isn't tested since it's set to True above | |
567 | _cmpsets([modified, added, removed, deleted, unknown, ignored, clean], |
|
567 | with self.wlock(): | |
568 | rv2) |
|
568 | _cmpsets( | |
|
569 | [modified, added, removed, deleted, unknown, ignored, clean], | |||
|
570 | rv2) | |||
569 | modified, added, removed, deleted, unknown, ignored, clean = rv2 |
|
571 | modified, added, removed, deleted, unknown, ignored, clean = rv2 | |
570 |
|
572 | |||
571 | return scmutil.status( |
|
573 | return scmutil.status( |
General Comments 0
You need to be logged in to leave comments.
Login now