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