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