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