mercurial-scm/hg-stable: mercurial/dirstate.py annotate

annotate mercurial/dirstate.py @ 1093:1f1661c58283

commands: use revlog directly for debug commands This eliminates the import in hg.py

author	mpm@selenic.com
date	Sat, 27 Aug 2005 14:56:58 -0700
parents	142b5d5ec9cc
children	221b5252864c

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 """
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	2 dirstate.py - working directory tracking for mercurial
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	3
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	4 Copyright 2005 Matt Mackall <mpm@selenic.com>
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	5
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	6 This software may be used and distributed according to the terms
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	7 of the GNU General Public License, incorporated herein by reference.
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	8 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	9
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 247 diff changeset	10 import sys, struct, os
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	11 from revlog import *
3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	12 from demandload import *
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	13 demandload(globals(), "time bisect stat util")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	14
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	15 class dirstate:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	16 def __init__(self, opener, ui, root):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	17 self.opener = opener
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	18 self.root = root
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	19 self.dirty = 0
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	20 self.ui = ui
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	21 self.map = None
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	22 self.pl = None
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	23 self.copies = {}
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	24 self.ignorefunc = None
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	25
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	26 def wjoin(self, f):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	27 return os.path.join(self.root, f)
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	28
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	29 def getcwd(self):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	30 cwd = os.getcwd()
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	31 if cwd == self.root: return ''
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	32 return cwd[len(self.root) + 1:]
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	33
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	34 def ignore(self, f):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	35 if not self.ignorefunc:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	36 bigpat = []
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	37 try:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	38 l = file(self.wjoin(".hgignore"))
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	39 for pat in l:
911 d46af8e6b858 Fix .hgignore parsing if last line has no EOL, ignore trailing white space. Thomas Arendsen Hein <thomas@intevation.de> parents: 903 diff changeset	40 p = pat.rstrip()
d46af8e6b858 Fix .hgignore parsing if last line has no EOL, ignore trailing white space. Thomas Arendsen Hein <thomas@intevation.de> parents: 903 diff changeset	41 if p:
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	42 try:
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	43 re.compile(p)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	44 except:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	45 self.ui.warn("ignoring invalid ignore"
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	46 + " regular expression '%s'\n" % p)
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	47 else:
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	48 bigpat.append(p)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	49 except IOError: pass
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	50
735 3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	51 if bigpat:
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	52 s = "(?:%s)" % (")\|(?:".join(bigpat))
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	53 r = re.compile(s)
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	54 self.ignorefunc = r.search
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	55 else:
3433b228bbb3 An empty .hgignore file must cause us to ignore nothing, not everything! Bryan O'Sullivan <bos@serpentine.com> parents: 730 diff changeset	56 self.ignorefunc = util.never
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	57
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	58 return self.ignorefunc(f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	59
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	60 def __del__(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	61 if self.dirty:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	62 self.write()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	63
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	64 def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	65 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	66 return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	67 except TypeError:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	68 self.read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	69 return self[key]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	70
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	71 def __contains__(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	72 if not self.map: self.read()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	73 return key in self.map
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	74
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	75 def parents(self):
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	76 if not self.pl:
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	77 self.read()
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	78 return self.pl
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	79
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	80 def markdirty(self):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	81 if not self.dirty:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	82 self.dirty = 1
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	83
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	84 def setparents(self, p1, p2=nullid):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	85 self.markdirty()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	86 self.pl = p1, p2
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	87
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	88 def state(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	89 try:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	90 return self[key][0]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	91 except KeyError:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	92 return "?"
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	93
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	94 def read(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	95 if self.map is not None: return self.map
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	96
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	97 self.map = {}
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	98 self.pl = [nullid, nullid]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	99 try:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	100 st = self.opener("dirstate").read()
311 3b17056b72dc fix KeyErrors from reading empty dirstate mpm@selenic.com parents: 308 diff changeset	101 if not st: return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	102 except: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	103
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	104 self.pl = [st[:20], st[20: 40]]
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	105
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	106 pos = 40
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	107 while pos < len(st):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	108 e = struct.unpack(">cllll", st[pos:pos+17])
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	109 l = e[4]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	110 pos += 17
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	111 f = st[pos:pos + l]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	112 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	113 f, c = f.split('\0')
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	114 self.copies[f] = c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	115 self.map[f] = e[:4]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	116 pos += l
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	117
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	118 def copy(self, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	119 self.read()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	120 self.markdirty()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	121 self.copies[dest] = source
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	122
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	123 def copied(self, file):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	124 return self.copies.get(file, None)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	125
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	126 def update(self, files, state, **kw):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	127 ''' current states:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	128 n normal
231 15e7c6cee929 add 'm' state to dirstates mpm@selenic.com parents: 230 diff changeset	129 m needs merging
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	130 r marked for removal
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	131 a marked for addition'''
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	132
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	133 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	134 self.read()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	135 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	136 for f in files:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	137 if state == "r":
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	138 self.map[f] = ('r', 0, 0, 0)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	139 else:
253 2da0a56aa1fd Remove invalid state from dirstate mpm@selenic.com parents: 251 diff changeset	140 s = os.stat(os.path.join(self.root, f))
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	141 st_size = kw.get('st_size', s.st_size)
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	142 st_mtime = kw.get('st_mtime', s.st_mtime)
865 2d2fee33ec68 Cleanup after previous changes: Thomas Arendsen Hein <thomas@intevation.de> parents: 863 diff changeset	143 self.map[f] = (state, s.st_mode, st_size, st_mtime)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	144
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	145 def forget(self, files):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	146 if not files: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	147 self.read()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	148 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	149 for f in files:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	150 try:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	151 del self.map[f]
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	152 except KeyError:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	153 self.ui.warn("not in dirstate: %s!\n" % f)
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	154 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	155
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	156 def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	157 self.map = {}
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	158 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	159
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	160 def write(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	161 st = self.opener("dirstate", "w")
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	162 st.write("".join(self.pl))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	163 for f, e in self.map.items():
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	164 c = self.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	165 if c:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	166 f = f + "\0" + c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	167 e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	168 st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	169 self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	170
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	171 def filterfiles(self, files):
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	172 ret = {}
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	173 unknown = []
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	174
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	175 for x in files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	176 if x is '.':
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	177 return self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	178 if x not in self.map:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	179 unknown.append(x)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	180 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	181 ret[x] = self.map[x]
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	182
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	183 if not unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	184 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	185
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	186 b = self.map.keys()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	187 b.sort()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	188 blen = len(b)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	189
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	190 for x in unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	191 bs = bisect.bisect(b, x)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	192 if bs != 0 and b[bs-1] == x:
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	193 ret[x] = self.map[x]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	194 continue
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	195 while bs < blen:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	196 s = b[bs]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	197 if len(s) > len(x) and s.startswith(x) and s[len(x)] == '/':
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	198 ret[s] = self.map[s]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	199 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	200 break
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	201 bs += 1
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	202 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	203
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	204 def walk(self, files=None, match=util.always, dc=None):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	205 self.read()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	206
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	207 # walk all files by default
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	208 if not files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	209 files = [self.root]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	210 if not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	211 dc = self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	212 elif not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	213 dc = self.filterfiles(files)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	214
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	215 known = {'.hg': 1}
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	216 def seen(fn):
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	217 if fn in known: return True
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	218 known[fn] = 1
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	219 def traverse():
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	220 for ff in util.unique(files):
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	221 f = os.path.join(self.root, ff)
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	222 try:
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	223 st = os.stat(f)
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	224 except OSError, inst:
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	225 if ff not in dc: self.ui.warn('%s: %s\n' % (
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	226 util.pathto(self.getcwd(), ff),
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	227 inst.strerror))
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	228 continue
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	229 if stat.S_ISDIR(st.st_mode):
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	230 for dir, subdirs, fl in os.walk(f):
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	231 d = dir[len(self.root) + 1:]
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	232 nd = util.normpath(d)
892 f481c9b6786e Fix bug involving "hg debugwalk -Ipattern" from repository root. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	233 if nd == '.': nd = ''
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	234 if seen(nd):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	235 subdirs[:] = []
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	236 continue
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	237 for sd in subdirs:
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 814 diff changeset	238 ds = os.path.join(nd, sd +'/')
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	239 if self.ignore(ds) or not match(ds):
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	240 subdirs.remove(sd)
822 b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	241 subdirs.sort()
b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	242 fl.sort()
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	243 for fn in fl:
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	244 fn = util.pconvert(os.path.join(d, fn))
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	245 yield 'f', fn
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	246 elif stat.S_ISREG(st.st_mode):
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	247 yield 'f', ff
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	248 else:
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	249 kind = 'unknown'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	250 if stat.S_ISCHR(st.st_mode): kind = 'character device'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	251 elif stat.S_ISBLK(st.st_mode): kind = 'block device'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	252 elif stat.S_ISFIFO(st.st_mode): kind = 'fifo'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	253 elif stat.S_ISLNK(st.st_mode): kind = 'symbolic link'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	254 elif stat.S_ISSOCK(st.st_mode): kind = 'socket'
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	255 self.ui.warn('%s: unsupported file type (type is %s)\n' % (
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	256 util.pathto(self.getcwd(), ff),
087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	257 kind))
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	258
822 b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	259 ks = dc.keys()
b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	260 ks.sort()
b678e6d4f92d Attempt to yield names in sorted order when walking. Bryan O'Sullivan <bos@serpentine.com> parents: 821 diff changeset	261 for k in ks:
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	262 yield 'm', k
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	263
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	264 # yield only files that match: all in dirstate, others only if
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	265 # not in .hgignore
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	266
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	267 for src, fn in util.unique(traverse()):
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	268 fn = util.normpath(fn)
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	269 if seen(fn): continue
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	270 if fn not in dc and self.ignore(fn):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	271 continue
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	272 if match(fn):
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	273 yield src, fn
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	274
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	275 def changes(self, files=None, match=util.always):
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	276 self.read()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	277 if not files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	278 dc = self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	279 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	280 dc = self.filterfiles(files)
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	281 lookup, modified, added, unknown = [], [], [], []
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	282 removed, deleted = [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	283
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	284 for src, fn in self.walk(files, match, dc=dc):
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	285 try:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	286 s = os.stat(os.path.join(self.root, fn))
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	287 except OSError:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	288 continue
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	289 if not stat.S_ISREG(s.st_mode):
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	290 continue
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	291 c = dc.get(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	292 if c:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	293 del dc[fn]
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	294 if c[0] == 'm':
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	295 modified.append(fn)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	296 elif c[0] == 'a':
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	297 added.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	298 elif c[0] == 'r':
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	299 unknown.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	300 elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100:
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	301 modified.append(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	302 elif c[3] != s.st_mtime:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	303 lookup.append(fn)
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	304 else:
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	305 unknown.append(fn)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	306
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	307 for fn, c in [(fn, c) for fn, c in dc.items() if match(fn)]:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	308 if c[0] == 'r':
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	309 removed.append(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	310 else:
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	311 deleted.append(fn)
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	312 return (lookup, modified, added, removed + deleted, unknown)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/dirstate.py @ 1093:1f1661c58283