facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

dirstate: factor common update code into _addpath

Browse Source 
Factor update code common to all callers of _addpath into _addpath.
By centralizing the update code here, it provides one place to put
updates to new data structures - in a future patch.  It also removes
a few lines of duplicate code.
This commit is contained in:
Joshua Redstone 2012-06-18 08:06:42 -07:00
parent d0ed8e9722
commit bb82354578
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mercurial/dirstate.py
View File

@ -312,7 +312,8 @@ class dirstate(object):
if self[f] not in "?r" and "_dirs" in self.__dict__:
_decdirs(self._dirs, f)
def _addpath(self, f, check=False):
def _addpath(self, f, state, mode, size, mtime, check=False):
assert state not in "?r"
oldstate = self[f]
if check or oldstate == "r":
scmutil.checkfilename(f)
@ -327,14 +328,14 @@ class dirstate(object):
_('file %r in dirstate clashes with %r') % (d, f))
if oldstate in "?r" and "_dirs" in self.__dict__:
_incdirs(self._dirs, f)
self._dirty = True
self._map[f] = (state, mode, size, mtime)
def normal(self, f):
'''Mark a file normal and clean.'''
self._dirty = True
self._addpath(f)
s = os.lstat(self._join(f))
mtime = int(s.st_mtime)
self._map[f] = ('n', s.st_mode, s.st_size, mtime)
self._addpath(f, 'n', s.st_mode, s.st_size, mtime)
if f in self._copymap:
del self._copymap[f]
if mtime > self._lastnormaltime:
@ -361,9 +362,7 @@ class dirstate(object):
return
if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2:
return
self._dirty = True
self._addpath(f)
self._map[f] = ('n', 0, -1, -1)
self._addpath(f, 'n', 0, -1, -1)
if f in self._copymap:
del self._copymap[f]
@ -372,17 +371,13 @@ class dirstate(object):
if self._pl[1] == nullid:
raise util.Abort(_("setting %r to other parent "
"only allowed in merges") % f)
self._dirty = True
self._addpath(f)
self._map[f] = ('n', 0, -2, -1)
self._addpath(f, 'n', 0, -2, -1)
if f in self._copymap:
del self._copymap[f]
def add(self, f):
'''Mark a file added.'''
self._dirty = True
self._addpath(f, True)
self._map[f] = ('a', 0, -1, -1)
self._addpath(f, 'a', 0, -1, -1, True)
if f in self._copymap:
del self._copymap[f]
@ -406,10 +401,8 @@ class dirstate(object):
'''Mark a file merged.'''
if self._pl[1] == nullid:
return self.normallookup(f)
self._dirty = True
s = os.lstat(self._join(f))
self._addpath(f)
self._map[f] = ('m', s.st_mode, s.st_size, int(s.st_mtime))
self._addpath(f, 'm', s.st_mode, s.st_size, int(s.st_mtime))
if f in self._copymap:
del self._copymap[f]