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