Mercurial > hg
comparison mercurial/cmdutil.py @ 48100:571dd808c6c8
dirstate-item: use `maybe_clean` instead of `state` in record
Differential Revision: https://phab.mercurial-scm.org/D11537
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 29 Sep 2021 17:42:57 +0200 |
| parents | 56297381af90 |
| children | 304267b077de |
comparison
equal
deleted
inserted
replaced
| 48099:e0d566f3ffce | 48100:571dd808c6c8 |
|---|---|
| 624 try: | 624 try: |
| 625 dirstate = repo.dirstate | 625 dirstate = repo.dirstate |
| 626 for realname, tmpname in pycompat.iteritems(backups): | 626 for realname, tmpname in pycompat.iteritems(backups): |
| 627 ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) | 627 ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) |
| 628 | 628 |
| 629 if dirstate[realname] == b'n': | 629 if dirstate.get_entry(realname).maybe_clean: |
| 630 # without normallookup, restoring timestamp | 630 # without normallookup, restoring timestamp |
| 631 # may cause partially committed files | 631 # may cause partially committed files |
| 632 # to be treated as unmodified | 632 # to be treated as unmodified |
| 633 | 633 |
| 634 # XXX-PENDINGCHANGE: We should clarify the context in | 634 # XXX-PENDINGCHANGE: We should clarify the context in |