Patchwork D10930: dirstate: add default value to _addpath

login
register
mail settings
Submitter phabricator
Date July 2, 2021, 3:18 p.m.
Message ID <differential-rev-PHID-DREV-435geywyvhzzmwpz2qkx-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49244/
State Superseded
Headers show

Comments

phabricator - July 2, 2021, 3:18 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  We want to remove the magic value usage from the higher level, so lets stop
  passing them explicitely when possible.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10930

AFFECTED FILES
  mercurial/dirstate.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -438,7 +438,7 @@ 
     def copies(self):
         return self._map.copymap
 
-    def _addpath(self, f, state, mode, size, mtime):
+    def _addpath(self, f, state, mode, size=NONNORMAL, mtime=AMBIGUOUS_TIME):
         oldstate = self[f]
         if state == b'a' or oldstate == b'r':
             scmutil.checkfilename(f)
@@ -509,7 +509,7 @@ 
                     return
                 if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2:
                     return
-        self._addpath(f, b'n', 0, NONNORMAL, AMBIGUOUS_TIME)
+        self._addpath(f, b'n', 0)
         self._map.copymap.pop(f, None)
 
     def otherparent(self, f):
@@ -519,15 +519,15 @@ 
             raise error.Abort(msg)
         if f in self and self[f] == b'n':
             # merge-like
-            self._addpath(f, b'm', 0, FROM_P2, AMBIGUOUS_TIME)
+            self._addpath(f, b'm', 0, FROM_P2)
         else:
             # add-like
-            self._addpath(f, b'n', 0, FROM_P2, AMBIGUOUS_TIME)
+            self._addpath(f, b'n', 0, FROM_P2)
         self._map.copymap.pop(f, None)
 
     def add(self, f):
         '''Mark a file added.'''
-        self._addpath(f, b'a', 0, NONNORMAL, AMBIGUOUS_TIME)
+        self._addpath(f, b'a', 0)
         self._map.copymap.pop(f, None)
 
     def remove(self, f):