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