| Alphare |
| hg-reviewers |
The serialization function is already doing this, so we don't need to do it
manually. We just need to propagate the right definition of "now".
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (16 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| filename = self._filename | filename = self._filename | ||||
| if tr: | if tr: | ||||
| # 'dirstate.write()' is not only for writing in-memory | # 'dirstate.write()' is not only for writing in-memory | ||||
| # changes out, but also for dropping ambiguous timestamp. | # changes out, but also for dropping ambiguous timestamp. | ||||
| # delayed writing re-raise "ambiguous timestamp issue". | # delayed writing re-raise "ambiguous timestamp issue". | ||||
| # See also the wiki page below for detail: | # See also the wiki page below for detail: | ||||
| # https://www.mercurial-scm.org/wiki/DirstateTransactionPlan | # https://www.mercurial-scm.org/wiki/DirstateTransactionPlan | ||||
| # emulate dropping timestamp in 'parsers.pack_dirstate' | # record when mtime start to be ambiguous | ||||
| now = _getfsnow(self._opener) | now = _getfsnow(self._opener) | ||||
| self._map.clearambiguoustimes(self._updatedfiles, now) | |||||
| # emulate that all 'dirstate.normal' results are written out | # emulate that all 'dirstate.normal' results are written out | ||||
| self._lastnormaltime = 0 | |||||
| self._updatedfiles.clear() | self._updatedfiles.clear() | ||||
| # delay writing in-memory changes out | # delay writing in-memory changes out | ||||
| tr.addfilegenerator( | tr.addfilegenerator( | ||||
| b'dirstate', | b'dirstate', | ||||
| (self._filename,), | (self._filename,), | ||||
| lambda f: self._writedirstate(tr, f), | lambda f: self._writedirstate(tr, f, now=now), | ||||
| location=b'plain', | location=b'plain', | ||||
| ) | ) | ||||
| return | return | ||||
| st = self._opener(filename, b"w", atomictemp=True, checkambig=True) | st = self._opener(filename, b"w", atomictemp=True, checkambig=True) | ||||
| self._writedirstate(tr, st) | self._writedirstate(tr, st) | ||||
| def addparentchangecallback(self, category, callback): | def addparentchangecallback(self, category, callback): | ||||
| """add a callback to be called when the wd parents are changed | """add a callback to be called when the wd parents are changed | ||||
| Callback will be called with the following arguments: | Callback will be called with the following arguments: | ||||
| dirstate, (oldp1, oldp2), (newp1, newp2) | dirstate, (oldp1, oldp2), (newp1, newp2) | ||||
| Category is a unique identifier to allow overwriting an old callback | Category is a unique identifier to allow overwriting an old callback | ||||
| with a newer callback. | with a newer callback. | ||||
| """ | """ | ||||
| self._plchangecallbacks[category] = callback | self._plchangecallbacks[category] = callback | ||||
| def _writedirstate(self, tr, st): | def _writedirstate(self, tr, st, now=None): | ||||
| # notify callbacks about parents change | # notify callbacks about parents change | ||||
| if self._origpl is not None and self._origpl != self._pl: | if self._origpl is not None and self._origpl != self._pl: | ||||
| for c, callback in sorted( | for c, callback in sorted( | ||||
| pycompat.iteritems(self._plchangecallbacks) | pycompat.iteritems(self._plchangecallbacks) | ||||
| ): | ): | ||||
| callback(self, self._origpl, self._pl) | callback(self, self._origpl, self._pl) | ||||
| self._origpl = None | self._origpl = None | ||||
| if now is None: | |||||
| # use the modification time of the newly created temporary file as the | # use the modification time of the newly created temporary file as the | ||||
| # filesystem's notion of 'now' | # filesystem's notion of 'now' | ||||
| now = util.fstat(st)[stat.ST_MTIME] & _rangemask | now = util.fstat(st)[stat.ST_MTIME] & _rangemask | ||||
| # enough 'delaywrite' prevents 'pack_dirstate' from dropping | # enough 'delaywrite' prevents 'pack_dirstate' from dropping | ||||
| # timestamp of each entries in dirstate, because of 'now > mtime' | # timestamp of each entries in dirstate, because of 'now > mtime' | ||||
| delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite') | delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite') | ||||
| if delaywrite > 0: | if delaywrite > 0: | ||||
| # do we have any files to delay for? | # do we have any files to delay for? | ||||
| for f, e in pycompat.iteritems(self._map): | for f, e in pycompat.iteritems(self._map): | ||||
| if e.need_delay(now): | if e.need_delay(now): | ||||