author | Thomas Arendsen Hein <thomas@intevation.de> |
Thu, 14 Jul 2005 16:57:01 +0100 | |
changeset 701 | 80ed193efff7 |
parent 691 | 61c6b4178b9e |
child 703 | fb6f85ecc863 |
child 705 | 574869103985 |
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") |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
14 |
demandload(globals(), "bisect select") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
15 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
16 |
class filelog(revlog): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
17 |
def __init__(self, opener, path): |
144
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
18 |
revlog.__init__(self, opener, |
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
19 |
os.path.join("data", path + ".i"), |
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
20 |
os.path.join("data", path + ".d")) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
21 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
22 |
def read(self, node): |
360 | 23 |
t = self.revision(node) |
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
24 |
if not t.startswith('\1\n'): |
360 | 25 |
return t |
26 |
s = t.find('\1\n', 2) |
|
27 |
return t[s+2:] |
|
28 |
||
29 |
def readmeta(self, node): |
|
30 |
t = self.revision(node) |
|
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
31 |
if not t.startswith('\1\n'): |
360 | 32 |
return t |
33 |
s = t.find('\1\n', 2) |
|
34 |
mt = t[2:s] |
|
35 |
for l in mt.splitlines(): |
|
36 |
k, v = l.split(": ", 1) |
|
37 |
m[k] = v |
|
38 |
return m |
|
39 |
||
40 |
def add(self, text, meta, transaction, link, p1=None, p2=None): |
|
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
41 |
if meta or text.startswith('\1\n'): |
360 | 42 |
mt = "" |
43 |
if meta: |
|
44 |
mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] |
|
45 |
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
|
46 |
return self.addrevision(text, transaction, link, p1, p2) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
47 |
|
79 | 48 |
def annotate(self, node): |
199 | 49 |
|
50 |
def decorate(text, rev): |
|
436 | 51 |
return ([rev] * len(text.splitlines()), text) |
199 | 52 |
|
53 |
def pair(parent, child): |
|
436 | 54 |
for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]): |
471 | 55 |
child[0][b1:b2] = parent[0][a1:a2] |
56 |
return child |
|
199 | 57 |
|
200 | 58 |
# find all ancestors |
216
201115f2859b
hg annotate: actually annotate the given version
mpm@selenic.com
parents:
210
diff
changeset
|
59 |
needed = {node:1} |
199 | 60 |
visit = [node] |
61 |
while visit: |
|
62 |
n = visit.pop(0) |
|
63 |
for p in self.parents(n): |
|
64 |
if p not in needed: |
|
65 |
needed[p] = 1 |
|
66 |
visit.append(p) |
|
200 | 67 |
else: |
68 |
# count how many times we'll use this |
|
69 |
needed[p] += 1 |
|
199 | 70 |
|
200 | 71 |
# sort by revision which is a topological order |
471 | 72 |
visit = [ (self.rev(n), n) for n in needed.keys() ] |
199 | 73 |
visit.sort() |
74 |
hist = {} |
|
75 |
||
471 | 76 |
for r,n in visit: |
199 | 77 |
curr = decorate(self.read(n), self.linkrev(n)) |
78 |
for p in self.parents(n): |
|
79 |
if p != nullid: |
|
80 |
curr = pair(hist[p], curr) |
|
200 | 81 |
# trim the history of unneeded revs |
82 |
needed[p] -= 1 |
|
83 |
if not needed[p]: |
|
84 |
del hist[p] |
|
199 | 85 |
hist[n] = curr |
86 |
||
436 | 87 |
return zip(hist[n][0], hist[n][1].splitlines(1)) |
79 | 88 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
89 |
class manifest(revlog): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
90 |
def __init__(self, opener): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
91 |
self.mapcache = None |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
92 |
self.listcache = None |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
93 |
self.addlist = None |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
94 |
revlog.__init__(self, opener, "00manifest.i", "00manifest.d") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
95 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
96 |
def read(self, node): |
313 | 97 |
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
|
98 |
if self.mapcache and self.mapcache[0] == node: |
561 | 99 |
return self.mapcache[1] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
100 |
text = self.revision(node) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
101 |
map = {} |
276 | 102 |
flag = {} |
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
103 |
self.listcache = (text, text.splitlines(1)) |
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
104 |
for l in self.listcache[1]: |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
105 |
(f, n) = l.split('\0') |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
106 |
map[f] = bin(n[:40]) |
276 | 107 |
flag[f] = (n[40:-1] == "x") |
108 |
self.mapcache = (node, map, flag) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
109 |
return map |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
110 |
|
276 | 111 |
def readflags(self, node): |
313 | 112 |
if node == nullid: return {} # don't upset local cache |
358
9f4077d7ef6f
[PATCH] manifest.readflags performance buglet
mpm@selenic.com
parents:
350
diff
changeset
|
113 |
if not self.mapcache or self.mapcache[0] != node: |
276 | 114 |
self.read(node) |
115 |
return self.mapcache[2] |
|
116 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
117 |
def diff(self, a, b): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
118 |
# this is sneaky, as we're not actually using a and b |
140 | 119 |
if self.listcache and self.addlist and self.listcache[0] == a: |
98 | 120 |
d = mdiff.diff(self.listcache[1], self.addlist, 1) |
121 |
if mdiff.patch(a, d) != b: |
|
122 |
sys.stderr.write("*** sortdiff failed, falling back ***\n") |
|
123 |
return mdiff.textdiff(a, b) |
|
124 |
return d |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
125 |
else: |
44 | 126 |
return mdiff.textdiff(a, b) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
127 |
|
644 | 128 |
def add(self, map, flags, transaction, link, p1=None, p2=None,changed=None): |
129 |
# directly generate the mdiff delta from the data collected during |
|
130 |
# the bisect loop below |
|
131 |
def gendelta(delta): |
|
132 |
i = 0 |
|
133 |
result = [] |
|
134 |
while i < len(delta): |
|
135 |
start = delta[i][2] |
|
136 |
end = delta[i][3] |
|
137 |
l = delta[i][4] |
|
138 |
if l == None: |
|
139 |
l = "" |
|
140 |
while i < len(delta) - 1 and start <= delta[i+1][2] and end >= delta[i+1][2]: |
|
141 |
if delta[i+1][3] > end: |
|
142 |
end = delta[i+1][3] |
|
143 |
if delta[i+1][4]: |
|
144 |
l += delta[i+1][4] |
|
145 |
i += 1 |
|
146 |
result.append(struct.pack(">lll", start, end, len(l)) + l) |
|
147 |
i += 1 |
|
148 |
return result |
|
149 |
||
150 |
# apply the changes collected during the bisect loop to our addlist |
|
151 |
def addlistdelta(addlist, delta): |
|
152 |
# apply the deltas to the addlist. start from the bottom up |
|
153 |
# so changes to the offsets don't mess things up. |
|
154 |
i = len(delta) |
|
155 |
while i > 0: |
|
156 |
i -= 1 |
|
157 |
start = delta[i][0] |
|
158 |
end = delta[i][1] |
|
159 |
if delta[i][4]: |
|
160 |
addlist[start:end] = [delta[i][4]] |
|
161 |
else: |
|
162 |
del addlist[start:end] |
|
163 |
return addlist |
|
164 |
||
165 |
# calculate the byte offset of the start of each line in the |
|
166 |
# manifest |
|
167 |
def calcoffsets(addlist): |
|
168 |
offsets = [0] * (len(addlist) + 1) |
|
169 |
offset = 0 |
|
170 |
i = 0 |
|
171 |
while i < len(addlist): |
|
172 |
offsets[i] = offset |
|
173 |
offset += len(addlist[i]) |
|
174 |
i += 1 |
|
175 |
offsets[i] = offset |
|
176 |
return offsets |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
177 |
|
644 | 178 |
# if we're using the listcache, make sure it is valid and |
179 |
# parented by the same node we're diffing against |
|
180 |
if not changed or not self.listcache or not p1 or self.mapcache[0] != p1: |
|
181 |
files = map.keys() |
|
182 |
files.sort() |
|
183 |
||
184 |
self.addlist = ["%s\000%s%s\n" % |
|
185 |
(f, hex(map[f]), flags[f] and "x" or '') |
|
186 |
for f in files] |
|
187 |
cachedelta = None |
|
188 |
else: |
|
189 |
addlist = self.listcache[1] |
|
190 |
||
191 |
# find the starting offset for each line in the add list |
|
192 |
offsets = calcoffsets(addlist) |
|
193 |
||
194 |
# combine the changed lists into one list for sorting |
|
195 |
work = [[x, 0] for x in changed[0]] |
|
196 |
work[len(work):] = [[x, 1] for x in changed[1]] |
|
197 |
work.sort() |
|
198 |
||
199 |
delta = [] |
|
200 |
bs = 0 |
|
201 |
||
202 |
for w in work: |
|
203 |
f = w[0] |
|
204 |
# bs will either be the index of the item or the insertion point |
|
205 |
bs = bisect.bisect(addlist, f, bs) |
|
206 |
if bs < len(addlist): |
|
207 |
fn = addlist[bs][:addlist[bs].index('\0')] |
|
208 |
else: |
|
209 |
fn = None |
|
210 |
if w[1] == 0: |
|
211 |
l = "%s\000%s%s\n" % (f, hex(map[f]), flags[f] and "x" or '') |
|
212 |
else: |
|
213 |
l = None |
|
214 |
start = bs |
|
215 |
if fn != f: |
|
216 |
# item not found, insert a new one |
|
659 | 217 |
end = bs |
644 | 218 |
if w[1] == 1: |
219 |
sys.stderr.write("failed to remove %s from manifest" % f) |
|
220 |
sys.exit(1) |
|
221 |
else: |
|
222 |
# item is found, replace/delete the existing line |
|
223 |
end = bs + 1 |
|
224 |
delta.append([start, end, offsets[start], offsets[end], l]) |
|
225 |
||
226 |
self.addlist = addlistdelta(addlist, delta) |
|
227 |
if self.mapcache[0] == self.tip(): |
|
228 |
cachedelta = "".join(gendelta(delta)) |
|
229 |
else: |
|
230 |
cachedelta = None |
|
231 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
232 |
text = "".join(self.addlist) |
644 | 233 |
if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text: |
234 |
sys.stderr.write("manifest delta failure") |
|
235 |
sys.exit(1) |
|
236 |
n = self.addrevision(text, transaction, link, p1, p2, cachedelta) |
|
302 | 237 |
self.mapcache = (n, map, flags) |
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
238 |
self.listcache = (text, self.addlist) |
140 | 239 |
self.addlist = None |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
240 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
241 |
return n |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
242 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
243 |
class changelog(revlog): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
244 |
def __init__(self, opener): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
245 |
revlog.__init__(self, opener, "00changelog.i", "00changelog.d") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
246 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
247 |
def extract(self, text): |
37 | 248 |
if not text: |
40 | 249 |
return (nullid, "", "0", [], "") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
250 |
last = text.index("\n\n") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
251 |
desc = text[last + 2:] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
252 |
l = text[:last].splitlines() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
253 |
manifest = bin(l[0]) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
254 |
user = l[1] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
255 |
date = l[2] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
256 |
files = l[3:] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
257 |
return (manifest, user, date, files, desc) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
258 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
259 |
def read(self, node): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
260 |
return self.extract(self.revision(node)) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
261 |
|
203 | 262 |
def add(self, manifest, list, desc, transaction, p1=None, p2=None, |
263 |
user=None, date=None): |
|
264 |
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
|
265 |
list.sort() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
266 |
l = [hex(manifest), user, date] + list + ["", desc] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
267 |
text = "\n".join(l) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
268 |
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
|
269 |
|
220 | 270 |
class dirstate: |
244 | 271 |
def __init__(self, opener, ui, root): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
272 |
self.opener = opener |
244 | 273 |
self.root = root |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
274 |
self.dirty = 0 |
20 | 275 |
self.ui = ui |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
276 |
self.map = None |
227 | 277 |
self.pl = None |
363 | 278 |
self.copies = {} |
220 | 279 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
280 |
def __del__(self): |
220 | 281 |
if self.dirty: |
282 |
self.write() |
|
283 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
284 |
def __getitem__(self, key): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
285 |
try: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
286 |
return self.map[key] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
287 |
except TypeError: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
288 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
289 |
return self[key] |
220 | 290 |
|
291 |
def __contains__(self, key): |
|
292 |
if not self.map: self.read() |
|
293 |
return key in self.map |
|
294 |
||
227 | 295 |
def parents(self): |
296 |
if not self.pl: |
|
297 |
self.read() |
|
298 |
return self.pl |
|
299 |
||
300 |
def setparents(self, p1, p2 = nullid): |
|
301 |
self.dirty = 1 |
|
302 |
self.pl = p1, p2 |
|
303 |
||
220 | 304 |
def state(self, key): |
305 |
try: |
|
306 |
return self[key][0] |
|
307 |
except KeyError: |
|
308 |
return "?" |
|
309 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
310 |
def read(self): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
311 |
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
|
312 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
313 |
self.map = {} |
227 | 314 |
self.pl = [nullid, nullid] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
315 |
try: |
220 | 316 |
st = self.opener("dirstate").read() |
311 | 317 |
if not st: return |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
318 |
except: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
319 |
|
227 | 320 |
self.pl = [st[:20], st[20: 40]] |
321 |
||
322 |
pos = 40 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
323 |
while pos < len(st): |
220 | 324 |
e = struct.unpack(">cllll", st[pos:pos+17]) |
325 |
l = e[4] |
|
326 |
pos += 17 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
327 |
f = st[pos:pos + l] |
515 | 328 |
if '\0' in f: |
363 | 329 |
f, c = f.split('\0') |
330 |
self.copies[f] = c |
|
220 | 331 |
self.map[f] = e[:4] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
332 |
pos += l |
363 | 333 |
|
334 |
def copy(self, source, dest): |
|
335 |
self.read() |
|
336 |
self.dirty = 1 |
|
337 |
self.copies[dest] = source |
|
338 |
||
339 |
def copied(self, file): |
|
340 |
return self.copies.get(file, None) |
|
515 | 341 |
|
220 | 342 |
def update(self, files, state): |
343 |
''' current states: |
|
344 |
n normal |
|
231 | 345 |
m needs merging |
220 | 346 |
r marked for removal |
347 |
a marked for addition''' |
|
348 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
349 |
if not files: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
350 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
351 |
self.dirty = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
352 |
for f in files: |
220 | 353 |
if state == "r": |
354 |
self.map[f] = ('r', 0, 0, 0) |
|
355 |
else: |
|
253 | 356 |
s = os.stat(os.path.join(self.root, f)) |
357 |
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
|
358 |
|
220 | 359 |
def forget(self, files): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
360 |
if not files: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
361 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
362 |
self.dirty = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
363 |
for f in files: |
20 | 364 |
try: |
365 |
del self.map[f] |
|
366 |
except KeyError: |
|
220 | 367 |
self.ui.warn("not in dirstate: %s!\n" % f) |
20 | 368 |
pass |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
369 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
370 |
def clear(self): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
371 |
self.map = {} |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
372 |
self.dirty = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
373 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
374 |
def write(self): |
220 | 375 |
st = self.opener("dirstate", "w") |
227 | 376 |
st.write("".join(self.pl)) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
377 |
for f, e in self.map.items(): |
363 | 378 |
c = self.copied(f) |
379 |
if c: |
|
380 |
f = f + "\0" + c |
|
220 | 381 |
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
|
382 |
st.write(e + f) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
383 |
self.dirty = 0 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
384 |
|
536 | 385 |
def changes(self, files, ignore): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
386 |
self.read() |
536 | 387 |
dc = self.map.copy() |
388 |
lookup, changed, added, unknown = [], [], [], [] |
|
389 |
||
390 |
# compare all files by default |
|
391 |
if not files: files = [self.root] |
|
392 |
||
393 |
# recursive generator of all files listed |
|
394 |
def walk(files): |
|
556 | 395 |
for f in util.unique(files): |
537 | 396 |
f = os.path.join(self.root, f) |
536 | 397 |
if os.path.isdir(f): |
398 |
for dir, subdirs, fl in os.walk(f): |
|
399 |
d = dir[len(self.root) + 1:] |
|
669
8aa2a282eda4
.hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents:
667
diff
changeset
|
400 |
for sd in subdirs: |
679
c11e9a6777ae
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
401 |
if ignore(os.path.join(d, sd +'/')): |
669
8aa2a282eda4
.hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents:
667
diff
changeset
|
402 |
subdirs.remove(sd) |
536 | 403 |
for fn in fl: |
404 |
fn = util.pconvert(os.path.join(d, fn)) |
|
405 |
yield fn |
|
406 |
else: |
|
407 |
yield f[len(self.root) + 1:] |
|
408 |
||
669
8aa2a282eda4
.hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents:
667
diff
changeset
|
409 |
for k in dc.keys(): |
8aa2a282eda4
.hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents:
667
diff
changeset
|
410 |
yield k |
8aa2a282eda4
.hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents:
667
diff
changeset
|
411 |
|
556 | 412 |
for fn in util.unique(walk(files)): |
536 | 413 |
try: s = os.stat(os.path.join(self.root, fn)) |
414 |
except: continue |
|
415 |
||
416 |
if fn in dc: |
|
417 |
c = dc[fn] |
|
418 |
del dc[fn] |
|
419 |
||
420 |
if c[0] == 'm': |
|
421 |
changed.append(fn) |
|
422 |
elif c[0] == 'a': |
|
423 |
added.append(fn) |
|
424 |
elif c[0] == 'r': |
|
425 |
unknown.append(fn) |
|
426 |
elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100: |
|
427 |
changed.append(fn) |
|
428 |
elif c[1] != s.st_mode or c[3] != s.st_mtime: |
|
429 |
lookup.append(fn) |
|
430 |
else: |
|
431 |
if not ignore(fn): unknown.append(fn) |
|
432 |
||
433 |
return (lookup, changed, added, dc.keys(), unknown) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
434 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
435 |
# used to avoid circular references so destructors work |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
436 |
def opener(base): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
437 |
p = base |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
438 |
def o(path, mode="r"): |
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
439 |
if p.startswith("http://"): |
15
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
440 |
f = os.path.join(p, urllib.quote(path)) |
372 | 441 |
return httprangereader.httprangereader(f) |
15
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
442 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
443 |
f = os.path.join(p, path) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
444 |
|
292 | 445 |
mode += "b" # for that other OS |
446 |
||
447 |
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
|
448 |
try: |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
449 |
s = os.stat(f) |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
450 |
except OSError: |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
451 |
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
|
452 |
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
|
453 |
os.makedirs(d) |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
454 |
else: |
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
455 |
if s.st_nlink > 1: |
417 | 456 |
file(f + ".tmp", "wb").write(file(f, "rb").read()) |
421 | 457 |
util.rename(f+".tmp", f) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
458 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
459 |
return file(f, mode) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
460 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
461 |
return o |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
462 |
|
499 | 463 |
class RepoError(Exception): pass |
464 |
||
60 | 465 |
class localrepository: |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
466 |
def __init__(self, ui, path=None, create=0): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
467 |
self.remote = 0 |
686
d7d68d27ebe5
Reapply startswith() changes that got lost with stale edit
Matt Mackall <mpm@selenic.com>
parents:
681
diff
changeset
|
468 |
if path and path.startswith("http://"): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
469 |
self.remote = 1 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
470 |
self.path = path |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
471 |
else: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
472 |
if not path: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
473 |
p = os.getcwd() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
474 |
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
|
475 |
oldp = p |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
476 |
p = os.path.dirname(p) |
499 | 477 |
if p == oldp: raise RepoError("no repo found") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
478 |
path = p |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
479 |
self.path = os.path.join(path, ".hg") |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
480 |
|
405 | 481 |
if not create and not os.path.isdir(self.path): |
499 | 482 |
raise RepoError("repository %s not found" % self.path) |
405 | 483 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
484 |
self.root = path |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
485 |
self.ui = ui |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
486 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
487 |
if create: |
515 | 488 |
os.mkdir(self.path) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
489 |
os.mkdir(self.join("data")) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
490 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
491 |
self.opener = opener(self.path) |
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
492 |
self.wopener = opener(self.root) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
493 |
self.manifest = manifest(self.opener) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
494 |
self.changelog = changelog(self.opener) |
649
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
495 |
self.ignorefunc = None |
343 | 496 |
self.tagscache = None |
497 |
self.nodetagscache = None |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
498 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
499 |
if not self.remote: |
244 | 500 |
self.dirstate = dirstate(self.opener, ui, self.root) |
337 | 501 |
try: |
502 |
self.ui.readconfig(self.opener("hgrc")) |
|
503 |
except IOError: pass |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
504 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
505 |
def ignore(self, f): |
649
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
506 |
if not self.ignorefunc: |
679
c11e9a6777ae
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
507 |
bigpat = ["^.hg/$"] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
508 |
try: |
417 | 509 |
l = file(self.wjoin(".hgignore")) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
510 |
for pat in l: |
9 | 511 |
if pat != "\n": |
656
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
512 |
p = util.pconvert(pat[:-1]) |
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
513 |
try: |
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
514 |
r = re.compile(p) |
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
515 |
except: |
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
516 |
self.ui.warn("ignoring invalid ignore" |
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
517 |
+ " regular expression '%s'\n" % p) |
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
518 |
else: |
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
519 |
bigpat.append(util.pconvert(pat[:-1])) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
520 |
except IOError: pass |
679
c11e9a6777ae
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
521 |
|
c11e9a6777ae
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
522 |
s = "(?:%s)" % (")|(?:".join(bigpat)) |
c11e9a6777ae
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
523 |
r = re.compile(s) |
c11e9a6777ae
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com>
parents:
674
diff
changeset
|
524 |
self.ignorefunc = r.search |
649
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
525 |
|
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
526 |
return self.ignorefunc(f) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
527 |
|
487 | 528 |
def hook(self, name, **args): |
529 |
s = self.ui.config("hooks", name) |
|
530 |
if s: |
|
531 |
self.ui.note("running hook %s: %s\n" % (name, s)) |
|
532 |
old = {} |
|
533 |
for k, v in args.items(): |
|
534 |
k = k.upper() |
|
535 |
old[k] = os.environ.get(k, None) |
|
536 |
os.environ[k] = v |
|
537 |
||
538 |
r = os.system(s) |
|
539 |
||
540 |
for k, v in old.items(): |
|
541 |
if v != None: |
|
542 |
os.environ[k] = v |
|
543 |
else: |
|
544 |
del os.environ[k] |
|
545 |
||
546 |
if r: |
|
547 |
self.ui.warn("abort: %s hook failed with status %d!\n" % |
|
548 |
(name, r)) |
|
549 |
return False |
|
550 |
return True |
|
551 |
||
343 | 552 |
def tags(self): |
553 |
'''return a mapping of tag to node''' |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
554 |
if not self.tagscache: |
343 | 555 |
self.tagscache = {} |
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
556 |
def addtag(self, k, n): |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
557 |
try: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
558 |
bin_n = bin(n) |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
559 |
except TypeError: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
560 |
bin_n = '' |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
561 |
self.tagscache[k.strip()] = bin_n |
659 | 562 |
|
67 | 563 |
try: |
254 | 564 |
# read each head of the tags file, ending with the tip |
565 |
# and add each tag found to the map, with "newer" ones |
|
566 |
# taking precedence |
|
67 | 567 |
fl = self.file(".hgtags") |
254 | 568 |
h = fl.heads() |
569 |
h.reverse() |
|
570 |
for r in h: |
|
571 |
for l in fl.revision(r).splitlines(): |
|
572 |
if l: |
|
385
e9e1efd5291c
Fixed problems with extra spaces around tags in .hgtags
Thomas Arendsen Hein <thomas@intevation.de>
parents:
383
diff
changeset
|
573 |
n, k = l.split(" ", 1) |
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
574 |
addtag(self, k, n) |
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
575 |
except KeyError: |
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
576 |
pass |
659 | 577 |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
578 |
try: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
579 |
f = self.opener("localtags") |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
580 |
for l in f: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
581 |
n, k = l.split(" ", 1) |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
582 |
addtag(self, k, n) |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
583 |
except IOError: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
584 |
pass |
659 | 585 |
|
343 | 586 |
self.tagscache['tip'] = self.changelog.tip() |
659 | 587 |
|
343 | 588 |
return self.tagscache |
589 |
||
590 |
def tagslist(self): |
|
591 |
'''return a list of tags ordered by revision''' |
|
592 |
l = [] |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
593 |
for t, n in self.tags().items(): |
343 | 594 |
try: |
595 |
r = self.changelog.rev(n) |
|
596 |
except: |
|
597 |
r = -2 # sort to the beginning of the list if unknown |
|
598 |
l.append((r,t,n)) |
|
599 |
l.sort() |
|
600 |
return [(t,n) for r,t,n in l] |
|
601 |
||
602 |
def nodetags(self, node): |
|
603 |
'''return the tags associated with a node''' |
|
604 |
if not self.nodetagscache: |
|
605 |
self.nodetagscache = {} |
|
606 |
for t,n in self.tags().items(): |
|
607 |
self.nodetagscache.setdefault(n,[]).append(t) |
|
608 |
return self.nodetagscache.get(node, []) |
|
609 |
||
610 |
def lookup(self, key): |
|
67 | 611 |
try: |
343 | 612 |
return self.tags()[key] |
67 | 613 |
except KeyError: |
658
f8098ae9f5b6
Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents:
657
diff
changeset
|
614 |
try: |
f8098ae9f5b6
Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents:
657
diff
changeset
|
615 |
return self.changelog.lookup(key) |
f8098ae9f5b6
Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents:
657
diff
changeset
|
616 |
except: |
f8098ae9f5b6
Generate a friendlier except for failed lookups
Matt Mackall <mpm@selenic.com>
parents:
657
diff
changeset
|
617 |
raise RepoError("unknown revision '%s'" % key) |
67 | 618 |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
619 |
def dev(self): |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
620 |
if self.remote: return -1 |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
621 |
return os.stat(self.path).st_dev |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
622 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
623 |
def join(self, f): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
624 |
return os.path.join(self.path, f) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
625 |
|
244 | 626 |
def wjoin(self, f): |
627 |
return os.path.join(self.root, f) |
|
628 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
629 |
def file(self, f): |
192 | 630 |
if f[0] == '/': f = f[1:] |
144
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
631 |
return filelog(self.opener, f) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
632 |
|
627 | 633 |
def getcwd(self): |
634 |
cwd = os.getcwd() |
|
635 |
if cwd == self.root: return '' |
|
636 |
return cwd[len(self.root) + 1:] |
|
637 |
||
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
638 |
def wfile(self, f, mode='r'): |
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
639 |
return self.wopener(f, mode) |
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
640 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
641 |
def transaction(self): |
251 | 642 |
# save dirstate for undo |
263 | 643 |
try: |
644 |
ds = self.opener("dirstate").read() |
|
645 |
except IOError: |
|
646 |
ds = "" |
|
251 | 647 |
self.opener("undo.dirstate", "w").write(ds) |
515 | 648 |
|
582 | 649 |
return transaction.transaction(self.ui.warn, |
650 |
self.opener, self.join("journal"), |
|
262 | 651 |
self.join("undo")) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
652 |
|
210 | 653 |
def recover(self): |
225 | 654 |
lock = self.lock() |
557 | 655 |
if os.path.exists(self.join("journal")): |
501 | 656 |
self.ui.status("rolling back interrupted transaction\n") |
557 | 657 |
return transaction.rollback(self.opener, self.join("journal")) |
210 | 658 |
else: |
659 |
self.ui.warn("no interrupted transaction available\n") |
|
660 |
||
661 |
def undo(self): |
|
225 | 662 |
lock = self.lock() |
210 | 663 |
if os.path.exists(self.join("undo")): |
501 | 664 |
self.ui.status("rolling back last transaction\n") |
262 | 665 |
transaction.rollback(self.opener, self.join("undo")) |
251 | 666 |
self.dirstate = None |
421 | 667 |
util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
251 | 668 |
self.dirstate = dirstate(self.opener, self.ui, self.root) |
163 | 669 |
else: |
210 | 670 |
self.ui.warn("no undo information available\n") |
162 | 671 |
|
161 | 672 |
def lock(self, wait = 1): |
673 |
try: |
|
674 |
return lock.lock(self.join("lock"), 0) |
|
675 |
except lock.LockHeld, inst: |
|
676 |
if wait: |
|
677 |
self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) |
|
678 |
return lock.lock(self.join("lock"), wait) |
|
679 |
raise inst |
|
680 |
||
203 | 681 |
def rawcommit(self, files, text, user, date, p1=None, p2=None): |
442 | 682 |
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
|
683 |
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
|
684 |
p2 = p2 or self.dirstate.parents()[1] or nullid |
302 | 685 |
c1 = self.changelog.read(p1) |
686 |
c2 = self.changelog.read(p2) |
|
687 |
m1 = self.manifest.read(c1[0]) |
|
688 |
mf1 = self.manifest.readflags(c1[0]) |
|
689 |
m2 = self.manifest.read(c2[0]) |
|
690 |
||
442 | 691 |
if orig_parent == p1: |
692 |
update_dirstate = 1 |
|
693 |
else: |
|
694 |
update_dirstate = 0 |
|
695 |
||
203 | 696 |
tr = self.transaction() |
302 | 697 |
mm = m1.copy() |
698 |
mfm = mf1.copy() |
|
203 | 699 |
linkrev = self.changelog.count() |
700 |
for f in files: |
|
701 |
try: |
|
302 | 702 |
t = self.wfile(f).read() |
441 | 703 |
tm = util.is_exec(self.wjoin(f), mfm.get(f, False)) |
302 | 704 |
r = self.file(f) |
705 |
mfm[f] = tm |
|
360 | 706 |
mm[f] = r.add(t, {}, tr, linkrev, |
302 | 707 |
m1.get(f, nullid), m2.get(f, nullid)) |
442 | 708 |
if update_dirstate: |
709 |
self.dirstate.update([f], "n") |
|
203 | 710 |
except IOError: |
314
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
711 |
try: |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
712 |
del mm[f] |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
713 |
del mfm[f] |
442 | 714 |
if update_dirstate: |
715 |
self.dirstate.forget([f]) |
|
314
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
716 |
except: |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
717 |
# deleted from p2? |
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
718 |
pass |
203 | 719 |
|
302 | 720 |
mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0]) |
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
588
diff
changeset
|
721 |
user = user or self.ui.username() |
302 | 722 |
n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date) |
203 | 723 |
tr.close() |
442 | 724 |
if update_dirstate: |
725 |
self.dirstate.setparents(n, nullid) |
|
203 | 726 |
|
317 | 727 |
def commit(self, files = None, text = "", user = None, date = None): |
220 | 728 |
commit = [] |
729 |
remove = [] |
|
730 |
if files: |
|
731 |
for f in files: |
|
732 |
s = self.dirstate.state(f) |
|
244 | 733 |
if s in 'nmai': |
220 | 734 |
commit.append(f) |
735 |
elif s == 'r': |
|
736 |
remove.append(f) |
|
737 |
else: |
|
244 | 738 |
self.ui.warn("%s not tracked!\n" % f) |
220 | 739 |
else: |
536 | 740 |
(c, a, d, u) = self.changes(None, None) |
220 | 741 |
commit = c + a |
742 |
remove = d |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
743 |
|
220 | 744 |
if not commit and not remove: |
151 | 745 |
self.ui.status("nothing changed\n") |
746 |
return |
|
747 |
||
487 | 748 |
if not self.hook("precommit"): |
749 |
return 1 |
|
750 |
||
229 | 751 |
p1, p2 = self.dirstate.parents() |
752 |
c1 = self.changelog.read(p1) |
|
753 |
c2 = self.changelog.read(p2) |
|
754 |
m1 = self.manifest.read(c1[0]) |
|
276 | 755 |
mf1 = self.manifest.readflags(c1[0]) |
229 | 756 |
m2 = self.manifest.read(c2[0]) |
225 | 757 |
lock = self.lock() |
151 | 758 |
tr = self.transaction() |
759 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
760 |
# check in files |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
761 |
new = {} |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
762 |
linkrev = self.changelog.count() |
220 | 763 |
commit.sort() |
764 |
for f in commit: |
|
83 | 765 |
self.ui.note(f + "\n") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
766 |
try: |
441 | 767 |
mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False)) |
418 | 768 |
t = self.wfile(f).read() |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
769 |
except IOError: |
667
31a9aa890016
A number of minor fixes to problems that pychecker found.
mark.williamson@cl.cam.ac.uk
parents:
660
diff
changeset
|
770 |
self.ui.warn("trouble committing %s!\n" % f) |
220 | 771 |
raise |
772 |
||
363 | 773 |
meta = {} |
774 |
cp = self.dirstate.copied(f) |
|
775 |
if cp: |
|
776 |
meta["copy"] = cp |
|
777 |
meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid))) |
|
575 | 778 |
self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"])) |
363 | 779 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
780 |
r = self.file(f) |
229 | 781 |
fp1 = m1.get(f, nullid) |
782 |
fp2 = m2.get(f, nullid) |
|
363 | 783 |
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
|
784 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
785 |
# update manifest |
229 | 786 |
m1.update(new) |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
787 |
for f in remove: |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
788 |
if f in m1: |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
789 |
del m1[f] |
644 | 790 |
mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0], (new,remove)) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
791 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
792 |
# add changeset |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
793 |
new = new.keys() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
794 |
new.sort() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
795 |
|
288 | 796 |
if not text: |
797 |
edittext = "\n" + "HG: manifest hash %s\n" % hex(mn) |
|
798 |
edittext += "".join(["HG: changed %s\n" % f for f in new]) |
|
799 |
edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
|
800 |
edittext = self.ui.edit(edittext) |
|
801 |
if not edittext.rstrip(): |
|
802 |
return 1 |
|
803 |
text = edittext |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
804 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
588
diff
changeset
|
805 |
user = user or self.ui.username() |
317 | 806 |
n = self.changelog.add(mn, new, text, tr, p1, p2, user, date) |
487 | 807 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
808 |
tr.close() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
809 |
|
229 | 810 |
self.dirstate.setparents(n) |
220 | 811 |
self.dirstate.update(new, "n") |
812 |
self.dirstate.forget(remove) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
813 |
|
660
2c83350784c3
Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents:
659
diff
changeset
|
814 |
if not self.hook("commit", node=hex(n)): |
2c83350784c3
Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents:
659
diff
changeset
|
815 |
return 1 |
2c83350784c3
Move commit hook after commit completes
Matt Mackall <mpm@selenic.com>
parents:
659
diff
changeset
|
816 |
|
537 | 817 |
def changes(self, node1, node2, files=None): |
566 | 818 |
mf2, u = None, [] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
819 |
|
536 | 820 |
def fcmp(fn, mf): |
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
821 |
t1 = self.wfile(fn).read() |
29 | 822 |
t2 = self.file(fn).revision(mf[fn]) |
823 |
return cmp(t1, t2) |
|
824 |
||
536 | 825 |
# are we comparing the working directory? |
561 | 826 |
if not node2: |
536 | 827 |
l, c, a, d, u = self.dirstate.changes(files, self.ignore) |
828 |
||
829 |
# are we comparing working dir against its parent? |
|
561 | 830 |
if not node1: |
536 | 831 |
if l: |
832 |
# do a full compare of any files that might have changed |
|
833 |
change = self.changelog.read(self.dirstate.parents()[0]) |
|
561 | 834 |
mf2 = self.manifest.read(change[0]) |
548 | 835 |
for f in l: |
561 | 836 |
if fcmp(f, mf2): |
536 | 837 |
c.append(f) |
561 | 838 |
|
839 |
for l in c, a, d, u: |
|
840 |
l.sort() |
|
841 |
||
536 | 842 |
return (c, a, d, u) |
515 | 843 |
|
536 | 844 |
# are we comparing working dir against non-tip? |
845 |
# generate a pseudo-manifest for the working dir |
|
561 | 846 |
if not node2: |
847 |
if not mf2: |
|
536 | 848 |
change = self.changelog.read(self.dirstate.parents()[0]) |
561 | 849 |
mf2 = self.manifest.read(change[0]).copy() |
536 | 850 |
for f in a + c + l: |
561 | 851 |
mf2[f] = "" |
536 | 852 |
for f in d: |
561 | 853 |
if f in mf2: del mf2[f] |
536 | 854 |
else: |
561 | 855 |
change = self.changelog.read(node2) |
856 |
mf2 = self.manifest.read(change[0]) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
857 |
|
566 | 858 |
# flush lists from dirstate before comparing manifests |
859 |
c, a = [], [] |
|
860 |
||
561 | 861 |
change = self.changelog.read(node1) |
862 |
mf1 = self.manifest.read(change[0]).copy() |
|
32 | 863 |
|
864 |
for fn in mf2: |
|
865 |
if mf1.has_key(fn): |
|
866 |
if mf1[fn] != mf2[fn]: |
|
561 | 867 |
if mf2[fn] != "" or fcmp(fn, mf1): |
536 | 868 |
c.append(fn) |
32 | 869 |
del mf1[fn] |
870 |
else: |
|
536 | 871 |
a.append(fn) |
515 | 872 |
|
536 | 873 |
d = mf1.keys() |
561 | 874 |
|
875 |
for l in c, a, d, u: |
|
876 |
l.sort() |
|
515 | 877 |
|
536 | 878 |
return (c, a, d, u) |
32 | 879 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
880 |
def add(self, list): |
220 | 881 |
for f in list: |
244 | 882 |
p = self.wjoin(f) |
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
883 |
if not os.path.exists(p): |
659 | 884 |
self.ui.warn("%s does not exist!\n" % f) |
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
885 |
elif not os.path.isfile(p): |
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
886 |
self.ui.warn("%s not added: mercurial only supports files currently\n" % f) |
220 | 887 |
elif self.dirstate.state(f) == 'n': |
888 |
self.ui.warn("%s already tracked!\n" % f) |
|
889 |
else: |
|
890 |
self.dirstate.update([f], "a") |
|
891 |
||
892 |
def forget(self, list): |
|
893 |
for f in list: |
|
894 |
if self.dirstate.state(f) not in 'ai': |
|
895 |
self.ui.warn("%s not added!\n" % f) |
|
896 |
else: |
|
897 |
self.dirstate.forget([f]) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
898 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
899 |
def remove(self, list): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
900 |
for f in list: |
244 | 901 |
p = self.wjoin(f) |
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
902 |
if os.path.exists(p): |
220 | 903 |
self.ui.warn("%s still exists!\n" % f) |
402 | 904 |
elif self.dirstate.state(f) == 'a': |
905 |
self.ui.warn("%s never committed!\n" % f) |
|
657
22bc6fb9aefc
dirstate.forget() takes a list
Matt Mackall <mpm@selenic.com>
parents:
656
diff
changeset
|
906 |
self.dirstate.forget([f]) |
220 | 907 |
elif f not in self.dirstate: |
908 |
self.ui.warn("%s not tracked!\n" % f) |
|
909 |
else: |
|
910 |
self.dirstate.update([f], "r") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
911 |
|
363 | 912 |
def copy(self, source, dest): |
913 |
p = self.wjoin(dest) |
|
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
914 |
if not os.path.exists(dest): |
363 | 915 |
self.ui.warn("%s does not exist!\n" % dest) |
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
916 |
elif not os.path.isfile(dest): |
659 | 917 |
self.ui.warn("copy failed: %s is not a file\n" % dest) |
363 | 918 |
else: |
919 |
if self.dirstate.state(dest) == '?': |
|
920 |
self.dirstate.update([dest], "a") |
|
921 |
self.dirstate.copy(source, dest) |
|
922 |
||
222 | 923 |
def heads(self): |
924 |
return self.changelog.heads() |
|
925 |
||
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
926 |
def branches(self, nodes): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
927 |
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
|
928 |
b = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
929 |
for n in nodes: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
930 |
t = n |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
931 |
while n: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
932 |
p = self.changelog.parents(n) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
933 |
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
|
934 |
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
|
935 |
break |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
936 |
n = p[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
937 |
return b |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
938 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
939 |
def between(self, pairs): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
940 |
r = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
941 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
942 |
for top, bottom in pairs: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
943 |
n, l, i = top, [], 0 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
944 |
f = 1 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
945 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
946 |
while n != bottom: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
947 |
p = self.changelog.parents(n)[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
948 |
if i == f: |
575 | 949 |
l.append(n) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
950 |
f = f * 2 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
951 |
n = p |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
952 |
i += 1 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
953 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
954 |
r.append(l) |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
955 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
956 |
return r |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
957 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
958 |
def newer(self, nodes): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
959 |
m = {} |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
960 |
nl = [] |
94 | 961 |
pm = {} |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
962 |
cl = self.changelog |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
963 |
t = l = cl.count() |
94 | 964 |
|
965 |
# find the lowest numbered node |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
966 |
for n in nodes: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
967 |
l = min(l, cl.rev(n)) |
94 | 968 |
m[n] = 1 |
46 | 969 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
970 |
for i in xrange(l, t): |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
971 |
n = cl.node(i) |
94 | 972 |
if n in m: # explicitly listed |
973 |
pm[n] = 1 |
|
974 |
nl.append(n) |
|
975 |
continue |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
976 |
for p in cl.parents(n): |
94 | 977 |
if p in pm: # parent listed |
978 |
pm[n] = 1 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
979 |
nl.append(n) |
94 | 980 |
break |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
981 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
982 |
return nl |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
983 |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
984 |
def findincoming(self, remote, base={}): |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
985 |
m = self.changelog.nodemap |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
986 |
search = [] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
987 |
fetch = [] |
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
988 |
seen = {} |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
989 |
seenbranch = {} |
192 | 990 |
|
636
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
991 |
# assume we're closer to the tip than the root |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
992 |
# and start by examining the heads |
222 | 993 |
self.ui.status("searching for changes\n") |
994 |
heads = remote.heads() |
|
995 |
unknown = [] |
|
996 |
for h in heads: |
|
997 |
if h not in m: |
|
998 |
unknown.append(h) |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
999 |
else: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1000 |
base[h] = 1 |
46 | 1001 |
|
222 | 1002 |
if not unknown: |
60 | 1003 |
return None |
324 | 1004 |
|
1005 |
rep = {} |
|
1006 |
reqcnt = 0 |
|
515 | 1007 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1008 |
# search through remote branches |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1009 |
# a 'branch' here is a linear segment of history, with four parts: |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1010 |
# head, root, first parent, second parent |
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1011 |
# (a branch always has two parents (or none) by definition) |
222 | 1012 |
unknown = remote.branches(unknown) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1013 |
while unknown: |
324 | 1014 |
r = [] |
1015 |
while unknown: |
|
1016 |
n = unknown.pop(0) |
|
1017 |
if n[0] in seen: |
|
1018 |
continue |
|
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
1019 |
|
324 | 1020 |
self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1]))) |
1021 |
if n[0] == nullid: |
|
1022 |
break |
|
328 | 1023 |
if n in seenbranch: |
324 | 1024 |
self.ui.debug("branch already found\n") |
1025 |
continue |
|
1026 |
if n[1] and n[1] in m: # do we know the base? |
|
1027 |
self.ui.debug("found incomplete branch %s:%s\n" |
|
1028 |
% (short(n[0]), short(n[1]))) |
|
1029 |
search.append(n) # schedule branch range for scanning |
|
328 | 1030 |
seenbranch[n] = 1 |
324 | 1031 |
else: |
1032 |
if n[1] not in seen and n[1] not in fetch: |
|
1033 |
if n[2] in m and n[3] in m: |
|
1034 |
self.ui.debug("found new changeset %s\n" % |
|
1035 |
short(n[1])) |
|
1036 |
fetch.append(n[1]) # earliest unknown |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1037 |
base[n[2]] = 1 # latest known |
324 | 1038 |
continue |
1039 |
||
1040 |
for a in n[2:4]: |
|
1041 |
if a not in rep: |
|
1042 |
r.append(a) |
|
1043 |
rep[a] = 1 |
|
1044 |
||
328 | 1045 |
seen[n[0]] = 1 |
1046 |
||
324 | 1047 |
if r: |
1048 |
reqcnt += 1 |
|
1049 |
self.ui.debug("request %d: %s\n" % |
|
1050 |
(reqcnt, " ".join(map(short, r)))) |
|
1051 |
for p in range(0, len(r), 10): |
|
1052 |
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
|
1053 |
self.ui.debug("received %s:%s\n" % |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
1054 |
(short(b[0]), short(b[1]))) |
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
1055 |
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
|
1056 |
unknown.append(b) |
515 | 1057 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1058 |
# do binary search on the branches we found |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1059 |
while search: |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1060 |
n = search.pop(0) |
324 | 1061 |
reqcnt += 1 |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1062 |
l = remote.between([(n[0], n[1])])[0] |
328 | 1063 |
l.append(n[1]) |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1064 |
p = n[0] |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1065 |
f = 1 |
328 | 1066 |
for i in l: |
1067 |
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
|
1068 |
if i in m: |
85 | 1069 |
if f <= 2: |
83 | 1070 |
self.ui.debug("found new branch changeset %s\n" % |
1071 |
short(p)) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1072 |
fetch.append(p) |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1073 |
base[i] = 1 |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1074 |
else: |
83 | 1075 |
self.ui.debug("narrowed branch search to %s:%s\n" |
1076 |
% (short(p), short(i))) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1077 |
search.append((p, i)) |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1078 |
break |
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1079 |
p, f = i, f * 2 |
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1080 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1081 |
# sanity check our fetch list |
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1082 |
for f in fetch: |
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1083 |
if f in m: |
499 | 1084 |
raise RepoError("already have changeset " + short(f[:4])) |
83 | 1085 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1086 |
if base.keys() == [nullid]: |
514
874e577e332e
change unrelated repository error to a warning
mpm@selenic.com
parents:
511
diff
changeset
|
1087 |
self.ui.warn("warning: pulling from an unrelated repository!\n") |
511 | 1088 |
|
94 | 1089 |
self.ui.note("adding new changesets starting at " + |
83 | 1090 |
" ".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
|
1091 |
|
324 | 1092 |
self.ui.debug("%d total queries\n" % reqcnt) |
1093 |
||
516 | 1094 |
return fetch |
1095 |
||
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1096 |
def findoutgoing(self, remote): |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1097 |
base = {} |
637
31e090c34d3b
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents:
636
diff
changeset
|
1098 |
self.findincoming(remote, base) |
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1099 |
remain = dict.fromkeys(self.changelog.nodemap) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1100 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1101 |
# prune everything remote has from the tree |
637
31e090c34d3b
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents:
636
diff
changeset
|
1102 |
del remain[nullid] |
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1103 |
remove = base.keys() |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1104 |
while remove: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1105 |
n = remove.pop(0) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1106 |
if n in remain: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1107 |
del remain[n] |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1108 |
for p in self.changelog.parents(n): |
637
31e090c34d3b
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents:
636
diff
changeset
|
1109 |
remove.append(p) |
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1110 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1111 |
# find every node whose parents have been pruned |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1112 |
subset = [] |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1113 |
for n in remain: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1114 |
p1, p2 = self.changelog.parents(n) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1115 |
if p1 not in remain and p2 not in remain: |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1116 |
subset.append(n) |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1117 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1118 |
# this is the set of all roots we have to push |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1119 |
return subset |
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1120 |
|
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1121 |
def pull(self, remote): |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1122 |
lock = self.lock() |
636
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1123 |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1124 |
# if we have an empty repo, fetch everything |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1125 |
if self.changelog.tip() == nullid: |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1126 |
self.ui.status("requesting all changes\n") |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1127 |
fetch = [nullid] |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1128 |
else: |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1129 |
fetch = self.findincoming(remote) |
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1130 |
|
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1131 |
if not fetch: |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1132 |
self.ui.status("no changes found\n") |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1133 |
return 1 |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1134 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1135 |
cg = remote.changegroup(fetch) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1136 |
return self.addchangegroup(cg) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1137 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1138 |
def push(self, remote): |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1139 |
lock = remote.lock() |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1140 |
update = self.findoutgoing(remote) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1141 |
if not update: |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1142 |
self.ui.status("no changes found\n") |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1143 |
return 1 |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1144 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1145 |
cg = self.changegroup(update) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1146 |
return remote.addchangegroup(cg) |
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1147 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1148 |
def changegroup(self, basenodes): |
222 | 1149 |
class genread: |
1150 |
def __init__(self, generator): |
|
1151 |
self.g = generator |
|
1152 |
self.buf = "" |
|
1153 |
def read(self, l): |
|
1154 |
while l > len(self.buf): |
|
1155 |
try: |
|
1156 |
self.buf += self.g.next() |
|
1157 |
except StopIteration: |
|
1158 |
break |
|
1159 |
d, self.buf = self.buf[:l], self.buf[l:] |
|
1160 |
return d |
|
515 | 1161 |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1162 |
def gengroup(): |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1163 |
nodes = self.newer(basenodes) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1164 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1165 |
# construct the link map |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1166 |
linkmap = {} |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1167 |
for n in nodes: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1168 |
linkmap[self.changelog.rev(n)] = n |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1169 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1170 |
# construct a list of all changed files |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1171 |
changed = {} |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1172 |
for n in nodes: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1173 |
c = self.changelog.read(n) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1174 |
for f in c[3]: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1175 |
changed[f] = 1 |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1176 |
changed = changed.keys() |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1177 |
changed.sort() |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1178 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1179 |
# the changegroup is changesets + manifests + all file revs |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1180 |
revs = [ self.changelog.rev(n) for n in nodes ] |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1181 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1182 |
for y in self.changelog.group(linkmap): yield y |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1183 |
for y in self.manifest.group(linkmap): yield y |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1184 |
for f in changed: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1185 |
yield struct.pack(">l", len(f) + 4) + f |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1186 |
g = self.file(f).group(linkmap) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1187 |
for y in g: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1188 |
yield y |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1189 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1190 |
yield struct.pack(">l", 0) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1191 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1192 |
return genread(gengroup()) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1193 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1194 |
def addchangegroup(self, source): |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1195 |
|
222 | 1196 |
def getchunk(): |
1197 |
d = source.read(4) |
|
1198 |
if not d: return "" |
|
1199 |
l = struct.unpack(">l", d)[0] |
|
1200 |
if l <= 4: return "" |
|
1201 |
return source.read(l - 4) |
|
1202 |
||
1203 |
def getgroup(): |
|
1204 |
while 1: |
|
1205 |
c = getchunk() |
|
1206 |
if not c: break |
|
1207 |
yield c |
|
1208 |
||
1209 |
def csmap(x): |
|
1210 |
self.ui.debug("add changeset %s\n" % short(x)) |
|
1211 |
return self.changelog.count() |
|
1212 |
||
1213 |
def revmap(x): |
|
1214 |
return self.changelog.rev(x) |
|
1215 |
||
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1216 |
if not source: return |
222 | 1217 |
changesets = files = revisions = 0 |
225 | 1218 |
|
222 | 1219 |
tr = self.transaction() |
1220 |
||
1221 |
# pull off the changeset group |
|
1222 |
self.ui.status("adding changesets\n") |
|
1223 |
co = self.changelog.tip() |
|
224
ccbcc4d76f81
fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents:
223
diff
changeset
|
1224 |
cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique |
222 | 1225 |
changesets = self.changelog.rev(cn) - self.changelog.rev(co) |
1226 |
||
1227 |
# pull off the manifest group |
|
1228 |
self.ui.status("adding manifests\n") |
|
1229 |
mm = self.manifest.tip() |
|
1230 |
mo = self.manifest.addgroup(getgroup(), revmap, tr) |
|
1231 |
||
1232 |
# process the files |
|
1233 |
self.ui.status("adding file revisions\n") |
|
1234 |
while 1: |
|
1235 |
f = getchunk() |
|
1236 |
if not f: break |
|
1237 |
self.ui.debug("adding %s revisions\n" % f) |
|
1238 |
fl = self.file(f) |
|
529
aace5b681fe9
Attempt to fix negative revision count from pull
mpm@selenic.com
parents:
522
diff
changeset
|
1239 |
o = fl.count() |
222 | 1240 |
n = fl.addgroup(getgroup(), revmap, tr) |
529
aace5b681fe9
Attempt to fix negative revision count from pull
mpm@selenic.com
parents:
522
diff
changeset
|
1241 |
revisions += fl.count() - o |
222 | 1242 |
files += 1 |
1243 |
||
1244 |
self.ui.status(("modified %d files, added %d changesets" + |
|
1245 |
" and %d new revisions\n") |
|
1246 |
% (files, changesets, revisions)) |
|
1247 |
||
1248 |
tr.close() |
|
1249 |
return |
|
1250 |
||
588 | 1251 |
def update(self, node, allow=False, force=False, choose=None, |
1252 |
moddirstate=True): |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1253 |
pl = self.dirstate.parents() |
275 | 1254 |
if not force and pl[1] != nullid: |
254 | 1255 |
self.ui.warn("aborting: outstanding uncommitted merges\n") |
690 | 1256 |
return 1 |
46 | 1257 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1258 |
p1, p2 = pl[0], node |
305 | 1259 |
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
|
1260 |
m1n = self.changelog.read(p1)[0] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1261 |
m2n = self.changelog.read(p2)[0] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1262 |
man = self.manifest.ancestor(m1n, m2n) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1263 |
m1 = self.manifest.read(m1n) |
276 | 1264 |
mf1 = self.manifest.readflags(m1n) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1265 |
m2 = self.manifest.read(m2n) |
276 | 1266 |
mf2 = self.manifest.readflags(m2n) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1267 |
ma = self.manifest.read(man) |
412 | 1268 |
mfa = self.manifest.readflags(man) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1269 |
|
536 | 1270 |
(c, a, d, u) = self.changes(None, None) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1271 |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1272 |
# 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
|
1273 |
# from p1 to p2? |
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1274 |
linear_path = (pa == p1 or pa == p2) |
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1275 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1276 |
# 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
|
1277 |
# we care about merging |
254 | 1278 |
self.ui.note("resolving manifests\n") |
650
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1279 |
self.ui.debug(" force %s allow %s moddirstate %s linear %s\n" % |
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1280 |
(force, allow, moddirstate, linear_path)) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1281 |
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
|
1282 |
(short(man), short(m1n), short(m2n))) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1283 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1284 |
merge = {} |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1285 |
get = {} |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1286 |
remove = [] |
305 | 1287 |
mark = {} |
46 | 1288 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1289 |
# construct a working dir manifest |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1290 |
mw = m1.copy() |
276 | 1291 |
mfw = mf1.copy() |
576 | 1292 |
umap = dict.fromkeys(u) |
1293 |
||
254 | 1294 |
for f in a + c + u: |
1295 |
mw[f] = "" |
|
441 | 1296 |
mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) |
576 | 1297 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1298 |
for f in d: |
254 | 1299 |
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
|
1300 |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1301 |
# 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
|
1302 |
# 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
|
1303 |
# 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
|
1304 |
# 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
|
1305 |
# longer in the manifest. |
588 | 1306 |
if moddirstate and linear_path and f not in m2: |
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1307 |
self.dirstate.forget((f,)) |
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1308 |
|
576 | 1309 |
# Compare manifests |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1310 |
for f, n in mw.iteritems(): |
588 | 1311 |
if choose and not choose(f): continue |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1312 |
if f in m2: |
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1313 |
s = 0 |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1314 |
|
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1315 |
# is the wfile new since m1, and match m2? |
428 | 1316 |
if f not in m1: |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1317 |
t1 = self.wfile(f).read() |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1318 |
t2 = self.file(f).revision(m2[f]) |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1319 |
if cmp(t1, t2) == 0: |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1320 |
mark[f] = 1 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1321 |
n = m2[f] |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1322 |
del t1, t2 |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1323 |
|
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
1324 |
# are files different? |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1325 |
if n != m2[f]: |
254 | 1326 |
a = ma.get(f, nullid) |
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
1327 |
# are both different from the ancestor? |
254 | 1328 |
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
|
1329 |
self.ui.debug(" %s versions differ, resolve\n" % f) |
276 | 1330 |
# merge executable bits |
1331 |
# "if we changed or they changed, change in merge" |
|
1332 |
a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
|
1333 |
mode = ((a^b) | (a^c)) ^ a |
|
1334 |
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
|
1335 |
s = 1 |
305 | 1336 |
# are we clobbering? |
1337 |
# is remote's version newer? |
|
1338 |
# or are we going back in time? |
|
1339 |
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
|
1340 |
self.ui.debug(" remote %s is newer, get\n" % f) |
254 | 1341 |
get[f] = m2[f] |
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1342 |
s = 1 |
305 | 1343 |
else: |
1344 |
mark[f] = 1 |
|
576 | 1345 |
elif f in umap: |
1346 |
# this unknown file is the same as the checkout |
|
1347 |
get[f] = m2[f] |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1348 |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1349 |
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
|
1350 |
if force: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1351 |
self.ui.debug(" updating permissions for %s\n" % f) |
441 | 1352 |
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
|
1353 |
else: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1354 |
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
|
1355 |
mode = ((a^b) | (a^c)) ^ a |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1356 |
if mode != b: |
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1357 |
self.ui.debug(" updating permissions for %s\n" % f) |
441 | 1358 |
util.set_exec(self.wjoin(f), mode) |
305 | 1359 |
mark[f] = 1 |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1360 |
del m2[f] |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1361 |
elif f in ma: |
616 | 1362 |
if n != ma[f]: |
1363 |
r = "d" |
|
1364 |
if not force and (linear_path or allow): |
|
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
|
1365 |
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
|
1366 |
(" 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
|
1367 |
"(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
|
1368 |
if r == "d": |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1369 |
remove.append(f) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1370 |
else: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1371 |
self.ui.debug("other deleted %s\n" % f) |
254 | 1372 |
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
|
1373 |
else: |
254 | 1374 |
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
|
1375 |
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
|
1376 |
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
|
1377 |
remove.append(f) |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
377
diff
changeset
|
1378 |
else: |
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
377
diff
changeset
|
1379 |
self.ui.debug("local created %s, keeping\n" % f) |
254 | 1380 |
else: |
1381 |
self.ui.debug("working dir created %s, keeping\n" % f) |
|
46 | 1382 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1383 |
for f, n in m2.iteritems(): |
588 | 1384 |
if choose and not choose(f): continue |
256 | 1385 |
if f[0] == "/": continue |
616 | 1386 |
if f in ma and n != ma[f]: |
1387 |
r = "k" |
|
1388 |
if not force and (linear_path or allow): |
|
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
|
1389 |
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
|
1390 |
("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
|
1391 |
"(k)eep or (d)elete?", "[kd]", "k") |
616 | 1392 |
if r == "k": get[f] = n |
1393 |
elif f not in ma: |
|
254 | 1394 |
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
|
1395 |
get[f] = n |
616 | 1396 |
else: |
680
4b7b79d2db2c
Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents:
679
diff
changeset
|
1397 |
if force or p2 == pa: # going backwards? |
4b7b79d2db2c
Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents:
679
diff
changeset
|
1398 |
self.ui.debug("local deleted %s, recreating\n" % f) |
650
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1399 |
get[f] = n |
680
4b7b79d2db2c
Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents:
679
diff
changeset
|
1400 |
else: |
4b7b79d2db2c
Handle undeletion of files when checking out old revisions
Matt Mackall <mpm@selenic.com>
parents:
679
diff
changeset
|
1401 |
self.ui.debug("local deleted %s\n" % f) |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1402 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1403 |
del mw, m1, m2, ma |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1404 |
|
275 | 1405 |
if force: |
1406 |
for f in merge: |
|
1407 |
get[f] = merge[f][1] |
|
1408 |
merge = {} |
|
1409 |
||
690 | 1410 |
if linear_path or force: |
254 | 1411 |
# we don't need to do any magic, just jump to the new rev |
1412 |
mode = 'n' |
|
1413 |
p1, p2 = p2, nullid |
|
1414 |
else: |
|
275 | 1415 |
if not allow: |
305 | 1416 |
self.ui.status("this update spans a branch" + |
1417 |
" affecting the following files:\n") |
|
1418 |
fl = merge.keys() + get.keys() |
|
1419 |
fl.sort() |
|
1420 |
for f in fl: |
|
1421 |
cf = "" |
|
1422 |
if f in merge: cf = " (resolve)" |
|
1423 |
self.ui.status(" %s%s\n" % (f, cf)) |
|
1424 |
self.ui.warn("aborting update spanning branches!\n") |
|
1425 |
self.ui.status("(use update -m to perform a branch merge)\n") |
|
275 | 1426 |
return 1 |
254 | 1427 |
# we have to remember what files we needed to get/change |
1428 |
# because any file that's different from either one of its |
|
1429 |
# parents must be in the changeset |
|
1430 |
mode = 'm' |
|
588 | 1431 |
if moddirstate: |
1432 |
self.dirstate.update(mark.keys(), "m") |
|
254 | 1433 |
|
588 | 1434 |
if moddirstate: |
1435 |
self.dirstate.setparents(p1, p2) |
|
191
d7e859cf2f1b
merge: add count of new manifests, files, and revisions
mpm@selenic.com
parents:
190
diff
changeset
|
1436 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1437 |
# 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
|
1438 |
files = get.keys() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1439 |
files.sort() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1440 |
for f in files: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1441 |
if f[0] == "/": continue |
273
4f8174389001
merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents:
263
diff
changeset
|
1442 |
self.ui.note("getting %s\n" % f) |
276 | 1443 |
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
|
1444 |
try: |
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
1445 |
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
|
1446 |
except IOError: |
297
0dbcf3c9ff20
Fixed usage of removed variable 'wp'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
292
diff
changeset
|
1447 |
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
|
1448 |
self.wfile(f, "w").write(t) |
441 | 1449 |
util.set_exec(self.wjoin(f), mf2[f]) |
588 | 1450 |
if moddirstate: |
1451 |
self.dirstate.update([f], mode) |
|
46 | 1452 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1453 |
# merge the tricky bits |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1454 |
files = merge.keys() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1455 |
files.sort() |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1456 |
for f in files: |
256 | 1457 |
self.ui.status("merging %s\n" % f) |
276 | 1458 |
m, o, flag = merge[f] |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1459 |
self.merge3(f, m, o) |
441 | 1460 |
util.set_exec(self.wjoin(f), flag) |
588 | 1461 |
if moddirstate: |
1462 |
self.dirstate.update([f], 'm') |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1463 |
|
681 | 1464 |
remove.sort() |
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1465 |
for f in remove: |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1466 |
self.ui.note("removing %s\n" % f) |
690 | 1467 |
try: |
1468 |
os.unlink(f) |
|
1469 |
except OSError, inst: |
|
1470 |
self.ui.warn("update failed to remove %s: %s!\n" % (f, inst)) |
|
578 | 1471 |
# try removing directories that might now be empty |
1472 |
try: os.removedirs(os.path.dirname(f)) |
|
1473 |
except: pass |
|
588 | 1474 |
if moddirstate: |
1475 |
if mode == 'n': |
|
1476 |
self.dirstate.forget(remove) |
|
1477 |
else: |
|
1478 |
self.dirstate.update(remove, 'r') |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1479 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1480 |
def merge3(self, fn, my, other): |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1481 |
"""perform a 3-way merge in the working directory""" |
249 | 1482 |
|
96 | 1483 |
def temp(prefix, node): |
1484 |
pre = "%s~%s." % (os.path.basename(fn), prefix) |
|
1485 |
(fd, name) = tempfile.mkstemp("", pre) |
|
417 | 1486 |
f = os.fdopen(fd, "wb") |
96 | 1487 |
f.write(fl.revision(node)) |
1488 |
f.close() |
|
1489 |
return name |
|
1490 |
||
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1491 |
fl = self.file(fn) |
96 | 1492 |
base = fl.ancestor(my, other) |
244 | 1493 |
a = self.wjoin(fn) |
346 | 1494 |
b = temp("base", base) |
1495 |
c = temp("other", other) |
|
96 | 1496 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1497 |
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
|
1498 |
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
|
1499 |
(fn, short(other), short(base))) |
96 | 1500 |
|
691
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
690
diff
changeset
|
1501 |
cmd = os.environ.get("HGMERGE", "hgmerge") or \ |
61c6b4178b9e
HG environment variables take precedence over hgrc
mpm@selenic.com
parents:
690
diff
changeset
|
1502 |
self.ui.config("ui", "merge") |
240 | 1503 |
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
|
1504 |
if r: |
275 | 1505 |
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
|
1506 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1507 |
os.unlink(b) |
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1508 |
os.unlink(c) |
96 | 1509 |
|
247 | 1510 |
def verify(self): |
1511 |
filelinkrevs = {} |
|
1512 |
filenodes = {} |
|
1513 |
changesets = revisions = files = 0 |
|
1514 |
errors = 0 |
|
1515 |
||
302 | 1516 |
seen = {} |
247 | 1517 |
self.ui.status("checking changesets\n") |
1518 |
for i in range(self.changelog.count()): |
|
1519 |
changesets += 1 |
|
1520 |
n = self.changelog.node(i) |
|
302 | 1521 |
if n in seen: |
1522 |
self.ui.warn("duplicate changeset at revision %d\n" % i) |
|
1523 |
errors += 1 |
|
1524 |
seen[n] = 1 |
|
515 | 1525 |
|
247 | 1526 |
for p in self.changelog.parents(n): |
1527 |
if p not in self.changelog.nodemap: |
|
1528 |
self.ui.warn("changeset %s has unknown parent %s\n" % |
|
1529 |
(short(n), short(p))) |
|
1530 |
errors += 1 |
|
1531 |
try: |
|
1532 |
changes = self.changelog.read(n) |
|
1533 |
except Exception, inst: |
|
1534 |
self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst)) |
|
1535 |
errors += 1 |
|
1536 |
||
1537 |
for f in changes[3]: |
|
1538 |
filelinkrevs.setdefault(f, []).append(i) |
|
1539 |
||
302 | 1540 |
seen = {} |
247 | 1541 |
self.ui.status("checking manifests\n") |
1542 |
for i in range(self.manifest.count()): |
|
1543 |
n = self.manifest.node(i) |
|
302 | 1544 |
if n in seen: |
1545 |
self.ui.warn("duplicate manifest at revision %d\n" % i) |
|
1546 |
errors += 1 |
|
1547 |
seen[n] = 1 |
|
515 | 1548 |
|
247 | 1549 |
for p in self.manifest.parents(n): |
1550 |
if p not in self.manifest.nodemap: |
|
1551 |
self.ui.warn("manifest %s has unknown parent %s\n" % |
|
1552 |
(short(n), short(p))) |
|
1553 |
errors += 1 |
|
1554 |
||
1555 |
try: |
|
1556 |
delta = mdiff.patchtext(self.manifest.delta(n)) |
|
1557 |
except KeyboardInterrupt: |
|
582 | 1558 |
self.ui.warn("aborted") |
247 | 1559 |
sys.exit(0) |
1560 |
except Exception, inst: |
|
1561 |
self.ui.warn("unpacking manifest %s: %s\n" |
|
1562 |
% (short(n), inst)) |
|
1563 |
errors += 1 |
|
1564 |
||
1565 |
ff = [ l.split('\0') for l in delta.splitlines() ] |
|
1566 |
for f, fn in ff: |
|
284 | 1567 |
filenodes.setdefault(f, {})[bin(fn[:40])] = 1 |
247 | 1568 |
|
1569 |
self.ui.status("crosschecking files in changesets and manifests\n") |
|
1570 |
for f in filenodes: |
|
1571 |
if f not in filelinkrevs: |
|
1572 |
self.ui.warn("file %s in manifest but not in changesets\n" % f) |
|
1573 |
errors += 1 |
|
1574 |
||
1575 |
for f in filelinkrevs: |
|
1576 |
if f not in filenodes: |
|
1577 |
self.ui.warn("file %s in changeset but not in manifest\n" % f) |
|
1578 |
errors += 1 |
|
1579 |
||
1580 |
self.ui.status("checking files\n") |
|
1581 |
ff = filenodes.keys() |
|
1582 |
ff.sort() |
|
1583 |
for f in ff: |
|
1584 |
if f == "/dev/null": continue |
|
1585 |
files += 1 |
|
1586 |
fl = self.file(f) |
|
1587 |
nodes = { nullid: 1 } |
|
302 | 1588 |
seen = {} |
247 | 1589 |
for i in range(fl.count()): |
1590 |
revisions += 1 |
|
1591 |
n = fl.node(i) |
|
1592 |
||
302 | 1593 |
if n in seen: |
1594 |
self.ui.warn("%s: duplicate revision %d\n" % (f, i)) |
|
1595 |
errors += 1 |
|
1596 |
||
247 | 1597 |
if n not in filenodes[f]: |
1598 |
self.ui.warn("%s: %d:%s not in manifests\n" |
|
1599 |
% (f, i, short(n))) |
|
1600 |
errors += 1 |
|
1601 |
else: |
|
1602 |
del filenodes[f][n] |
|
1603 |
||
1604 |
flr = fl.linkrev(n) |
|
1605 |
if flr not in filelinkrevs[f]: |
|
1606 |
self.ui.warn("%s:%s points to unexpected changeset %d\n" |
|
1607 |
% (f, short(n), fl.linkrev(n))) |
|
1608 |
errors += 1 |
|
1609 |
else: |
|
1610 |
filelinkrevs[f].remove(flr) |
|
1611 |
||
1612 |
# verify contents |
|
1613 |
try: |
|
1614 |
t = fl.read(n) |
|
1615 |
except Exception, inst: |
|
1616 |
self.ui.warn("unpacking file %s %s: %s\n" |
|
1617 |
% (f, short(n), inst)) |
|
1618 |
errors += 1 |
|
1619 |
||
1620 |
# verify parents |
|
1621 |
(p1, p2) = fl.parents(n) |
|
1622 |
if p1 not in nodes: |
|
1623 |
self.ui.warn("file %s:%s unknown parent 1 %s" % |
|
1624 |
(f, short(n), short(p1))) |
|
1625 |
errors += 1 |
|
1626 |
if p2 not in nodes: |
|
1627 |
self.ui.warn("file %s:%s unknown parent 2 %s" % |
|
1628 |
(f, short(n), short(p1))) |
|
1629 |
errors += 1 |
|
1630 |
nodes[n] = 1 |
|
1631 |
||
1632 |
# cross-check |
|
1633 |
for node in filenodes[f]: |
|
1634 |
self.ui.warn("node %s in manifests not in %s\n" |
|
1635 |
% (hex(n), f)) |
|
1636 |
errors += 1 |
|
1637 |
||
1638 |
self.ui.status("%d files, %d changesets, %d total revisions\n" % |
|
1639 |
(files, changesets, revisions)) |
|
1640 |
||
1641 |
if errors: |
|
1642 |
self.ui.warn("%d integrity errors encountered!\n" % errors) |
|
1643 |
return 1 |
|
1644 |
||
623
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1645 |
class httprepository: |
60 | 1646 |
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
|
1647 |
self.url = path |
60 | 1648 |
self.ui = ui |
321 | 1649 |
no_list = [ "localhost", "127.0.0.1" ] |
1650 |
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
|
1651 |
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
|
1652 |
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
|
1653 |
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
|
1654 |
host = host[7:] |
321 | 1655 |
user = ui.config("http_proxy", "user") |
1656 |
passwd = ui.config("http_proxy", "passwd") |
|
1657 |
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
|
1658 |
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
|
1659 |
no = os.environ.get("no_proxy") |
321 | 1660 |
if no: |
1661 |
no_list = no_list + no.split(",") |
|
515 | 1662 |
|
321 | 1663 |
no_proxy = 0 |
1664 |
for h in no_list: |
|
1665 |
if (path.startswith("http://" + h + "/") or |
|
1666 |
path.startswith("http://" + h + ":") or |
|
1667 |
path == "http://" + h): |
|
1668 |
no_proxy = 1 |
|
1669 |
||
1670 |
# Note: urllib2 takes proxy values from the environment and those will |
|
1671 |
# 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
|
1672 |
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
|
1673 |
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
|
1674 |
del os.environ[env] |
321 | 1675 |
|
1676 |
proxy_handler = urllib2.BaseHandler() |
|
1677 |
if host and not no_proxy: |
|
1678 |
proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host}) |
|
1679 |
||
1680 |
authinfo = None |
|
1681 |
if user and passwd: |
|
1682 |
passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm() |
|
1683 |
passmgr.add_password(None, host, user, passwd) |
|
1684 |
authinfo = urllib2.ProxyBasicAuthHandler(passmgr) |
|
1685 |
||
1686 |
opener = urllib2.build_opener(proxy_handler, authinfo) |
|
1687 |
urllib2.install_opener(opener) |
|
60 | 1688 |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1689 |
def dev(self): |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1690 |
return -1 |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1691 |
|
60 | 1692 |
def do_cmd(self, cmd, **args): |
83 | 1693 |
self.ui.debug("sending %s command\n" % cmd) |
60 | 1694 |
q = {"cmd": cmd} |
1695 |
q.update(args) |
|
1696 |
qs = urllib.urlencode(q) |
|
1697 |
cu = "%s?%s" % (self.url, qs) |
|
321 | 1698 |
return urllib2.urlopen(cu) |
60 | 1699 |
|
222 | 1700 |
def heads(self): |
1701 |
d = self.do_cmd("heads").read() |
|
1702 |
try: |
|
1703 |
return map(bin, d[:-1].split(" ")) |
|
1704 |
except: |
|
1705 |
self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1706 |
raise |
|
1707 |
||
60 | 1708 |
def branches(self, nodes): |
1709 |
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
|
1710 |
d = self.do_cmd("branches", nodes=n).read() |
217 | 1711 |
try: |
1712 |
br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] |
|
1713 |
return br |
|
1714 |
except: |
|
1715 |
self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1716 |
raise |
|
60 | 1717 |
|
1718 |
def between(self, pairs): |
|
1719 |
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
|
1720 |
d = self.do_cmd("between", pairs=n).read() |
217 | 1721 |
try: |
1722 |
p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] |
|
1723 |
return p |
|
1724 |
except: |
|
1725 |
self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") |
|
1726 |
raise |
|
60 | 1727 |
|
1728 |
def changegroup(self, nodes): |
|
1729 |
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
|
1730 |
f = self.do_cmd("changegroup", roots=n) |
192 | 1731 |
bytes = 0 |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1732 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1733 |
class zread: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1734 |
def __init__(self, f): |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1735 |
self.zd = zlib.decompressobj() |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1736 |
self.f = f |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1737 |
self.buf = "" |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1738 |
def read(self, l): |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1739 |
while l > len(self.buf): |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1740 |
r = f.read(4096) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1741 |
if r: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1742 |
self.buf += self.zd.decompress(r) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1743 |
else: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1744 |
self.buf += self.zd.flush() |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1745 |
break |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1746 |
d, self.buf = self.buf[:l], self.buf[l:] |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1747 |
return d |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1748 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1749 |
return zread(f) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1750 |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1751 |
class remotelock: |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1752 |
def __init__(self, repo): |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1753 |
self.repo = repo |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1754 |
def release(self): |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1755 |
self.repo.unlock() |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1756 |
self.repo = None |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1757 |
def __del__(self): |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1758 |
if self.repo: |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1759 |
self.release() |
60 | 1760 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1761 |
class sshrepository: |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1762 |
def __init__(self, ui, path): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1763 |
self.url = path |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1764 |
self.ui = ui |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1765 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1766 |
m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1767 |
if not m: |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1768 |
raise RepoError("couldn't parse destination %s\n" % path) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1769 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1770 |
self.user = m.group(2) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1771 |
self.host = m.group(3) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1772 |
self.port = m.group(5) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1773 |
self.path = m.group(7) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1774 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1775 |
args = self.user and ("%s@%s" % (self.user, self.host)) or self.host |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1776 |
args = self.port and ("%s -p %s") % (args, self.port) or args |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1777 |
path = self.path or "" |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1778 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1779 |
cmd = "ssh %s 'hg -R %s serve --stdio'" |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1780 |
cmd = cmd % (args, path) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1781 |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1782 |
self.pipeo, self.pipei, self.pipee = os.popen3(cmd) |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1783 |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1784 |
def readerr(self): |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1785 |
while 1: |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1786 |
r,w,x = select.select([self.pipee], [], [], 0) |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1787 |
if not r: break |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1788 |
l = self.pipee.readline() |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1789 |
if not l: break |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1790 |
self.ui.status("remote: ", l) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1791 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1792 |
def __del__(self): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1793 |
self.pipeo.close() |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1794 |
self.pipei.close() |
648
8c89408a7154
Attempt to read all remaining remote output at close
Matt Mackall <mpm@selenic.com>
parents:
646
diff
changeset
|
1795 |
for l in self.pipee: |
8c89408a7154
Attempt to read all remaining remote output at close
Matt Mackall <mpm@selenic.com>
parents:
646
diff
changeset
|
1796 |
self.ui.status("remote: ", l) |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1797 |
self.pipee.close() |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1798 |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1799 |
def dev(self): |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1800 |
return -1 |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1801 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1802 |
def do_cmd(self, cmd, **args): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1803 |
self.ui.debug("sending %s command\n" % cmd) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1804 |
self.pipeo.write("%s\n" % cmd) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1805 |
for k, v in args.items(): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1806 |
self.pipeo.write("%s %d\n" % (k, len(v))) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1807 |
self.pipeo.write(v) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1808 |
self.pipeo.flush() |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1809 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1810 |
return self.pipei |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1811 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1812 |
def call(self, cmd, **args): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1813 |
r = self.do_cmd(cmd, **args) |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1814 |
l = r.readline() |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1815 |
self.readerr() |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1816 |
try: |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1817 |
l = int(l) |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1818 |
except: |
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1819 |
raise RepoError("unexpected response '%s'" % l) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1820 |
return r.read(l) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1821 |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1822 |
def lock(self): |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1823 |
self.call("lock") |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1824 |
return remotelock(self) |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1825 |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1826 |
def unlock(self): |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1827 |
self.call("unlock") |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1828 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1829 |
def heads(self): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1830 |
d = self.call("heads") |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1831 |
try: |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1832 |
return map(bin, d[:-1].split(" ")) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1833 |
except: |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1834 |
raise RepoError("unexpected response '%s'" % (d[:400] + "...")) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1835 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1836 |
def branches(self, nodes): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1837 |
n = " ".join(map(hex, nodes)) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1838 |
d = self.call("branches", nodes=n) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1839 |
try: |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1840 |
br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1841 |
return br |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1842 |
except: |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1843 |
raise RepoError("unexpected response '%s'" % (d[:400] + "...")) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1844 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1845 |
def between(self, pairs): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1846 |
n = "\n".join(["-".join(map(hex, p)) for p in pairs]) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1847 |
d = self.call("between", pairs=n) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1848 |
try: |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1849 |
p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1850 |
return p |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1851 |
except: |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1852 |
raise RepoError("unexpected response '%s'" % (d[:400] + "...")) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1853 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1854 |
def changegroup(self, nodes): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1855 |
n = " ".join(map(hex, nodes)) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1856 |
f = self.do_cmd("changegroup", roots=n) |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1857 |
return self.pipei |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1858 |
|
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1859 |
def addchangegroup(self, cg): |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1860 |
d = self.call("addchangegroup") |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1861 |
if d: |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1862 |
raise RepoError("push refused: %s", d) |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1863 |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1864 |
while 1: |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1865 |
d = cg.read(4096) |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1866 |
if not d: break |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1867 |
self.pipeo.write(d) |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1868 |
self.readerr() |
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1869 |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1870 |
self.pipeo.flush() |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1871 |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1872 |
self.readerr() |
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1873 |
l = int(self.pipei.readline()) |
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1874 |
return self.pipei.read(l) != "" |
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1875 |
|
60 | 1876 |
def repository(ui, path=None, create=0): |
623
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1877 |
if path: |
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1878 |
if path.startswith("http://"): |
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1879 |
return httprepository(ui, path) |
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1880 |
if path.startswith("hg://"): |
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1881 |
return httprepository(ui, path.replace("hg://", "http://")) |
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1882 |
if path.startswith("old-http://"): |
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1883 |
return localrepository(ui, path.replace("old-http://", "http://")) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1884 |
if path.startswith("ssh://"): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1885 |
return sshrepository(ui, path) |
60 | 1886 |
|
623
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1887 |
return localrepository(ui, path, create) |