equal
deleted
inserted
replaced
692 if not self._dirty: |
692 if not self._dirty: |
693 return |
693 return |
694 |
694 |
695 filename = self._filename |
695 filename = self._filename |
696 if tr is False: # not explicitly specified |
696 if tr is False: # not explicitly specified |
697 if (self._ui.configbool('devel', 'all-warnings') |
697 self._ui.develwarn('use dirstate.write with ' |
698 or self._ui.configbool('devel', 'check-dirstate-write')): |
698 'repo.currenttransaction()', |
699 self._ui.develwarn('use dirstate.write with ' |
699 config='check-dirstate-write') |
700 'repo.currenttransaction()') |
|
701 |
700 |
702 if self._opener.lexists(self._pendingfilename): |
701 if self._opener.lexists(self._pendingfilename): |
703 # if pending file already exists, in-memory changes |
702 # if pending file already exists, in-memory changes |
704 # should be written into it, because it has priority |
703 # should be written into it, because it has priority |
705 # to '.hg/dirstate' at reading under HG_PENDING mode |
704 # to '.hg/dirstate' at reading under HG_PENDING mode |