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