author | mpm@selenic.com |
Fri, 10 Jun 2005 12:49:25 -0800 | |
changeset 308 | 075619d00dd7 |
parent 307 | 3863e08d597c |
child 311 | 3b17056b72dc |
permissions | -rw-r--r-- |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1 |
# hg.py - repository classes for mercurial |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
2 |
# |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
3 |
# Copyright 2005 Matt Mackall <mpm@selenic.com> |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
4 |
# |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
5 |
# This software may be used and distributed according to the terms |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
6 |
# of the GNU General Public License, incorporated herein by reference. |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
7 |
|
249 | 8 |
import sys, struct, os |
262 | 9 |
from revlog import * |
10 |
from demandload import * |
|
11 |
demandload(globals(), "re lock urllib urllib2 transaction time socket") |
|
12 |
demandload(globals(), "tempfile byterange difflib") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
13 |
|
276 | 14 |
def is_exec(f): |
15 |
return (os.stat(f).st_mode & 0100 != 0) |
|
16 |
||
17 |
def set_exec(f, mode): |
|
18 |
s = os.stat(f).st_mode |
|
19 |
if (s & 0100 != 0) == mode: |
|
20 |
return |
|
298
91c9fd6a7c70
Turn on +x for every +r bit when making a file executable and obey umask.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
297
diff
changeset
|
21 |
if mode: |
299 | 22 |
# Turn on +x for every +r bit when making a file executable |
23 |
# and obey umask. |
|
298
91c9fd6a7c70
Turn on +x for every +r bit when making a file executable and obey umask.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
297
diff
changeset
|
24 |
umask = os.umask(0) |
91c9fd6a7c70
Turn on +x for every +r bit when making a file executable and obey umask.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
297
diff
changeset
|
25 |
os.umask(umask) |
91c9fd6a7c70
Turn on +x for every +r bit when making a file executable and obey umask.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
297
diff
changeset
|
26 |
os.chmod(f, s | (s & 0444) >> 2 & ~umask) |
91c9fd6a7c70
Turn on +x for every +r bit when making a file executable and obey umask.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
297
diff
changeset
|
27 |
else: |
91c9fd6a7c70
Turn on +x for every +r bit when making a file executable and obey umask.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
297
diff
changeset
|
28 |
os.chmod(f, s & 0666) |
276 | 29 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
30 |
class filelog(revlog): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
31 |
def __init__(self, opener, path): |
144
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
32 |
revlog.__init__(self, opener, |
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
33 |
os.path.join("data", path + ".i"), |
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
34 |
os.path.join("data", path + ".d")) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
35 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
36 |
def read(self, node): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
37 |
return self.revision(node) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
38 |
def add(self, text, transaction, link, p1=None, p2=None): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
39 |
return self.addrevision(text, transaction, link, p1, p2) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
40 |
|
79 | 41 |
def annotate(self, node): |
199 | 42 |
|
43 |
def decorate(text, rev): |
|
44 |
return [(rev, l) for l in text.splitlines(1)] |
|
45 |
||
46 |
def strip(annotation): |
|
47 |
return [e[1] for e in annotation] |
|
48 |
||
49 |
def pair(parent, child): |
|
109
95699294f580
Annotate was being too clever trying to work in place, and triggering
mpm@selenic.com
parents:
107
diff
changeset
|
50 |
new = [] |
262 | 51 |
sm = difflib.SequenceMatcher(None, strip(parent), strip(child)) |
79 | 52 |
for o, m, n, s, t in sm.get_opcodes(): |
109
95699294f580
Annotate was being too clever trying to work in place, and triggering
mpm@selenic.com
parents:
107
diff
changeset
|
53 |
if o == 'equal': |
199 | 54 |
new += parent[m:n] |
109
95699294f580
Annotate was being too clever trying to work in place, and triggering
mpm@selenic.com
parents:
107
diff
changeset
|
55 |
else: |
199 | 56 |
new += child[s:t] |
57 |
return new |
|
58 |
||
200 | 59 |
# find all ancestors |
216
201115f2859b
hg annotate: actually annotate the given version
mpm@selenic.com
parents:
210
diff
changeset
|
60 |
needed = {node:1} |
199 | 61 |
visit = [node] |
62 |
while visit: |
|
63 |
n = visit.pop(0) |
|
64 |
for p in self.parents(n): |
|
65 |
if p not in needed: |
|
66 |
needed[p] = 1 |
|
67 |
visit.append(p) |
|
200 | 68 |
else: |
69 |
# count how many times we'll use this |
|
70 |
needed[p] += 1 |
|
199 | 71 |
|
200 | 72 |
# sort by revision which is a topological order |
199 | 73 |
visit = needed.keys() |
74 |
visit = [ (self.rev(n), n) for n in visit ] |
|
75 |
visit.sort() |
|
76 |
visit = [ p[1] for p in visit ] |
|
77 |
hist = {} |
|
78 |
||
79 |
for n in visit: |
|
80 |
curr = decorate(self.read(n), self.linkrev(n)) |
|
81 |
for p in self.parents(n): |
|
82 |
if p != nullid: |
|
83 |
curr = pair(hist[p], curr) |
|
200 | 84 |
# trim the history of unneeded revs |
85 |
needed[p] -= 1 |
|
86 |
if not needed[p]: |
|
87 |
del hist[p] |
|
199 | 88 |
hist[n] = curr |
89 |
||
90 |
return hist[n] |
|
79 | 91 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
92 |
class manifest(revlog): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
93 |
def __init__(self, opener): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
94 |
self.mapcache = None |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
95 |
self.listcache = None |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
96 |
self.addlist = None |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
97 |
revlog.__init__(self, opener, "00manifest.i", "00manifest.d") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
98 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
99 |
def read(self, node): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
100 |
if self.mapcache and self.mapcache[0] == node: |
90 | 101 |
return self.mapcache[1].copy() |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
102 |
text = self.revision(node) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
103 |
map = {} |
276 | 104 |
flag = {} |
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
105 |
self.listcache = (text, text.splitlines(1)) |
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
106 |
for l in self.listcache[1]: |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
107 |
(f, n) = l.split('\0') |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
108 |
map[f] = bin(n[:40]) |
276 | 109 |
flag[f] = (n[40:-1] == "x") |
110 |
self.mapcache = (node, map, flag) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
111 |
return map |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
112 |
|
276 | 113 |
def readflags(self, node): |
114 |
if self.mapcache or self.mapcache[0] != node: |
|
115 |
self.read(node) |
|
116 |
return self.mapcache[2] |
|
117 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
118 |
def diff(self, a, b): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
119 |
# this is sneaky, as we're not actually using a and b |
140 | 120 |
if self.listcache and self.addlist and self.listcache[0] == a: |
98 | 121 |
d = mdiff.diff(self.listcache[1], self.addlist, 1) |
122 |
if mdiff.patch(a, d) != b: |
|
123 |
sys.stderr.write("*** sortdiff failed, falling back ***\n") |
|
124 |
return mdiff.textdiff(a, b) |
|
125 |
return d |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
126 |
else: |
44 | 127 |
return mdiff.textdiff(a, b) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
128 |
|
276 | 129 |
def add(self, map, flags, transaction, link, p1=None, p2=None): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
130 |
files = map.keys() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
131 |
files.sort() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
132 |
|
276 | 133 |
self.addlist = ["%s\000%s%s\n" % |
134 |
(f, hex(map[f]), flags[f] and "x" or '') |
|
135 |
for f in files] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
136 |
text = "".join(self.addlist) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
137 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
138 |
n = self.addrevision(text, transaction, link, p1, p2) |
302 | 139 |
self.mapcache = (n, map, flags) |
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
140 |
self.listcache = (text, self.addlist) |
140 | 141 |
self.addlist = None |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
142 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
143 |
return n |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
144 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
145 |
class changelog(revlog): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
146 |
def __init__(self, opener): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
147 |
revlog.__init__(self, opener, "00changelog.i", "00changelog.d") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
148 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
149 |
def extract(self, text): |
37 | 150 |
if not text: |
40 | 151 |
return (nullid, "", "0", [], "") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
152 |
last = text.index("\n\n") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
153 |
desc = text[last + 2:] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
154 |
l = text[:last].splitlines() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
155 |
manifest = bin(l[0]) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
156 |
user = l[1] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
157 |
date = l[2] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
158 |
files = l[3:] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
159 |
return (manifest, user, date, files, desc) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
160 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
161 |
def read(self, node): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
162 |
return self.extract(self.revision(node)) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
163 |
|
203 | 164 |
def add(self, manifest, list, desc, transaction, p1=None, p2=None, |
165 |
user=None, date=None): |
|
166 |
user = (user or |
|
167 |
os.environ.get("HGUSER") or |
|
55
2add70d51441
From: Thomas Arendsen Hein <thomas@intevation.de>
mpm@selenic.com
parents:
48
diff
changeset
|
168 |
os.environ.get("EMAIL") or |
2add70d51441
From: Thomas Arendsen Hein <thomas@intevation.de>
mpm@selenic.com
parents:
48
diff
changeset
|
169 |
os.environ.get("LOGNAME", "unknown") + '@' + socket.getfqdn()) |
203 | 170 |
date = date or "%d %d" % (time.time(), time.timezone) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
171 |
list.sort() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
172 |
l = [hex(manifest), user, date] + list + ["", desc] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
173 |
text = "\n".join(l) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
174 |
return self.addrevision(text, transaction, self.count(), p1, p2) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
175 |
|
220 | 176 |
class dirstate: |
244 | 177 |
def __init__(self, opener, ui, root): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
178 |
self.opener = opener |
244 | 179 |
self.root = root |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
180 |
self.dirty = 0 |
20 | 181 |
self.ui = ui |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
182 |
self.map = None |
227 | 183 |
self.pl = None |
220 | 184 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
185 |
def __del__(self): |
220 | 186 |
if self.dirty: |
187 |
self.write() |
|
188 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
189 |
def __getitem__(self, key): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
190 |
try: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
191 |
return self.map[key] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
192 |
except TypeError: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
193 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
194 |
return self[key] |
220 | 195 |
|
196 |
def __contains__(self, key): |
|
197 |
if not self.map: self.read() |
|
198 |
return key in self.map |
|
199 |
||
227 | 200 |
def parents(self): |
201 |
if not self.pl: |
|
202 |
self.read() |
|
203 |
return self.pl |
|
204 |
||
205 |
def setparents(self, p1, p2 = nullid): |
|
206 |
self.dirty = 1 |
|
207 |
self.pl = p1, p2 |
|
208 |
||
220 | 209 |
def state(self, key): |
210 |
try: |
|
211 |
return self[key][0] |
|
212 |
except KeyError: |
|
213 |
return "?" |
|
214 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
215 |
def read(self): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
216 |
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
|
217 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
218 |
self.map = {} |
227 | 219 |
self.pl = [nullid, nullid] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
220 |
try: |
220 | 221 |
st = self.opener("dirstate").read() |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
222 |
except: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
223 |
|
227 | 224 |
self.pl = [st[:20], st[20: 40]] |
225 |
||
226 |
pos = 40 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
227 |
while pos < len(st): |
220 | 228 |
e = struct.unpack(">cllll", st[pos:pos+17]) |
229 |
l = e[4] |
|
230 |
pos += 17 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
231 |
f = st[pos:pos + l] |
220 | 232 |
self.map[f] = e[:4] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
233 |
pos += l |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
234 |
|
220 | 235 |
def update(self, files, state): |
236 |
''' current states: |
|
237 |
n normal |
|
231 | 238 |
m needs merging |
220 | 239 |
r marked for removal |
240 |
a marked for addition''' |
|
241 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
242 |
if not files: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
243 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
244 |
self.dirty = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
245 |
for f in files: |
220 | 246 |
if state == "r": |
247 |
self.map[f] = ('r', 0, 0, 0) |
|
248 |
else: |
|
253 | 249 |
s = os.stat(os.path.join(self.root, f)) |
250 |
self.map[f] = (state, s.st_mode, s.st_size, s.st_mtime) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
251 |
|
220 | 252 |
def forget(self, files): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
253 |
if not files: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
254 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
255 |
self.dirty = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
256 |
for f in files: |
20 | 257 |
try: |
258 |
del self.map[f] |
|
259 |
except KeyError: |
|
220 | 260 |
self.ui.warn("not in dirstate: %s!\n" % f) |
20 | 261 |
pass |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
262 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
263 |
def clear(self): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
264 |
self.map = {} |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
265 |
self.dirty = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
266 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
267 |
def write(self): |
220 | 268 |
st = self.opener("dirstate", "w") |
227 | 269 |
st.write("".join(self.pl)) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
270 |
for f, e in self.map.items(): |
220 | 271 |
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
|
272 |
st.write(e + f) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
273 |
self.dirty = 0 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
274 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
275 |
def copy(self): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
276 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
277 |
return self.map.copy() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
278 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
279 |
# used to avoid circular references so destructors work |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
280 |
def opener(base): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
281 |
p = base |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
282 |
def o(path, mode="r"): |
15
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
283 |
if p[:7] == "http://": |
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
284 |
f = os.path.join(p, urllib.quote(path)) |
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
285 |
return httprangereader(f) |
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
286 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
287 |
f = os.path.join(p, path) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
288 |
|
292 | 289 |
mode += "b" # for that other OS |
290 |
||
291 |
if mode[0] != "r": |
|
110
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
292 |
try: |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
293 |
s = os.stat(f) |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
294 |
except OSError: |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
295 |
d = os.path.dirname(f) |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
296 |
if not os.path.isdir(d): |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
297 |
os.makedirs(d) |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
298 |
else: |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
299 |
if s.st_nlink > 1: |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
300 |
file(f + ".tmp", "w").write(file(f).read()) |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
301 |
os.rename(f+".tmp", f) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
302 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
303 |
return file(f, mode) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
304 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
305 |
return o |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
306 |
|
60 | 307 |
class localrepository: |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
308 |
def __init__(self, ui, path=None, create=0): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
309 |
self.remote = 0 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
310 |
if path and path[:7] == "http://": |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
311 |
self.remote = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
312 |
self.path = path |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
313 |
else: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
314 |
if not path: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
315 |
p = os.getcwd() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
316 |
while not os.path.isdir(os.path.join(p, ".hg")): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
317 |
p = os.path.dirname(p) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
318 |
if p == "/": raise "No repo found" |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
319 |
path = p |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
320 |
self.path = os.path.join(path, ".hg") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
321 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
322 |
self.root = path |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
323 |
self.ui = ui |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
324 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
325 |
if create: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
326 |
os.mkdir(self.path) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
327 |
os.mkdir(self.join("data")) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
328 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
329 |
self.opener = opener(self.path) |
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
330 |
self.wopener = opener(self.root) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
331 |
self.manifest = manifest(self.opener) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
332 |
self.changelog = changelog(self.opener) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
333 |
self.ignorelist = None |
67 | 334 |
self.tags = None |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
335 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
336 |
if not self.remote: |
244 | 337 |
self.dirstate = dirstate(self.opener, ui, self.root) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
338 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
339 |
def ignore(self, f): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
340 |
if self.ignorelist is None: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
341 |
self.ignorelist = [] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
342 |
try: |
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
343 |
l = self.wfile(".hgignore") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
344 |
for pat in l: |
9 | 345 |
if pat != "\n": |
346 |
self.ignorelist.append(re.compile(pat[:-1])) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
347 |
except IOError: pass |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
348 |
for pat in self.ignorelist: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
349 |
if pat.search(f): return True |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
350 |
return False |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
351 |
|
67 | 352 |
def lookup(self, key): |
353 |
if self.tags is None: |
|
354 |
self.tags = {} |
|
355 |
try: |
|
254 | 356 |
# read each head of the tags file, ending with the tip |
357 |
# and add each tag found to the map, with "newer" ones |
|
358 |
# taking precedence |
|
67 | 359 |
fl = self.file(".hgtags") |
254 | 360 |
h = fl.heads() |
361 |
h.reverse() |
|
362 |
for r in h: |
|
363 |
for l in fl.revision(r).splitlines(): |
|
364 |
if l: |
|
365 |
n, k = l.split(" ") |
|
366 |
self.tags[k] = bin(n) |
|
67 | 367 |
except KeyError: pass |
308 | 368 |
self.tags['tip'] = self.changelog.tip() |
67 | 369 |
try: |
370 |
return self.tags[key] |
|
371 |
except KeyError: |
|
372 |
return self.changelog.lookup(key) |
|
373 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
374 |
def join(self, f): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
375 |
return os.path.join(self.path, f) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
376 |
|
244 | 377 |
def wjoin(self, f): |
378 |
return os.path.join(self.root, f) |
|
379 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
380 |
def file(self, f): |
192 | 381 |
if f[0] == '/': f = f[1:] |
144
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
382 |
return filelog(self.opener, f) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
383 |
|
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
384 |
def wfile(self, f, mode='r'): |
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
385 |
return self.wopener(f, mode) |
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
386 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
387 |
def transaction(self): |
251 | 388 |
# save dirstate for undo |
263 | 389 |
try: |
390 |
ds = self.opener("dirstate").read() |
|
391 |
except IOError: |
|
392 |
ds = "" |
|
251 | 393 |
self.opener("undo.dirstate", "w").write(ds) |
262 | 394 |
|
395 |
return transaction.transaction(self.opener, self.join("journal"), |
|
396 |
self.join("undo")) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
397 |
|
210 | 398 |
def recover(self): |
225 | 399 |
lock = self.lock() |
210 | 400 |
if os.path.exists(self.join("recover")): |
401 |
self.ui.status("attempting to rollback interrupted transaction\n") |
|
262 | 402 |
return transaction.rollback(self.opener, self.join("recover")) |
210 | 403 |
else: |
404 |
self.ui.warn("no interrupted transaction available\n") |
|
405 |
||
406 |
def undo(self): |
|
225 | 407 |
lock = self.lock() |
210 | 408 |
if os.path.exists(self.join("undo")): |
409 |
self.ui.status("attempting to rollback last transaction\n") |
|
262 | 410 |
transaction.rollback(self.opener, self.join("undo")) |
251 | 411 |
self.dirstate = None |
412 |
os.rename(self.join("undo.dirstate"), self.join("dirstate")) |
|
413 |
self.dirstate = dirstate(self.opener, self.ui, self.root) |
|
163 | 414 |
else: |
210 | 415 |
self.ui.warn("no undo information available\n") |
162 | 416 |
|
161 | 417 |
def lock(self, wait = 1): |
418 |
try: |
|
419 |
return lock.lock(self.join("lock"), 0) |
|
420 |
except lock.LockHeld, inst: |
|
421 |
if wait: |
|
422 |
self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) |
|
423 |
return lock.lock(self.join("lock"), wait) |
|
424 |
raise inst |
|
425 |
||
203 | 426 |
def rawcommit(self, files, text, user, date, p1=None, p2=None): |
228 | 427 |
p1 = p1 or self.dirstate.parents()[0] or nullid |
428 |
p2 = p2 or self.dirstate.parents()[1] or nullid |
|
302 | 429 |
c1 = self.changelog.read(p1) |
430 |
c2 = self.changelog.read(p2) |
|
431 |
m1 = self.manifest.read(c1[0]) |
|
432 |
mf1 = self.manifest.readflags(c1[0]) |
|
433 |
m2 = self.manifest.read(c2[0]) |
|
434 |
||
203 | 435 |
tr = self.transaction() |
302 | 436 |
mm = m1.copy() |
437 |
mfm = mf1.copy() |
|
203 | 438 |
linkrev = self.changelog.count() |
439 |
for f in files: |
|
440 |
try: |
|
302 | 441 |
t = self.wfile(f).read() |
442 |
tm = is_exec(self.wjoin(f)) |
|
443 |
r = self.file(f) |
|
444 |
mfm[f] = tm |
|
445 |
mm[f] = r.add(t, tr, linkrev, |
|
446 |
m1.get(f, nullid), m2.get(f, nullid)) |
|
203 | 447 |
except IOError: |
302 | 448 |
del mm[f] |
449 |
del mfm[f] |
|
203 | 450 |
|
302 | 451 |
mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0]) |
452 |
n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date) |
|
203 | 453 |
tr.close() |
228 | 454 |
self.dirstate.setparents(p1, p2) |
220 | 455 |
self.dirstate.clear() |
302 | 456 |
self.dirstate.update(files, "n") |
203 | 457 |
|
229 | 458 |
def commit(self, files = None, text = ""): |
220 | 459 |
commit = [] |
460 |
remove = [] |
|
461 |
if files: |
|
462 |
for f in files: |
|
463 |
s = self.dirstate.state(f) |
|
244 | 464 |
if s in 'nmai': |
220 | 465 |
commit.append(f) |
466 |
elif s == 'r': |
|
467 |
remove.append(f) |
|
468 |
else: |
|
244 | 469 |
self.ui.warn("%s not tracked!\n" % f) |
220 | 470 |
else: |
230 | 471 |
(c, a, d, u) = self.diffdir(self.root) |
220 | 472 |
commit = c + a |
473 |
remove = d |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
474 |
|
220 | 475 |
if not commit and not remove: |
151 | 476 |
self.ui.status("nothing changed\n") |
477 |
return |
|
478 |
||
229 | 479 |
p1, p2 = self.dirstate.parents() |
480 |
c1 = self.changelog.read(p1) |
|
481 |
c2 = self.changelog.read(p2) |
|
482 |
m1 = self.manifest.read(c1[0]) |
|
276 | 483 |
mf1 = self.manifest.readflags(c1[0]) |
229 | 484 |
m2 = self.manifest.read(c2[0]) |
225 | 485 |
lock = self.lock() |
151 | 486 |
tr = self.transaction() |
487 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
488 |
# check in files |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
489 |
new = {} |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
490 |
linkrev = self.changelog.count() |
220 | 491 |
commit.sort() |
492 |
for f in commit: |
|
83 | 493 |
self.ui.note(f + "\n") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
494 |
try: |
276 | 495 |
fp = self.wjoin(f) |
496 |
mf1[f] = is_exec(fp) |
|
497 |
t = file(fp).read() |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
498 |
except IOError: |
220 | 499 |
self.warn("trouble committing %s!\n" % f) |
500 |
raise |
|
501 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
502 |
r = self.file(f) |
229 | 503 |
fp1 = m1.get(f, nullid) |
504 |
fp2 = m2.get(f, nullid) |
|
505 |
new[f] = r.add(t, tr, linkrev, fp1, fp2) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
506 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
507 |
# update manifest |
229 | 508 |
m1.update(new) |
509 |
for f in remove: del m1[f] |
|
276 | 510 |
mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0]) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
511 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
512 |
# add changeset |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
513 |
new = new.keys() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
514 |
new.sort() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
515 |
|
288 | 516 |
if not text: |
517 |
edittext = "\n" + "HG: manifest hash %s\n" % hex(mn) |
|
518 |
edittext += "".join(["HG: changed %s\n" % f for f in new]) |
|
519 |
edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
|
520 |
edittext = self.ui.edit(edittext) |
|
521 |
if not edittext.rstrip(): |
|
522 |
return 1 |
|
523 |
text = edittext |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
524 |
|
288 | 525 |
n = self.changelog.add(mn, new, text, tr, p1, p2) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
526 |
tr.close() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
527 |
|
229 | 528 |
self.dirstate.setparents(n) |
220 | 529 |
self.dirstate.update(new, "n") |
530 |
self.dirstate.forget(remove) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
531 |
|
230 | 532 |
def diffdir(self, path, changeset = None): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
533 |
changed = [] |
220 | 534 |
added = [] |
535 |
unknown = [] |
|
4
ce3bd728b858
Fix exception handling for reading current working version
mpm@selenic.com
parents:
0
diff
changeset
|
536 |
mf = {} |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
537 |
|
29 | 538 |
if changeset: |
539 |
change = self.changelog.read(changeset) |
|
4
ce3bd728b858
Fix exception handling for reading current working version
mpm@selenic.com
parents:
0
diff
changeset
|
540 |
mf = self.manifest.read(change[0]) |
230 | 541 |
dc = dict.fromkeys(mf) |
542 |
else: |
|
543 |
changeset = self.dirstate.parents()[0] |
|
544 |
change = self.changelog.read(changeset) |
|
545 |
mf = self.manifest.read(change[0]) |
|
220 | 546 |
dc = self.dirstate.copy() |
29 | 547 |
|
548 |
def fcmp(fn): |
|
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
549 |
t1 = self.wfile(fn).read() |
29 | 550 |
t2 = self.file(fn).revision(mf[fn]) |
551 |
return cmp(t1, t2) |
|
552 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
553 |
for dir, subdirs, files in os.walk(self.root): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
554 |
d = dir[len(self.root)+1:] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
555 |
if ".hg" in subdirs: subdirs.remove(".hg") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
556 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
557 |
for f in files: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
558 |
fn = os.path.join(d, f) |
64 | 559 |
try: s = os.stat(os.path.join(self.root, fn)) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
560 |
except: continue |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
561 |
if fn in dc: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
562 |
c = dc[fn] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
563 |
del dc[fn] |
220 | 564 |
if not c: |
29 | 565 |
if fcmp(fn): |
566 |
changed.append(fn) |
|
231 | 567 |
elif c[0] == 'm': |
568 |
changed.append(fn) |
|
220 | 569 |
elif c[0] == 'a': |
570 |
added.append(fn) |
|
571 |
elif c[0] == 'r': |
|
572 |
unknown.append(fn) |
|
276 | 573 |
elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100: |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
574 |
changed.append(fn) |
220 | 575 |
elif c[1] != s.st_mode or c[3] != s.st_mtime: |
29 | 576 |
if fcmp(fn): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
577 |
changed.append(fn) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
578 |
else: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
579 |
if self.ignore(fn): continue |
220 | 580 |
unknown.append(fn) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
581 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
582 |
deleted = dc.keys() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
583 |
deleted.sort() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
584 |
|
220 | 585 |
return (changed, added, deleted, unknown) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
586 |
|
32 | 587 |
def diffrevs(self, node1, node2): |
33 | 588 |
changed, added = [], [] |
32 | 589 |
|
590 |
change = self.changelog.read(node1) |
|
591 |
mf1 = self.manifest.read(change[0]) |
|
33 | 592 |
change = self.changelog.read(node2) |
32 | 593 |
mf2 = self.manifest.read(change[0]) |
594 |
||
595 |
for fn in mf2: |
|
596 |
if mf1.has_key(fn): |
|
597 |
if mf1[fn] != mf2[fn]: |
|
598 |
changed.append(fn) |
|
599 |
del mf1[fn] |
|
600 |
else: |
|
601 |
added.append(fn) |
|
602 |
||
603 |
deleted = mf1.keys() |
|
604 |
deleted.sort() |
|
605 |
||
606 |
return (changed, added, deleted) |
|
607 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
608 |
def add(self, list): |
220 | 609 |
for f in list: |
244 | 610 |
p = self.wjoin(f) |
220 | 611 |
if not os.path.isfile(p): |
612 |
self.ui.warn("%s does not exist!\n" % f) |
|
613 |
elif self.dirstate.state(f) == 'n': |
|
614 |
self.ui.warn("%s already tracked!\n" % f) |
|
615 |
else: |
|
616 |
self.dirstate.update([f], "a") |
|
617 |
||
618 |
def forget(self, list): |
|
619 |
for f in list: |
|
620 |
if self.dirstate.state(f) not in 'ai': |
|
621 |
self.ui.warn("%s not added!\n" % f) |
|
622 |
else: |
|
623 |
self.dirstate.forget([f]) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
624 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
625 |
def remove(self, list): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
626 |
for f in list: |
244 | 627 |
p = self.wjoin(f) |
220 | 628 |
if os.path.isfile(p): |
629 |
self.ui.warn("%s still exists!\n" % f) |
|
630 |
elif f not in self.dirstate: |
|
631 |
self.ui.warn("%s not tracked!\n" % f) |
|
632 |
else: |
|
633 |
self.dirstate.update([f], "r") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
634 |
|
222 | 635 |
def heads(self): |
636 |
return self.changelog.heads() |
|
637 |
||
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
638 |
def branches(self, nodes): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
639 |
if not nodes: nodes = [self.changelog.tip()] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
640 |
b = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
641 |
for n in nodes: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
642 |
t = n |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
643 |
while n: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
644 |
p = self.changelog.parents(n) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
645 |
if p[1] != nullid or p[0] == nullid: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
646 |
b.append((t, n, p[0], p[1])) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
647 |
break |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
648 |
n = p[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
649 |
return b |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
650 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
651 |
def between(self, pairs): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
652 |
r = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
653 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
654 |
for top, bottom in pairs: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
655 |
n, l, i = top, [], 0 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
656 |
f = 1 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
657 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
658 |
while n != bottom: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
659 |
p = self.changelog.parents(n)[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
660 |
if i == f: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
661 |
l.append(n) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
662 |
f = f * 2 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
663 |
n = p |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
664 |
i += 1 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
665 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
666 |
r.append(l) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
667 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
668 |
return r |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
669 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
670 |
def newer(self, nodes): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
671 |
m = {} |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
672 |
nl = [] |
94 | 673 |
pm = {} |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
674 |
cl = self.changelog |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
675 |
t = l = cl.count() |
94 | 676 |
|
677 |
# find the lowest numbered node |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
678 |
for n in nodes: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
679 |
l = min(l, cl.rev(n)) |
94 | 680 |
m[n] = 1 |
46 | 681 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
682 |
for i in xrange(l, t): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
683 |
n = cl.node(i) |
94 | 684 |
if n in m: # explicitly listed |
685 |
pm[n] = 1 |
|
686 |
nl.append(n) |
|
687 |
continue |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
688 |
for p in cl.parents(n): |
94 | 689 |
if p in pm: # parent listed |
690 |
pm[n] = 1 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
691 |
nl.append(n) |
94 | 692 |
break |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
693 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
694 |
return nl |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
695 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
696 |
def getchangegroup(self, remote): |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
697 |
m = self.changelog.nodemap |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
698 |
search = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
699 |
fetch = [] |
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
700 |
seen = {} |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
701 |
seenbranch = {} |
192 | 702 |
|
190
3dd5ce2fddb6
merge: short-circuit search for merge into empty repo
mpm@selenic.com
parents:
187
diff
changeset
|
703 |
# if we have an empty repo, fetch everything |
3dd5ce2fddb6
merge: short-circuit search for merge into empty repo
mpm@selenic.com
parents:
187
diff
changeset
|
704 |
if self.changelog.tip() == nullid: |
222 | 705 |
self.ui.status("requesting all changes\n") |
190
3dd5ce2fddb6
merge: short-circuit search for merge into empty repo
mpm@selenic.com
parents:
187
diff
changeset
|
706 |
return remote.changegroup([nullid]) |
3dd5ce2fddb6
merge: short-circuit search for merge into empty repo
mpm@selenic.com
parents:
187
diff
changeset
|
707 |
|
3dd5ce2fddb6
merge: short-circuit search for merge into empty repo
mpm@selenic.com
parents:
187
diff
changeset
|
708 |
# otherwise, assume we're closer to the tip than the root |
222 | 709 |
self.ui.status("searching for changes\n") |
710 |
heads = remote.heads() |
|
711 |
unknown = [] |
|
712 |
for h in heads: |
|
713 |
if h not in m: |
|
714 |
unknown.append(h) |
|
46 | 715 |
|
222 | 716 |
if not unknown: |
192 | 717 |
self.ui.status("nothing to do!\n") |
60 | 718 |
return None |
222 | 719 |
|
720 |
unknown = remote.branches(unknown) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
721 |
while unknown: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
722 |
n = unknown.pop(0) |
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
723 |
seen[n[0]] = 1 |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
724 |
|
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
725 |
self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1]))) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
726 |
if n == nullid: break |
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
727 |
if n in seenbranch: |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
728 |
self.ui.debug("branch already found\n") |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
729 |
continue |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
730 |
if n[1] and n[1] in m: # do we know the base? |
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
731 |
self.ui.debug("found incomplete branch %s:%s\n" |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
732 |
% (short(n[0]), short(n[1]))) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
733 |
search.append(n) # schedule branch range for scanning |
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
734 |
seenbranch[n] = 1 |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
735 |
else: |
94 | 736 |
if n[2] in m and n[3] in m: |
737 |
if n[1] not in fetch: |
|
738 |
self.ui.debug("found new changeset %s\n" % |
|
739 |
short(n[1])) |
|
740 |
fetch.append(n[1]) # earliest unknown |
|
741 |
continue |
|
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
742 |
|
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
743 |
r = [] |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
744 |
for a in n[2:4]: |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
745 |
if a not in seen: r.append(a) |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
746 |
|
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
747 |
if r: |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
748 |
self.ui.debug("requesting %s\n" % |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
749 |
" ".join(map(short, r))) |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
750 |
for b in remote.branches(r): |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
751 |
self.ui.debug("received %s:%s\n" % |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
752 |
(short(b[0]), short(b[1]))) |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
753 |
if b[0] not in m and b[0] not in seen: |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
754 |
unknown.append(b) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
755 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
756 |
while search: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
757 |
n = search.pop(0) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
758 |
l = remote.between([(n[0], n[1])])[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
759 |
p = n[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
760 |
f = 1 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
761 |
for i in l + [n[1]]: |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
762 |
if i in m: |
85 | 763 |
if f <= 2: |
83 | 764 |
self.ui.debug("found new branch changeset %s\n" % |
765 |
short(p)) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
766 |
fetch.append(p) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
767 |
else: |
83 | 768 |
self.ui.debug("narrowed branch search to %s:%s\n" |
769 |
% (short(p), short(i))) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
770 |
search.append((p, i)) |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
771 |
break |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
772 |
p, f = i, f * 2 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
773 |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
774 |
for f in fetch: |
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
775 |
if f in m: |
83 | 776 |
raise "already have", short(f[:4]) |
777 |
||
94 | 778 |
self.ui.note("adding new changesets starting at " + |
83 | 779 |
" ".join([short(f) for f in fetch]) + "\n") |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
780 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
781 |
return remote.changegroup(fetch) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
782 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
783 |
def changegroup(self, basenodes): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
784 |
nodes = self.newer(basenodes) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
785 |
|
46 | 786 |
# construct the link map |
787 |
linkmap = {} |
|
788 |
for n in nodes: |
|
789 |
linkmap[self.changelog.rev(n)] = n |
|
790 |
||
791 |
# construct a list of all changed files |
|
792 |
changed = {} |
|
793 |
for n in nodes: |
|
794 |
c = self.changelog.read(n) |
|
795 |
for f in c[3]: |
|
796 |
changed[f] = 1 |
|
797 |
changed = changed.keys() |
|
798 |
changed.sort() |
|
799 |
||
800 |
# the changegroup is changesets + manifests + all file revs |
|
801 |
revs = [ self.changelog.rev(n) for n in nodes ] |
|
802 |
||
192 | 803 |
for y in self.changelog.group(linkmap): yield y |
804 |
for y in self.manifest.group(linkmap): yield y |
|
46 | 805 |
for f in changed: |
192 | 806 |
yield struct.pack(">l", len(f) + 4) + f |
46 | 807 |
g = self.file(f).group(linkmap) |
192 | 808 |
for y in g: |
809 |
yield y |
|
46 | 810 |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
811 |
def addchangegroup(self, generator): |
222 | 812 |
|
813 |
class genread: |
|
814 |
def __init__(self, generator): |
|
815 |
self.g = generator |
|
816 |
self.buf = "" |
|
817 |
def read(self, l): |
|
818 |
while l > len(self.buf): |
|
819 |
try: |
|
820 |
self.buf += self.g.next() |
|
821 |
except StopIteration: |
|
822 |
break |
|
823 |
d, self.buf = self.buf[:l], self.buf[l:] |
|
824 |
return d |
|
825 |
||
826 |
def getchunk(): |
|
827 |
d = source.read(4) |
|
828 |
if not d: return "" |
|
829 |
l = struct.unpack(">l", d)[0] |
|
830 |
if l <= 4: return "" |
|
831 |
return source.read(l - 4) |
|
832 |
||
833 |
def getgroup(): |
|
834 |
while 1: |
|
835 |
c = getchunk() |
|
836 |
if not c: break |
|
837 |
yield c |
|
838 |
||
839 |
def csmap(x): |
|
840 |
self.ui.debug("add changeset %s\n" % short(x)) |
|
841 |
return self.changelog.count() |
|
842 |
||
843 |
def revmap(x): |
|
844 |
return self.changelog.rev(x) |
|
845 |
||
846 |
if not generator: return |
|
847 |
changesets = files = revisions = 0 |
|
225 | 848 |
|
222 | 849 |
source = genread(generator) |
225 | 850 |
lock = self.lock() |
222 | 851 |
tr = self.transaction() |
852 |
||
853 |
# pull off the changeset group |
|
854 |
self.ui.status("adding changesets\n") |
|
855 |
co = self.changelog.tip() |
|
224
ccbcc4d76f81
fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents:
223
diff
changeset
|
856 |
cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique |
222 | 857 |
changesets = self.changelog.rev(cn) - self.changelog.rev(co) |
858 |
||
859 |
# pull off the manifest group |
|
860 |
self.ui.status("adding manifests\n") |
|
861 |
mm = self.manifest.tip() |
|
862 |
mo = self.manifest.addgroup(getgroup(), revmap, tr) |
|
863 |
||
864 |
# process the files |
|
865 |
self.ui.status("adding file revisions\n") |
|
866 |
while 1: |
|
867 |
f = getchunk() |
|
868 |
if not f: break |
|
869 |
self.ui.debug("adding %s revisions\n" % f) |
|
870 |
fl = self.file(f) |
|
871 |
o = fl.tip() |
|
872 |
n = fl.addgroup(getgroup(), revmap, tr) |
|
873 |
revisions += fl.rev(n) - fl.rev(o) |
|
874 |
files += 1 |
|
875 |
||
876 |
self.ui.status(("modified %d files, added %d changesets" + |
|
877 |
" and %d new revisions\n") |
|
878 |
% (files, changesets, revisions)) |
|
879 |
||
880 |
tr.close() |
|
881 |
return |
|
882 |
||
275 | 883 |
def update(self, node, allow=False, force=False): |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
884 |
pl = self.dirstate.parents() |
275 | 885 |
if not force and pl[1] != nullid: |
254 | 886 |
self.ui.warn("aborting: outstanding uncommitted merges\n") |
46 | 887 |
return |
888 |
||
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
889 |
p1, p2 = pl[0], node |
305 | 890 |
pa = self.changelog.ancestor(p1, p2) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
891 |
m1n = self.changelog.read(p1)[0] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
892 |
m2n = self.changelog.read(p2)[0] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
893 |
man = self.manifest.ancestor(m1n, m2n) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
894 |
m1 = self.manifest.read(m1n) |
276 | 895 |
mf1 = self.manifest.readflags(m1n) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
896 |
m2 = self.manifest.read(m2n) |
276 | 897 |
mf2 = self.manifest.readflags(m2n) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
898 |
ma = self.manifest.read(man) |
276 | 899 |
mfa = self.manifest.readflags(m2n) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
900 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
901 |
(c, a, d, u) = self.diffdir(self.root) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
902 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
903 |
# resolve the manifest to determine which files |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
904 |
# we care about merging |
254 | 905 |
self.ui.note("resolving manifests\n") |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
906 |
self.ui.debug(" ancestor %s local %s remote %s\n" % |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
907 |
(short(man), short(m1n), short(m2n))) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
908 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
909 |
merge = {} |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
910 |
get = {} |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
911 |
remove = [] |
305 | 912 |
mark = {} |
46 | 913 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
914 |
# construct a working dir manifest |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
915 |
mw = m1.copy() |
276 | 916 |
mfw = mf1.copy() |
254 | 917 |
for f in a + c + u: |
918 |
mw[f] = "" |
|
276 | 919 |
mfw[f] = is_exec(self.wjoin(f)) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
920 |
for f in d: |
254 | 921 |
if f in mw: del mw[f] |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
922 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
923 |
for f, n in mw.iteritems(): |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
924 |
if f in m2: |
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
925 |
s = 0 |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
926 |
|
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
927 |
# are files different? |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
928 |
if n != m2[f]: |
254 | 929 |
a = ma.get(f, nullid) |
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
930 |
# are both different from the ancestor? |
254 | 931 |
if n != a and m2[f] != a: |
273
4f8174389001
merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents:
263
diff
changeset
|
932 |
self.ui.debug(" %s versions differ, resolve\n" % f) |
254 | 933 |
merge[f] = (m1.get(f, nullid), m2[f]) |
276 | 934 |
# merge executable bits |
935 |
# "if we changed or they changed, change in merge" |
|
936 |
a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
|
937 |
mode = ((a^b) | (a^c)) ^ a |
|
938 |
merge[f] = (m1.get(f, nullid), m2[f], mode) |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
939 |
s = 1 |
305 | 940 |
# are we clobbering? |
941 |
# is remote's version newer? |
|
942 |
# or are we going back in time? |
|
943 |
elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]): |
|
273
4f8174389001
merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents:
263
diff
changeset
|
944 |
self.ui.debug(" remote %s is newer, get\n" % f) |
254 | 945 |
get[f] = m2[f] |
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
946 |
s = 1 |
305 | 947 |
else: |
948 |
mark[f] = 1 |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
949 |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
950 |
if not s and mfw[f] != mf2[f]: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
951 |
if force: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
952 |
self.ui.debug(" updating permissions for %s\n" % f) |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
953 |
set_exec(self.wjoin(f), mf2[f]) |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
954 |
else: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
955 |
a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
956 |
mode = ((a^b) | (a^c)) ^ a |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
957 |
if mode != b: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
958 |
self.ui.debug(" updating permissions for %s\n" % f) |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
959 |
set_exec(self.wjoin(f), mode) |
305 | 960 |
mark[f] = 1 |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
961 |
del m2[f] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
962 |
elif f in ma: |
275 | 963 |
if not force and n != ma[f]: |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
964 |
r = self.ui.prompt( |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
965 |
(" local changed %s which remote deleted\n" % f) + |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
966 |
"(k)eep or (d)elete?", "[kd]", "k") |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
967 |
if r == "d": |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
968 |
remove.append(f) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
969 |
else: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
970 |
self.ui.debug("other deleted %s\n" % f) |
254 | 971 |
remove.append(f) # other deleted it |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
972 |
else: |
254 | 973 |
if n == m1.get(f, nullid): # same as parent |
974 |
self.ui.debug("remote deleted %s\n" % f) |
|
975 |
remove.append(f) |
|
976 |
else: |
|
977 |
self.ui.debug("working dir created %s, keeping\n" % f) |
|
46 | 978 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
979 |
for f, n in m2.iteritems(): |
256 | 980 |
if f[0] == "/": continue |
275 | 981 |
if not force and f in ma and n != ma[f]: |
982 |
r = self.ui.prompt( |
|
983 |
("remote changed %s which local deleted\n" % f) + |
|
984 |
"(k)eep or (d)elete?", "[kd]", "k") |
|
985 |
if r == "d": remove.append(f) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
986 |
else: |
254 | 987 |
self.ui.debug("remote created %s\n" % f) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
988 |
get[f] = n |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
989 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
990 |
del mw, m1, m2, ma |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
991 |
|
275 | 992 |
if force: |
993 |
for f in merge: |
|
994 |
get[f] = merge[f][1] |
|
995 |
merge = {} |
|
996 |
||
305 | 997 |
if pa == p1 or pa == p2: |
254 | 998 |
# we don't need to do any magic, just jump to the new rev |
999 |
mode = 'n' |
|
1000 |
p1, p2 = p2, nullid |
|
1001 |
else: |
|
275 | 1002 |
if not allow: |
305 | 1003 |
self.ui.status("this update spans a branch" + |
1004 |
" affecting the following files:\n") |
|
1005 |
fl = merge.keys() + get.keys() |
|
1006 |
fl.sort() |
|
1007 |
for f in fl: |
|
1008 |
cf = "" |
|
1009 |
if f in merge: cf = " (resolve)" |
|
1010 |
self.ui.status(" %s%s\n" % (f, cf)) |
|
1011 |
self.ui.warn("aborting update spanning branches!\n") |
|
1012 |
self.ui.status("(use update -m to perform a branch merge)\n") |
|
275 | 1013 |
return 1 |
254 | 1014 |
# we have to remember what files we needed to get/change |
1015 |
# because any file that's different from either one of its |
|
1016 |
# parents must be in the changeset |
|
1017 |
mode = 'm' |
|
305 | 1018 |
self.dirstate.update(mark.keys(), "m") |
254 | 1019 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1020 |
self.dirstate.setparents(p1, p2) |
191
d7e859cf2f1b
merge: add count of new manifests, files, and revisions
mpm@selenic.com
parents:
190
diff
changeset
|
1021 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1022 |
# get the files we don't need to change |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1023 |
files = get.keys() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1024 |
files.sort() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1025 |
for f in files: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1026 |
if f[0] == "/": continue |
273
4f8174389001
merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents:
263
diff
changeset
|
1027 |
self.ui.note("getting %s\n" % f) |
276 | 1028 |
t = self.file(f).read(get[f]) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1029 |
try: |
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
1030 |
self.wfile(f, "w").write(t) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1031 |
except IOError: |
297
0dbcf3c9ff20
Fixed usage of removed variable 'wp'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
292
diff
changeset
|
1032 |
os.makedirs(os.path.dirname(self.wjoin(f))) |
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
1033 |
self.wfile(f, "w").write(t) |
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
1034 |
set_exec(self.wjoin(f), mf2[f]) |
254 | 1035 |
self.dirstate.update([f], mode) |
46 | 1036 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1037 |
# merge the tricky bits |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1038 |
files = merge.keys() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1039 |
files.sort() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1040 |
for f in files: |
256 | 1041 |
self.ui.status("merging %s\n" % f) |
276 | 1042 |
m, o, flag = merge[f] |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1043 |
self.merge3(f, m, o) |
297
0dbcf3c9ff20
Fixed usage of removed variable 'wp'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
292
diff
changeset
|
1044 |
set_exec(self.wjoin(f), flag) |
254 | 1045 |
self.dirstate.update([f], 'm') |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1046 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1047 |
for f in remove: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1048 |
self.ui.note("removing %s\n" % f) |
254 | 1049 |
os.unlink(f) |
1050 |
if mode == 'n': |
|
1051 |
self.dirstate.forget(remove) |
|
1052 |
else: |
|
1053 |
self.dirstate.update(remove, 'r') |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1054 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1055 |
def merge3(self, fn, my, other): |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1056 |
"""perform a 3-way merge in the working directory""" |
249 | 1057 |
|
96 | 1058 |
def temp(prefix, node): |
1059 |
pre = "%s~%s." % (os.path.basename(fn), prefix) |
|
1060 |
(fd, name) = tempfile.mkstemp("", pre) |
|
1061 |
f = os.fdopen(fd, "w") |
|
1062 |
f.write(fl.revision(node)) |
|
1063 |
f.close() |
|
1064 |
return name |
|
1065 |
||
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1066 |
fl = self.file(fn) |
96 | 1067 |
base = fl.ancestor(my, other) |
244 | 1068 |
a = self.wjoin(fn) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1069 |
b = temp("other", other) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1070 |
c = temp("base", base) |
96 | 1071 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1072 |
self.ui.note("resolving %s\n" % fn) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1073 |
self.ui.debug("file %s: other %s ancestor %s\n" % |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1074 |
(fn, short(other), short(base))) |
96 | 1075 |
|
240 | 1076 |
cmd = os.environ.get("HGMERGE", "hgmerge") |
1077 |
r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1078 |
if r: |
275 | 1079 |
self.ui.warn("merging %s failed!\n" % fn) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1080 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1081 |
os.unlink(b) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1082 |
os.unlink(c) |
96 | 1083 |
|
247 | 1084 |
def verify(self): |
1085 |
filelinkrevs = {} |
|
1086 |
filenodes = {} |
|
1087 |
changesets = revisions = files = 0 |
|
1088 |
errors = 0 |
|
1089 |
||
302 | 1090 |
seen = {} |
247 | 1091 |
self.ui.status("checking changesets\n") |
1092 |
for i in range(self.changelog.count()): |
|
1093 |
changesets += 1 |
|
1094 |
n = self.changelog.node(i) |
|
302 | 1095 |
if n in seen: |
1096 |
self.ui.warn("duplicate changeset at revision %d\n" % i) |
|
1097 |
errors += 1 |
|
1098 |
seen[n] = 1 |
|
1099 |
||
247 | 1100 |
for p in self.changelog.parents(n): |
1101 |
if p not in self.changelog.nodemap: |
|
1102 |
self.ui.warn("changeset %s has unknown parent %s\n" % |
|
1103 |
(short(n), short(p))) |
|
1104 |
errors += 1 |
|
1105 |
try: |
|
1106 |
changes = self.changelog.read(n) |
|
1107 |
except Exception, inst: |
|
1108 |
self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst)) |
|
1109 |
errors += 1 |
|
1110 |
||
1111 |
for f in changes[3]: |
|
1112 |
filelinkrevs.setdefault(f, []).append(i) |
|
1113 |
||
302 | 1114 |
seen = {} |
247 | 1115 |
self.ui.status("checking manifests\n") |
1116 |
for i in range(self.manifest.count()): |
|
1117 |
n = self.manifest.node(i) |
|
302 | 1118 |
if n in seen: |
1119 |
self.ui.warn("duplicate manifest at revision %d\n" % i) |
|
1120 |
errors += 1 |
|
1121 |
seen[n] = 1 |
|
1122 |
||
247 | 1123 |
for p in self.manifest.parents(n): |
1124 |
if p not in self.manifest.nodemap: |
|
1125 |
self.ui.warn("manifest %s has unknown parent %s\n" % |
|
1126 |
(short(n), short(p))) |
|
1127 |
errors += 1 |
|
1128 |
||
1129 |
try: |
|
1130 |
delta = mdiff.patchtext(self.manifest.delta(n)) |
|
1131 |
except KeyboardInterrupt: |
|
1132 |
print "aborted" |
|
1133 |
sys.exit(0) |
|
1134 |
except Exception, inst: |
|
1135 |
self.ui.warn("unpacking manifest %s: %s\n" |
|
1136 |
% (short(n), inst)) |
|
1137 |
errors += 1 |
|
1138 |
||
1139 |
ff = [ l.split('\0') for l in delta.splitlines() ] |
|
1140 |
for f, fn in ff: |
|
284 | 1141 |
filenodes.setdefault(f, {})[bin(fn[:40])] = 1 |
247 | 1142 |
|
1143 |
self.ui.status("crosschecking files in changesets and manifests\n") |
|
1144 |
for f in filenodes: |
|
1145 |
if f not in filelinkrevs: |
|
1146 |
self.ui.warn("file %s in manifest but not in changesets\n" % f) |
|
1147 |
errors += 1 |
|
1148 |
||
1149 |
for f in filelinkrevs: |
|
1150 |
if f not in filenodes: |
|
1151 |
self.ui.warn("file %s in changeset but not in manifest\n" % f) |
|
1152 |
errors += 1 |
|
1153 |
||
1154 |
self.ui.status("checking files\n") |
|
1155 |
ff = filenodes.keys() |
|
1156 |
ff.sort() |
|
1157 |
for f in ff: |
|
1158 |
if f == "/dev/null": continue |
|
1159 |
files += 1 |
|
1160 |
fl = self.file(f) |
|
1161 |
nodes = { nullid: 1 } |
|
302 | 1162 |
seen = {} |
247 | 1163 |
for i in range(fl.count()): |
1164 |
revisions += 1 |
|
1165 |
n = fl.node(i) |
|
1166 |
||
302 | 1167 |
if n in seen: |
1168 |
self.ui.warn("%s: duplicate revision %d\n" % (f, i)) |
|
1169 |
errors += 1 |
|
1170 |
||
247 | 1171 |
if n not in filenodes[f]: |
1172 |
self.ui.warn("%s: %d:%s not in manifests\n" |
|
1173 |
% (f, i, short(n))) |
|
1174 |
print len(filenodes[f].keys()), fl.count(), f |
|
1175 |
errors += 1 |
|
1176 |
else: |
|
1177 |
del filenodes[f][n] |
|
1178 |
||
1179 |
flr = fl.linkrev(n) |
|
1180 |
if flr not in filelinkrevs[f]: |
|
1181 |
self.ui.warn("%s:%s points to unexpected changeset %d\n" |
|
1182 |
% (f, short(n), fl.linkrev(n))) |
|
1183 |
errors += 1 |
|
1184 |
else: |
|
1185 |
filelinkrevs[f].remove(flr) |
|
1186 |
||
1187 |
# verify contents |
|
1188 |
try: |
|
1189 |
t = fl.read(n) |
|
1190 |
except Exception, inst: |
|
1191 |
self.ui.warn("unpacking file %s %s: %s\n" |
|
1192 |
% (f, short(n), inst)) |
|
1193 |
errors += 1 |
|
1194 |
||
1195 |
# verify parents |
|
1196 |
(p1, p2) = fl.parents(n) |
|
1197 |
if p1 not in nodes: |
|
1198 |
self.ui.warn("file %s:%s unknown parent 1 %s" % |
|
1199 |
(f, short(n), short(p1))) |
|
1200 |
errors += 1 |
|
1201 |
if p2 not in nodes: |
|
1202 |
self.ui.warn("file %s:%s unknown parent 2 %s" % |
|
1203 |
(f, short(n), short(p1))) |
|
1204 |
errors += 1 |
|
1205 |
nodes[n] = 1 |
|
1206 |
||
1207 |
# cross-check |
|
1208 |
for node in filenodes[f]: |
|
1209 |
self.ui.warn("node %s in manifests not in %s\n" |
|
1210 |
% (hex(n), f)) |
|
1211 |
errors += 1 |
|
1212 |
||
1213 |
self.ui.status("%d files, %d changesets, %d total revisions\n" % |
|
1214 |
(files, changesets, revisions)) |
|
1215 |
||
1216 |
if errors: |
|
1217 |
self.ui.warn("%d integrity errors encountered!\n" % errors) |
|
1218 |
return 1 |
|
1219 |
||
60 | 1220 |
class remoterepository: |
1221 |
def __init__(self, ui, path): |
|
176
1d8e9637a0a4
Change hg: protocol name to http: and http: to old-http:
mpm@selenic.com
parents:
171
diff
changeset
|
1222 |
self.url = path |
60 | 1223 |
self.ui = ui |
1224 |
||
1225 |
def do_cmd(self, cmd, **args): |
|
83 | 1226 |
self.ui.debug("sending %s command\n" % cmd) |
60 | 1227 |
q = {"cmd": cmd} |
1228 |
q.update(args) |
|
1229 |
qs = urllib.urlencode(q) |
|
1230 |
cu = "%s?%s" % (self.url, qs) |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1231 |
return urllib.urlopen(cu) |
60 | 1232 |
|
222 | 1233 |
def heads(self): |
1234 |
d = self.do_cmd("heads").read() |
|
1235 |
try: |
|
1236 |
return map(bin, d[:-1].split(" ")) |
|
1237 |
except: |
|
1238 |
self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1239 |
raise |
|
1240 |
||
60 | 1241 |
def branches(self, nodes): |
1242 |
n = " ".join(map(hex, nodes)) |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1243 |
d = self.do_cmd("branches", nodes=n).read() |
217 | 1244 |
try: |
1245 |
br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] |
|
1246 |
return br |
|
1247 |
except: |
|
1248 |
self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1249 |
raise |
|
60 | 1250 |
|
1251 |
def between(self, pairs): |
|
1252 |
n = "\n".join(["-".join(map(hex, p)) for p in pairs]) |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1253 |
d = self.do_cmd("between", pairs=n).read() |
217 | 1254 |
try: |
1255 |
p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] |
|
1256 |
return p |
|
1257 |
except: |
|
1258 |
self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1259 |
raise |
|
60 | 1260 |
|
1261 |
def changegroup(self, nodes): |
|
1262 |
n = " ".join(map(hex, nodes)) |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1263 |
zd = zlib.decompressobj() |
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1264 |
f = self.do_cmd("changegroup", roots=n) |
192 | 1265 |
bytes = 0 |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1266 |
while 1: |
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1267 |
d = f.read(4096) |
192 | 1268 |
bytes += len(d) |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1269 |
if not d: |
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1270 |
yield zd.flush() |
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1271 |
break |
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1272 |
yield zd.decompress(d) |
192 | 1273 |
self.ui.note("%d bytes of data transfered\n" % bytes) |
60 | 1274 |
|
1275 |
def repository(ui, path=None, create=0): |
|
176
1d8e9637a0a4
Change hg: protocol name to http: and http: to old-http:
mpm@selenic.com
parents:
171
diff
changeset
|
1276 |
if path and path[:7] == "http://": |
1d8e9637a0a4
Change hg: protocol name to http: and http: to old-http:
mpm@selenic.com
parents:
171
diff
changeset
|
1277 |
return remoterepository(ui, path) |
60 | 1278 |
if path and path[:5] == "hg://": |
176
1d8e9637a0a4
Change hg: protocol name to http: and http: to old-http:
mpm@selenic.com
parents:
171
diff
changeset
|
1279 |
return remoterepository(ui, path.replace("hg://", "http://")) |
1d8e9637a0a4
Change hg: protocol name to http: and http: to old-http:
mpm@selenic.com
parents:
171
diff
changeset
|
1280 |
if path and path[:11] == "old-http://": |
1d8e9637a0a4
Change hg: protocol name to http: and http: to old-http:
mpm@selenic.com
parents:
171
diff
changeset
|
1281 |
return localrepository(ui, path.replace("old-http://", "http://")) |
60 | 1282 |
else: |
1283 |
return localrepository(ui, path, create) |
|
1284 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1285 |
class httprangereader: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1286 |
def __init__(self, url): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1287 |
self.url = url |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1288 |
self.pos = 0 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1289 |
def seek(self, pos): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1290 |
self.pos = pos |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1291 |
def read(self, bytes=None): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1292 |
opener = urllib2.build_opener(byterange.HTTPRangeHandler()) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1293 |
urllib2.install_opener(opener) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1294 |
req = urllib2.Request(self.url) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1295 |
end = '' |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1296 |
if bytes: end = self.pos + bytes |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1297 |
req.add_header('Range', 'bytes=%d-%s' % (self.pos, end)) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1298 |
f = urllib2.urlopen(req) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
1299 |
return f.read() |