equal
deleted
inserted
replaced
1322 self._repo.dirstate.endparentchange() |
1322 self._repo.dirstate.endparentchange() |
1323 |
1323 |
1324 # write changes out explicitly, because nesting wlock at |
1324 # write changes out explicitly, because nesting wlock at |
1325 # runtime may prevent 'wlock.release()' in 'repo.commit()' |
1325 # runtime may prevent 'wlock.release()' in 'repo.commit()' |
1326 # from immediately doing so for subsequent changing files |
1326 # from immediately doing so for subsequent changing files |
1327 self._repo.dirstate.write() |
1327 self._repo.dirstate.write(self._repo.currenttransaction()) |
1328 |
1328 |
1329 class workingctx(committablectx): |
1329 class workingctx(committablectx): |
1330 """A workingctx object makes access to data related to |
1330 """A workingctx object makes access to data related to |
1331 the current working directory convenient. |
1331 the current working directory convenient. |
1332 date - any valid date string or (unixtime, offset), or None. |
1332 date - any valid date string or (unixtime, offset), or None. |
1528 for f in fixup: |
1528 for f in fixup: |
1529 normal(f) |
1529 normal(f) |
1530 # write changes out explicitly, because nesting |
1530 # write changes out explicitly, because nesting |
1531 # wlock at runtime may prevent 'wlock.release()' |
1531 # wlock at runtime may prevent 'wlock.release()' |
1532 # below from doing so for subsequent changing files |
1532 # below from doing so for subsequent changing files |
1533 self._repo.dirstate.write() |
1533 self._repo.dirstate.write(self._repo.currenttransaction()) |
1534 finally: |
1534 finally: |
1535 wlock.release() |
1535 wlock.release() |
1536 except error.LockError: |
1536 except error.LockError: |
1537 pass |
1537 pass |
1538 return modified, fixup |
1538 return modified, fixup |