2005-08-28 01:21:25 +04:00
|
|
|
"""
|
|
|
|
dirstate.py - working directory tracking for mercurial
|
|
|
|
|
2007-06-19 10:51:34 +04:00
|
|
|
Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
This software may be used and distributed according to the terms
|
|
|
|
of the GNU General Public License, incorporated herein by reference.
|
|
|
|
"""
|
|
|
|
|
2008-03-07 00:23:26 +03:00
|
|
|
from node import nullid
|
2006-12-15 05:25:19 +03:00
|
|
|
from i18n import _
|
2008-09-13 19:46:47 +04:00
|
|
|
import struct, os, stat, util, errno, ignore
|
2008-10-13 00:21:08 +04:00
|
|
|
import cStringIO, osutil, sys, parsers
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2007-06-18 22:24:34 +04:00
|
|
|
_unknown = ('?', 0, 0, 0)
|
|
|
|
_format = ">cllll"
|
|
|
|
|
2008-07-12 03:46:02 +04:00
|
|
|
def _finddirs(path):
|
2008-09-13 04:57:07 +04:00
|
|
|
pos = path.rfind('/')
|
|
|
|
while pos != -1:
|
2008-07-12 03:46:02 +04:00
|
|
|
yield path[:pos]
|
2008-09-13 04:57:07 +04:00
|
|
|
pos = path.rfind('/', 0, pos)
|
2008-07-12 03:46:02 +04:00
|
|
|
|
2008-10-15 03:14:29 +04:00
|
|
|
def _incdirs(dirs, path):
|
|
|
|
for base in _finddirs(path):
|
|
|
|
if base in dirs:
|
|
|
|
dirs[base] += 1
|
|
|
|
return
|
|
|
|
dirs[base] = 1
|
|
|
|
|
|
|
|
def _decdirs(dirs, path):
|
|
|
|
for base in _finddirs(path):
|
|
|
|
if dirs[base] > 1:
|
|
|
|
dirs[base] -= 1
|
|
|
|
return
|
|
|
|
del dirs[base]
|
|
|
|
|
2005-11-19 09:48:47 +03:00
|
|
|
class dirstate(object):
|
2006-06-04 04:25:27 +04:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def __init__(self, opener, ui, root):
|
2007-06-18 22:24:34 +04:00
|
|
|
self._opener = opener
|
|
|
|
self._root = root
|
2008-09-02 17:12:50 +04:00
|
|
|
self._rootdir = os.path.join(root, '')
|
2007-07-22 01:02:09 +04:00
|
|
|
self._dirty = False
|
2007-07-22 01:44:38 +04:00
|
|
|
self._dirtypl = False
|
2007-06-18 22:24:34 +04:00
|
|
|
self._ui = ui
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2007-06-18 22:24:33 +04:00
|
|
|
def __getattr__(self, name):
|
2007-06-18 22:24:34 +04:00
|
|
|
if name == '_map':
|
2007-06-18 22:24:34 +04:00
|
|
|
self._read()
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._map
|
|
|
|
elif name == '_copymap':
|
2007-06-18 22:24:34 +04:00
|
|
|
self._read()
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._copymap
|
2008-06-06 22:23:29 +04:00
|
|
|
elif name == '_foldmap':
|
|
|
|
_foldmap = {}
|
|
|
|
for name in self._map:
|
2008-10-01 01:23:08 +04:00
|
|
|
norm = os.path.normcase(name)
|
2008-06-06 22:23:29 +04:00
|
|
|
_foldmap[norm] = name
|
|
|
|
self._foldmap = _foldmap
|
|
|
|
return self._foldmap
|
2007-06-18 22:24:33 +04:00
|
|
|
elif name == '_branch':
|
|
|
|
try:
|
2007-06-19 10:06:37 +04:00
|
|
|
self._branch = (self._opener("branch").read().strip()
|
|
|
|
or "default")
|
2007-06-18 22:24:33 +04:00
|
|
|
except IOError:
|
|
|
|
self._branch = "default"
|
|
|
|
return self._branch
|
2007-06-18 22:24:34 +04:00
|
|
|
elif name == '_pl':
|
|
|
|
self._pl = [nullid, nullid]
|
2007-06-18 22:24:33 +04:00
|
|
|
try:
|
2007-06-18 22:24:34 +04:00
|
|
|
st = self._opener("dirstate").read(40)
|
2007-06-18 22:24:33 +04:00
|
|
|
if len(st) == 40:
|
2007-06-18 22:24:34 +04:00
|
|
|
self._pl = st[:20], st[20:40]
|
2007-06-18 22:24:33 +04:00
|
|
|
except IOError, err:
|
|
|
|
if err.errno != errno.ENOENT: raise
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._pl
|
2007-06-18 22:24:34 +04:00
|
|
|
elif name == '_dirs':
|
2008-07-12 03:46:02 +04:00
|
|
|
dirs = {}
|
2008-09-13 04:57:07 +04:00
|
|
|
for f,s in self._map.iteritems():
|
2008-07-12 03:46:02 +04:00
|
|
|
if s[0] != 'r':
|
2008-10-15 03:14:29 +04:00
|
|
|
_incdirs(dirs, f)
|
2008-07-12 03:46:02 +04:00
|
|
|
self._dirs = dirs
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._dirs
|
2007-06-18 22:24:34 +04:00
|
|
|
elif name == '_ignore':
|
2007-07-22 01:02:09 +04:00
|
|
|
files = [self._join('.hgignore')]
|
2007-06-18 22:24:34 +04:00
|
|
|
for name, path in self._ui.configitems("ui"):
|
|
|
|
if name == 'ignore' or name.startswith('ignore.'):
|
|
|
|
files.append(os.path.expanduser(path))
|
2007-06-18 22:24:34 +04:00
|
|
|
self._ignore = ignore.ignore(self._root, files, self._ui.warn)
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._ignore
|
2007-06-18 22:24:34 +04:00
|
|
|
elif name == '_slash':
|
2007-06-18 22:24:34 +04:00
|
|
|
self._slash = self._ui.configbool('ui', 'slash') and os.sep != '/'
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._slash
|
2008-06-26 22:46:34 +04:00
|
|
|
elif name == '_checklink':
|
|
|
|
self._checklink = util.checklink(self._root)
|
|
|
|
return self._checklink
|
2008-03-14 15:56:58 +03:00
|
|
|
elif name == '_checkexec':
|
|
|
|
self._checkexec = util.checkexec(self._root)
|
|
|
|
return self._checkexec
|
2008-06-26 22:58:24 +04:00
|
|
|
elif name == '_checkcase':
|
|
|
|
self._checkcase = not util.checkcase(self._join('.hg'))
|
|
|
|
return self._checkcase
|
2008-06-06 22:23:29 +04:00
|
|
|
elif name == 'normalize':
|
2008-06-26 22:58:24 +04:00
|
|
|
if self._checkcase:
|
2008-06-06 22:23:29 +04:00
|
|
|
self.normalize = self._normalize
|
|
|
|
else:
|
2008-10-01 01:23:08 +04:00
|
|
|
self.normalize = lambda x, y=False: x
|
2008-06-06 22:23:29 +04:00
|
|
|
return self.normalize
|
2007-06-18 22:24:33 +04:00
|
|
|
else:
|
2008-09-08 15:07:00 +04:00
|
|
|
raise AttributeError(name)
|
2007-06-18 22:24:33 +04:00
|
|
|
|
2007-07-22 01:02:09 +04:00
|
|
|
def _join(self, f):
|
2008-09-02 17:12:50 +04:00
|
|
|
# much faster than os.path.join()
|
2008-09-02 19:32:07 +04:00
|
|
|
# it's safe because f is always a relative path
|
2008-09-02 17:12:50 +04:00
|
|
|
return self._rootdir + f
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2008-06-26 22:46:34 +04:00
|
|
|
def flagfunc(self, fallback):
|
|
|
|
if self._checklink:
|
|
|
|
if self._checkexec:
|
|
|
|
def f(x):
|
2008-09-02 17:12:50 +04:00
|
|
|
p = self._join(x)
|
2008-06-26 22:46:34 +04:00
|
|
|
if os.path.islink(p):
|
|
|
|
return 'l'
|
|
|
|
if util.is_exec(p):
|
|
|
|
return 'x'
|
|
|
|
return ''
|
|
|
|
return f
|
|
|
|
def f(x):
|
2008-09-02 17:12:50 +04:00
|
|
|
if os.path.islink(self._join(x)):
|
2008-06-26 22:46:34 +04:00
|
|
|
return 'l'
|
|
|
|
if 'x' in fallback(x):
|
|
|
|
return 'x'
|
|
|
|
return ''
|
|
|
|
return f
|
|
|
|
if self._checkexec:
|
|
|
|
def f(x):
|
|
|
|
if 'l' in fallback(x):
|
|
|
|
return 'l'
|
2008-09-02 17:12:50 +04:00
|
|
|
if util.is_exec(self._join(x)):
|
2008-06-26 22:46:34 +04:00
|
|
|
return 'x'
|
|
|
|
return ''
|
|
|
|
return f
|
|
|
|
return fallback
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def getcwd(self):
|
|
|
|
cwd = os.getcwd()
|
2007-06-18 22:24:34 +04:00
|
|
|
if cwd == self._root: return ''
|
|
|
|
# self._root ends with a path separator if self._root is '/' or 'C:\'
|
|
|
|
rootsep = self._root
|
2008-01-09 15:30:35 +03:00
|
|
|
if not util.endswithsep(rootsep):
|
2007-03-16 06:22:58 +03:00
|
|
|
rootsep += os.sep
|
|
|
|
if cwd.startswith(rootsep):
|
|
|
|
return cwd[len(rootsep):]
|
|
|
|
else:
|
|
|
|
# we're outside the repo. return an absolute path.
|
|
|
|
return cwd
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2007-06-09 06:49:12 +04:00
|
|
|
def pathto(self, f, cwd=None):
|
|
|
|
if cwd is None:
|
|
|
|
cwd = self.getcwd()
|
2007-06-18 22:24:34 +04:00
|
|
|
path = util.pathto(self._root, cwd, f)
|
2007-06-09 06:49:12 +04:00
|
|
|
if self._slash:
|
2008-01-09 15:30:13 +03:00
|
|
|
return util.normpath(path)
|
2007-06-09 06:49:12 +04:00
|
|
|
return path
|
2007-06-09 06:49:12 +04:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def __getitem__(self, key):
|
2007-07-22 01:02:09 +04:00
|
|
|
''' current states:
|
|
|
|
n normal
|
|
|
|
m needs merging
|
|
|
|
r marked for removal
|
|
|
|
a marked for addition
|
|
|
|
? not tracked'''
|
|
|
|
return self._map.get(key, ("?",))[0]
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def __contains__(self, key):
|
2007-06-18 22:24:34 +04:00
|
|
|
return key in self._map
|
|
|
|
|
|
|
|
def __iter__(self):
|
2008-06-28 03:28:45 +04:00
|
|
|
for x in util.sort(self._map):
|
2007-06-18 22:24:34 +04:00
|
|
|
yield x
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def parents(self):
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._pl
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2007-03-14 02:50:02 +03:00
|
|
|
def branch(self):
|
|
|
|
return self._branch
|
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def setparents(self, p1, p2=nullid):
|
2007-07-22 01:44:38 +04:00
|
|
|
self._dirty = self._dirtypl = True
|
2007-06-18 22:24:34 +04:00
|
|
|
self._pl = p1, p2
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2007-03-14 02:50:02 +03:00
|
|
|
def setbranch(self, branch):
|
|
|
|
self._branch = branch
|
2007-06-18 22:24:34 +04:00
|
|
|
self._opener("branch", "w").write(branch + '\n')
|
2007-03-14 02:50:02 +03:00
|
|
|
|
2007-06-18 22:24:34 +04:00
|
|
|
def _read(self):
|
2007-06-18 22:24:34 +04:00
|
|
|
self._map = {}
|
|
|
|
self._copymap = {}
|
2007-06-18 22:24:33 +04:00
|
|
|
try:
|
2007-06-18 22:24:34 +04:00
|
|
|
st = self._opener("dirstate").read()
|
2007-06-18 22:24:33 +04:00
|
|
|
except IOError, err:
|
|
|
|
if err.errno != errno.ENOENT: raise
|
|
|
|
return
|
|
|
|
if not st:
|
|
|
|
return
|
|
|
|
|
2008-10-18 18:30:50 +04:00
|
|
|
p = parsers.parse_dirstate(self._map, self._copymap, st)
|
2007-07-20 02:43:25 +04:00
|
|
|
if not self._dirtypl:
|
2008-10-13 00:21:08 +04:00
|
|
|
self._pl = p
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2007-06-18 22:24:34 +04:00
|
|
|
def invalidate(self):
|
2008-06-06 22:23:29 +04:00
|
|
|
for a in "_map _copymap _foldmap _branch _pl _dirs _ignore".split():
|
2007-07-20 02:43:25 +04:00
|
|
|
if a in self.__dict__:
|
|
|
|
delattr(self, a)
|
2007-07-22 01:02:09 +04:00
|
|
|
self._dirty = False
|
2007-04-24 23:02:51 +04:00
|
|
|
|
2005-08-28 01:21:25 +04:00
|
|
|
def copy(self, source, dest):
|
2008-06-15 15:01:03 +04:00
|
|
|
if source == dest:
|
|
|
|
return
|
2007-07-22 01:02:09 +04:00
|
|
|
self._dirty = True
|
2007-06-18 22:24:34 +04:00
|
|
|
self._copymap[dest] = source
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def copied(self, file):
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._copymap.get(file, None)
|
2006-09-26 02:53:17 +04:00
|
|
|
|
|
|
|
def copies(self):
|
2007-06-18 22:24:34 +04:00
|
|
|
return self._copymap
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2008-07-12 03:46:02 +04:00
|
|
|
def _droppath(self, f):
|
|
|
|
if self[f] not in "?r" and "_dirs" in self.__dict__:
|
2008-10-15 03:14:29 +04:00
|
|
|
_decdirs(self._dirs, f)
|
2007-06-18 22:24:34 +04:00
|
|
|
|
2008-07-12 03:46:02 +04:00
|
|
|
def _addpath(self, f, check=False):
|
2007-11-05 20:05:44 +03:00
|
|
|
oldstate = self[f]
|
2008-07-12 03:46:02 +04:00
|
|
|
if check or oldstate == "r":
|
|
|
|
if '\r' in f or '\n' in f:
|
|
|
|
raise util.Abort(
|
|
|
|
_("'\\n' and '\\r' disallowed in filenames: %r") % f)
|
|
|
|
if f in self._dirs:
|
|
|
|
raise util.Abort(_('directory %r already in dirstate') % f)
|
|
|
|
# shadows
|
|
|
|
for d in _finddirs(f):
|
|
|
|
if d in self._dirs:
|
|
|
|
break
|
|
|
|
if d in self._map and self[d] != 'r':
|
|
|
|
raise util.Abort(
|
|
|
|
_('file %r in dirstate clashes with %r') % (d, f))
|
|
|
|
if oldstate in "?r" and "_dirs" in self.__dict__:
|
2008-10-15 03:14:29 +04:00
|
|
|
_incdirs(self._dirs, f)
|
2007-11-05 20:05:44 +03:00
|
|
|
|
2007-07-22 01:02:09 +04:00
|
|
|
def normal(self, f):
|
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
2007-08-23 08:48:29 +04:00
|
|
|
'mark a file normal and clean'
|
2007-07-22 01:02:09 +04:00
|
|
|
self._dirty = True
|
2008-07-12 03:46:02 +04:00
|
|
|
self._addpath(f)
|
2007-07-22 01:02:09 +04:00
|
|
|
s = os.lstat(self._join(f))
|
2008-10-18 13:26:06 +04:00
|
|
|
self._map[f] = ('n', s.st_mode, s.st_size, int(s.st_mtime))
|
2008-01-20 16:39:25 +03:00
|
|
|
if f in self._copymap:
|
2007-07-22 01:02:09 +04:00
|
|
|
del self._copymap[f]
|
2005-08-28 01:21:25 +04:00
|
|
|
|
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
2007-08-23 08:48:29 +04:00
|
|
|
def normallookup(self, f):
|
2007-07-22 01:02:09 +04:00
|
|
|
'mark a file normal, but possibly dirty'
|
2008-03-18 10:07:39 +03:00
|
|
|
if self._pl[1] != nullid and f in self._map:
|
|
|
|
# if there is a merge going on and the file was either
|
|
|
|
# in state 'm' or dirty before being removed, restore that state.
|
|
|
|
entry = self._map[f]
|
|
|
|
if entry[0] == 'r' and entry[2] in (-1, -2):
|
|
|
|
source = self._copymap.get(f)
|
|
|
|
if entry[2] == -1:
|
|
|
|
self.merge(f)
|
|
|
|
elif entry[2] == -2:
|
|
|
|
self.normaldirty(f)
|
|
|
|
if source:
|
|
|
|
self.copy(source, f)
|
|
|
|
return
|
|
|
|
if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2:
|
|
|
|
return
|
2007-07-22 01:02:09 +04:00
|
|
|
self._dirty = True
|
2008-07-12 03:46:02 +04:00
|
|
|
self._addpath(f)
|
2008-10-13 00:21:08 +04:00
|
|
|
self._map[f] = ('n', 0, -1, -1)
|
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
2007-08-23 08:48:29 +04:00
|
|
|
if f in self._copymap:
|
|
|
|
del self._copymap[f]
|
|
|
|
|
|
|
|
def normaldirty(self, f):
|
|
|
|
'mark a file normal, but dirty'
|
|
|
|
self._dirty = True
|
2008-07-12 03:46:02 +04:00
|
|
|
self._addpath(f)
|
2008-10-13 00:21:08 +04:00
|
|
|
self._map[f] = ('n', 0, -2, -1)
|
2007-07-22 01:02:09 +04:00
|
|
|
if f in self._copymap:
|
|
|
|
del self._copymap[f]
|
|
|
|
|
|
|
|
def add(self, f):
|
|
|
|
'mark a file added'
|
2007-07-22 01:02:09 +04:00
|
|
|
self._dirty = True
|
2008-07-12 03:46:02 +04:00
|
|
|
self._addpath(f, True)
|
2008-10-13 00:21:08 +04:00
|
|
|
self._map[f] = ('a', 0, -1, -1)
|
2007-07-22 01:02:09 +04:00
|
|
|
if f in self._copymap:
|
|
|
|
del self._copymap[f]
|
|
|
|
|
|
|
|
def remove(self, f):
|
|
|
|
'mark a file removed'
|
|
|
|
self._dirty = True
|
2008-07-12 03:46:02 +04:00
|
|
|
self._droppath(f)
|
2008-03-18 10:07:39 +03:00
|
|
|
size = 0
|
|
|
|
if self._pl[1] != nullid and f in self._map:
|
|
|
|
entry = self._map[f]
|
|
|
|
if entry[0] == 'm':
|
|
|
|
size = -1
|
|
|
|
elif entry[0] == 'n' and entry[2] == -2:
|
|
|
|
size = -2
|
2008-10-13 00:21:08 +04:00
|
|
|
self._map[f] = ('r', 0, size, 0)
|
2008-03-18 10:07:39 +03:00
|
|
|
if size == 0 and f in self._copymap:
|
2007-07-22 01:02:09 +04:00
|
|
|
del self._copymap[f]
|
|
|
|
|
|
|
|
def merge(self, f):
|
|
|
|
'mark a file merged'
|
|
|
|
self._dirty = True
|
2007-07-22 01:02:09 +04:00
|
|
|
s = os.lstat(self._join(f))
|
2008-07-12 03:46:02 +04:00
|
|
|
self._addpath(f)
|
2008-10-18 13:26:06 +04:00
|
|
|
self._map[f] = ('m', s.st_mode, s.st_size, int(s.st_mtime))
|
2007-07-22 01:02:09 +04:00
|
|
|
if f in self._copymap:
|
|
|
|
del self._copymap[f]
|
|
|
|
|
|
|
|
def forget(self, f):
|
|
|
|
'forget a file'
|
|
|
|
self._dirty = True
|
|
|
|
try:
|
2008-07-20 21:08:59 +04:00
|
|
|
self._droppath(f)
|
2007-07-22 01:02:09 +04:00
|
|
|
del self._map[f]
|
|
|
|
except KeyError:
|
2008-02-09 21:13:57 +03:00
|
|
|
self._ui.warn(_("not in dirstate: %s\n") % f)
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2008-10-01 01:23:08 +04:00
|
|
|
def _normalize(self, path, knownpath=False):
|
2008-10-01 01:23:08 +04:00
|
|
|
norm_path = os.path.normcase(path)
|
2008-10-01 01:23:08 +04:00
|
|
|
fold_path = self._foldmap.get(norm_path, None)
|
|
|
|
if fold_path is None:
|
|
|
|
if knownpath or not os.path.exists(os.path.join(self._root, path)):
|
|
|
|
fold_path = path
|
|
|
|
else:
|
|
|
|
fold_path = self._foldmap.setdefault(norm_path,
|
|
|
|
util.fspath(path, self._root))
|
|
|
|
return fold_path
|
2008-06-06 22:23:29 +04:00
|
|
|
|
2007-08-06 06:04:56 +04:00
|
|
|
def clear(self):
|
|
|
|
self._map = {}
|
2007-11-05 20:05:44 +03:00
|
|
|
if "_dirs" in self.__dict__:
|
|
|
|
delattr(self, "_dirs");
|
2007-08-06 06:04:56 +04:00
|
|
|
self._copymap = {}
|
|
|
|
self._pl = [nullid, nullid]
|
2007-08-06 08:00:10 +04:00
|
|
|
self._dirty = True
|
2007-08-06 06:04:56 +04:00
|
|
|
|
2006-02-20 21:04:56 +03:00
|
|
|
def rebuild(self, parent, files):
|
2007-08-06 06:04:56 +04:00
|
|
|
self.clear()
|
2006-07-16 12:14:17 +04:00
|
|
|
for f in files:
|
2008-06-26 23:35:50 +04:00
|
|
|
if 'x' in files.flags(f):
|
2008-10-13 00:21:08 +04:00
|
|
|
self._map[f] = ('n', 0777, -1, 0)
|
2006-02-20 21:04:56 +03:00
|
|
|
else:
|
2008-10-13 00:21:08 +04:00
|
|
|
self._map[f] = ('n', 0666, -1, 0)
|
2007-06-18 22:24:34 +04:00
|
|
|
self._pl = (parent, nullid)
|
2007-07-22 01:02:09 +04:00
|
|
|
self._dirty = True
|
2005-08-28 01:21:25 +04:00
|
|
|
|
|
|
|
def write(self):
|
2007-06-18 22:24:34 +04:00
|
|
|
if not self._dirty:
|
2006-02-23 04:17:08 +03:00
|
|
|
return
|
2008-03-19 23:55:21 +03:00
|
|
|
st = self._opener("dirstate", "w", atomictemp=True)
|
2008-03-20 21:53:59 +03:00
|
|
|
|
|
|
|
try:
|
|
|
|
gran = int(self._ui.config('dirstate', 'granularity', 1))
|
|
|
|
except ValueError:
|
|
|
|
gran = 1
|
|
|
|
limit = sys.maxint
|
|
|
|
if gran > 0:
|
|
|
|
limit = util.fstat(st).st_mtime - gran
|
|
|
|
|
2007-04-24 23:02:42 +04:00
|
|
|
cs = cStringIO.StringIO()
|
2007-09-24 21:41:54 +04:00
|
|
|
copymap = self._copymap
|
|
|
|
pack = struct.pack
|
|
|
|
write = cs.write
|
|
|
|
write("".join(self._pl))
|
2007-06-18 22:24:34 +04:00
|
|
|
for f, e in self._map.iteritems():
|
2007-09-24 21:41:54 +04:00
|
|
|
if f in copymap:
|
|
|
|
f = "%s\0%s" % (f, copymap[f])
|
2008-03-19 23:55:21 +03:00
|
|
|
if e[3] > limit and e[0] == 'n':
|
2008-10-13 00:21:08 +04:00
|
|
|
e = (e[0], 0, -1, -1)
|
2007-09-24 21:41:54 +04:00
|
|
|
e = pack(_format, e[0], e[1], e[2], e[3], len(f))
|
|
|
|
write(e)
|
|
|
|
write(f)
|
2007-04-24 23:02:42 +04:00
|
|
|
st.write(cs.getvalue())
|
2007-06-06 02:55:27 +04:00
|
|
|
st.rename()
|
2007-07-22 01:44:38 +04:00
|
|
|
self._dirty = self._dirtypl = False
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2008-02-08 23:07:55 +03:00
|
|
|
def _dirignore(self, f):
|
2008-04-05 20:15:04 +04:00
|
|
|
if f == '.':
|
|
|
|
return False
|
2008-02-08 23:07:55 +03:00
|
|
|
if self._ignore(f):
|
|
|
|
return True
|
2008-07-12 03:46:02 +04:00
|
|
|
for p in _finddirs(f):
|
|
|
|
if self._ignore(p):
|
2008-02-08 23:07:55 +03:00
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
2008-06-26 23:35:50 +04:00
|
|
|
def walk(self, match, unknown, ignored):
|
2006-10-27 08:54:24 +04:00
|
|
|
'''
|
|
|
|
walk recursively through the directory tree, finding all files
|
|
|
|
matched by the match function
|
|
|
|
|
2008-07-22 22:02:36 +04:00
|
|
|
results are yielded in a tuple (filename, stat), where stat
|
2006-10-27 08:54:24 +04:00
|
|
|
and st is the stat result if the file was found in the directory.
|
|
|
|
'''
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2008-05-12 20:37:07 +04:00
|
|
|
def fwarn(f, msg):
|
2008-09-11 00:54:28 +04:00
|
|
|
self._ui.warn('%s: %s\n' % (self.pathto(f), msg))
|
2008-05-12 20:37:07 +04:00
|
|
|
return False
|
2008-05-12 20:37:08 +04:00
|
|
|
badfn = fwarn
|
|
|
|
if hasattr(match, 'bad'):
|
|
|
|
badfn = match.bad
|
2008-05-12 20:37:07 +04:00
|
|
|
|
2008-07-22 22:03:23 +04:00
|
|
|
def badtype(f, mode):
|
|
|
|
kind = 'unknown'
|
|
|
|
if stat.S_ISCHR(mode): kind = _('character device')
|
|
|
|
elif stat.S_ISBLK(mode): kind = _('block device')
|
|
|
|
elif stat.S_ISFIFO(mode): kind = _('fifo')
|
|
|
|
elif stat.S_ISSOCK(mode): kind = _('socket')
|
|
|
|
elif stat.S_ISDIR(mode): kind = _('directory')
|
|
|
|
self._ui.warn(_('%s: unsupported file type (type is %s)\n')
|
|
|
|
% (self.pathto(f), kind))
|
|
|
|
|
2007-06-18 22:24:34 +04:00
|
|
|
ignore = self._ignore
|
2008-02-08 23:07:55 +03:00
|
|
|
dirignore = self._dirignore
|
2007-03-11 05:00:54 +03:00
|
|
|
if ignored:
|
|
|
|
ignore = util.never
|
2008-02-08 23:07:55 +03:00
|
|
|
dirignore = util.never
|
2008-09-02 17:08:26 +04:00
|
|
|
elif not unknown:
|
|
|
|
# if unknown and ignored are False, skip step 2
|
|
|
|
ignore = util.always
|
|
|
|
dirignore = util.always
|
2006-10-27 21:09:33 +04:00
|
|
|
|
2008-07-22 22:03:31 +04:00
|
|
|
matchfn = match.matchfn
|
2008-07-22 22:03:24 +04:00
|
|
|
dmap = self._map
|
2007-07-26 21:02:58 +04:00
|
|
|
normpath = util.normpath
|
2008-07-22 22:03:14 +04:00
|
|
|
normalize = self.normalize
|
2007-10-06 02:01:06 +04:00
|
|
|
listdir = osutil.listdir
|
2007-07-26 21:02:58 +04:00
|
|
|
lstat = os.lstat
|
2008-07-22 22:03:23 +04:00
|
|
|
getkind = stat.S_IFMT
|
2008-07-22 22:03:20 +04:00
|
|
|
dirkind = stat.S_IFDIR
|
2008-07-22 22:03:23 +04:00
|
|
|
regkind = stat.S_IFREG
|
|
|
|
lnkkind = stat.S_IFLNK
|
2008-07-22 22:03:24 +04:00
|
|
|
join = self._join
|
2008-07-22 22:03:10 +04:00
|
|
|
work = []
|
|
|
|
wadd = work.append
|
|
|
|
|
2008-07-22 22:03:24 +04:00
|
|
|
files = util.unique(match.files())
|
|
|
|
if not files or '.' in files:
|
|
|
|
files = ['']
|
|
|
|
results = {'.hg': None}
|
2007-07-26 21:02:58 +04:00
|
|
|
|
2008-07-22 22:03:18 +04:00
|
|
|
# step 1: find all explicit files
|
2008-07-22 22:03:10 +04:00
|
|
|
for ff in util.sort(files):
|
2008-07-22 22:03:14 +04:00
|
|
|
nf = normalize(normpath(ff))
|
2008-07-22 22:03:21 +04:00
|
|
|
if nf in results:
|
2008-07-22 22:03:10 +04:00
|
|
|
continue
|
|
|
|
|
|
|
|
try:
|
2008-07-22 22:03:24 +04:00
|
|
|
st = lstat(join(nf))
|
2008-07-22 22:03:23 +04:00
|
|
|
kind = getkind(st.st_mode)
|
|
|
|
if kind == dirkind:
|
2008-07-22 22:03:20 +04:00
|
|
|
if not dirignore(nf):
|
|
|
|
wadd(nf)
|
2008-07-22 22:03:23 +04:00
|
|
|
elif kind == regkind or kind == lnkkind:
|
|
|
|
results[nf] = st
|
2008-07-22 22:03:20 +04:00
|
|
|
else:
|
2008-07-22 22:03:23 +04:00
|
|
|
badtype(ff, kind)
|
|
|
|
if nf in dmap:
|
2008-07-22 22:03:21 +04:00
|
|
|
results[nf] = None
|
2008-07-22 22:03:10 +04:00
|
|
|
except OSError, inst:
|
|
|
|
keep = False
|
2008-07-22 22:03:20 +04:00
|
|
|
prefix = nf + "/"
|
2008-07-22 22:03:13 +04:00
|
|
|
for fn in dmap:
|
2008-07-22 22:03:20 +04:00
|
|
|
if nf == fn or fn.startswith(prefix):
|
2008-07-22 22:03:10 +04:00
|
|
|
keep = True
|
|
|
|
break
|
|
|
|
if not keep:
|
|
|
|
if inst.errno != errno.ENOENT:
|
|
|
|
fwarn(ff, inst.strerror)
|
2008-07-22 22:03:25 +04:00
|
|
|
elif badfn(ff, inst.strerror):
|
2008-07-22 22:03:31 +04:00
|
|
|
if (nf in dmap or not ignore(nf)) and matchfn(nf):
|
2008-07-22 22:03:25 +04:00
|
|
|
results[nf] = None
|
2008-07-22 22:03:10 +04:00
|
|
|
|
2008-07-22 22:03:18 +04:00
|
|
|
# step 2: visit subdirectories
|
|
|
|
while work:
|
|
|
|
nd = work.pop()
|
|
|
|
if hasattr(match, 'dir'):
|
|
|
|
match.dir(nd)
|
2008-10-15 16:52:27 +04:00
|
|
|
skip = None
|
2008-07-22 22:03:18 +04:00
|
|
|
if nd == '.':
|
|
|
|
nd = ''
|
|
|
|
else:
|
2008-10-15 16:52:27 +04:00
|
|
|
skip = '.hg'
|
|
|
|
try:
|
|
|
|
entries = listdir(join(nd), stat=True, skip=skip)
|
|
|
|
except OSError, inst:
|
|
|
|
if inst.errno == errno.EACCES:
|
|
|
|
fwarn(nd, inst.strerror)
|
|
|
|
continue
|
|
|
|
raise
|
2008-07-22 22:03:18 +04:00
|
|
|
for f, kind, st in entries:
|
2008-10-01 01:23:08 +04:00
|
|
|
nf = normalize(nd and (nd + "/" + f) or f, True)
|
2008-07-22 22:03:21 +04:00
|
|
|
if nf not in results:
|
2008-07-22 22:03:20 +04:00
|
|
|
if kind == dirkind:
|
|
|
|
if not ignore(nf):
|
|
|
|
wadd(nf)
|
2008-07-22 22:03:31 +04:00
|
|
|
if nf in dmap and matchfn(nf):
|
2008-07-22 22:03:21 +04:00
|
|
|
results[nf] = None
|
2008-07-22 22:03:25 +04:00
|
|
|
elif kind == regkind or kind == lnkkind:
|
|
|
|
if nf in dmap:
|
2008-07-22 22:03:31 +04:00
|
|
|
if matchfn(nf):
|
2008-07-22 22:03:25 +04:00
|
|
|
results[nf] = st
|
2008-07-22 22:03:31 +04:00
|
|
|
elif matchfn(nf) and not ignore(nf):
|
2008-07-22 22:03:21 +04:00
|
|
|
results[nf] = st
|
2008-07-22 22:03:31 +04:00
|
|
|
elif nf in dmap and matchfn(nf):
|
2008-07-22 22:03:25 +04:00
|
|
|
results[nf] = None
|
2008-07-22 22:03:18 +04:00
|
|
|
|
|
|
|
# step 3: report unseen items in the dmap hash
|
2008-10-09 18:29:47 +04:00
|
|
|
visit = util.sort([f for f in dmap if f not in results and match(f)])
|
|
|
|
for nf, st in zip(visit, util.statfiles([join(i) for i in visit])):
|
|
|
|
if not st is None and not getkind(st.st_mode) in (regkind, lnkkind):
|
|
|
|
st = None
|
|
|
|
results[nf] = st
|
2008-07-22 22:03:21 +04:00
|
|
|
|
2008-07-22 22:03:24 +04:00
|
|
|
del results['.hg']
|
2008-07-22 22:03:21 +04:00
|
|
|
return results
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2008-06-26 23:35:50 +04:00
|
|
|
def status(self, match, ignored, clean, unknown):
|
|
|
|
listignored, listclean, listunknown = ignored, clean, unknown
|
2006-03-30 00:58:34 +04:00
|
|
|
lookup, modified, added, unknown, ignored = [], [], [], [], []
|
2006-07-21 03:21:07 +04:00
|
|
|
removed, deleted, clean = [], [], []
|
2005-08-28 01:21:25 +04:00
|
|
|
|
2007-07-26 21:02:58 +04:00
|
|
|
dmap = self._map
|
|
|
|
ladd = lookup.append
|
|
|
|
madd = modified.append
|
|
|
|
aadd = added.append
|
|
|
|
uadd = unknown.append
|
|
|
|
iadd = ignored.append
|
|
|
|
radd = removed.append
|
|
|
|
dadd = deleted.append
|
|
|
|
cadd = clean.append
|
|
|
|
|
2008-07-22 22:03:21 +04:00
|
|
|
for fn, st in self.walk(match, listunknown, listignored).iteritems():
|
2008-05-12 20:37:08 +04:00
|
|
|
if fn not in dmap:
|
2008-06-26 23:35:50 +04:00
|
|
|
if (listignored or match.exact(fn)) and self._dirignore(fn):
|
|
|
|
if listignored:
|
2008-02-08 23:07:55 +03:00
|
|
|
iadd(fn)
|
2008-06-26 23:35:50 +04:00
|
|
|
elif listunknown:
|
2007-07-26 21:02:58 +04:00
|
|
|
uadd(fn)
|
2005-10-28 00:29:35 +04:00
|
|
|
continue
|
2008-05-12 20:37:08 +04:00
|
|
|
|
2008-10-13 00:21:08 +04:00
|
|
|
state, mode, size, time = dmap[fn]
|
2008-05-12 20:37:08 +04:00
|
|
|
|
2008-07-22 22:02:36 +04:00
|
|
|
if not st and state in "nma":
|
|
|
|
dadd(fn)
|
|
|
|
elif state == 'n':
|
2008-03-14 15:56:58 +03:00
|
|
|
if (size >= 0 and
|
|
|
|
(size != st.st_size
|
|
|
|
or ((mode ^ st.st_mode) & 0100 and self._checkexec))
|
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
2007-08-23 08:48:29 +04:00
|
|
|
or size == -2
|
2007-06-22 06:42:06 +04:00
|
|
|
or fn in self._copymap):
|
2007-07-26 21:02:58 +04:00
|
|
|
madd(fn)
|
2006-08-20 08:13:11 +04:00
|
|
|
elif time != int(st.st_mtime):
|
2007-07-26 21:02:58 +04:00
|
|
|
ladd(fn)
|
2008-06-26 23:35:50 +04:00
|
|
|
elif listclean:
|
2007-07-26 21:02:58 +04:00
|
|
|
cadd(fn)
|
2008-05-12 20:37:08 +04:00
|
|
|
elif state == 'm':
|
2007-07-26 21:02:58 +04:00
|
|
|
madd(fn)
|
2008-05-12 20:37:08 +04:00
|
|
|
elif state == 'a':
|
2007-07-26 21:02:58 +04:00
|
|
|
aadd(fn)
|
2008-05-12 20:37:08 +04:00
|
|
|
elif state == 'r':
|
2007-07-26 21:02:58 +04:00
|
|
|
radd(fn)
|
2005-10-28 00:29:35 +04:00
|
|
|
|
2006-07-21 03:21:07 +04:00
|
|
|
return (lookup, modified, added, removed, deleted, unknown, ignored,
|
|
|
|
clean)
|