From patchwork Sun Oct 3 00:40:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D11589: dirstate: drop some duplicated code From: phabricator X-Patchwork-Id: 49913 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Sun, 3 Oct 2021 00:40:05 +0000 marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The same operation is done a handful a line lower. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11589 AFFECTED FILES mercurial/dirstate.py CHANGE DETAILS To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -582,17 +582,8 @@ # this mean we are doing call for file we do not really care about the # data (eg: added or removed), however this should be a minor overhead # compared to the overall update process calling this. - if need_parent_file_data: - if parentfiledata is None: - parentfiledata = self._get_filedata(filename) - mtime = parentfiledata[2] - - if mtime > self._lastnormaltime: - # Remember the most recent modification timeslot for - # status(), to make sure we won't miss future - # size-preserving file content modifications that happen - # within the same timeslot. - self._lastnormaltime = mtime + if need_parent_file_data or parentfiledata is None: + parentfiledata = self._get_filedata(filename) self._map.reset_state( filename,