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