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