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