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