Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/hg.py @ 657:22bc6fb9aefc
dirstate.forget() takes a list
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
dirstate.forget() takes a list
manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te
e8ZI236WNWfyrwEASxFIeLM=
=yDVZ
-----END PGP SIGNATURE-----
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 10 Jul 2005 10:06:54 -0800 |
| parents | 147d2fa2d766 |
| children | f8098ae9f5b6 |
| 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") |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
14 demandload(globals(), "bisect select") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
15 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
16 class filelog(revlog): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
17 def __init__(self, opener, path): |
|
144
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
18 revlog.__init__(self, opener, |
|
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
19 os.path.join("data", path + ".i"), |
|
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
20 os.path.join("data", path + ".d")) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
21 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
22 def read(self, node): |
| 360 | 23 t = self.revision(node) |
| 24 if t[:2] != '\1\n': | |
| 25 return t | |
| 26 s = t.find('\1\n', 2) | |
| 27 return t[s+2:] | |
| 28 | |
| 29 def readmeta(self, node): | |
| 30 t = self.revision(node) | |
| 31 if t[:2] != '\1\n': | |
| 32 return t | |
| 33 s = t.find('\1\n', 2) | |
| 34 mt = t[2:s] | |
| 35 for l in mt.splitlines(): | |
| 36 k, v = l.split(": ", 1) | |
| 37 m[k] = v | |
| 38 return m | |
| 39 | |
| 40 def add(self, text, meta, transaction, link, p1=None, p2=None): | |
| 41 if meta or text[:2] == '\1\n': | |
| 42 mt = "" | |
| 43 if meta: | |
| 44 mt = [ "%s: %s\n" % (k, v) for k,v in meta.items() ] | |
| 45 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
|
46 return self.addrevision(text, transaction, link, p1, p2) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
47 |
| 79 | 48 def annotate(self, node): |
| 199 | 49 |
| 50 def decorate(text, rev): | |
| 436 | 51 return ([rev] * len(text.splitlines()), text) |
| 199 | 52 |
| 53 def pair(parent, child): | |
| 436 | 54 for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]): |
| 471 | 55 child[0][b1:b2] = parent[0][a1:a2] |
| 56 return child | |
| 199 | 57 |
| 200 | 58 # find all ancestors |
|
216
201115f2859b
hg annotate: actually annotate the given version
mpm@selenic.com
parents:
210
diff
changeset
|
59 needed = {node:1} |
| 199 | 60 visit = [node] |
| 61 while visit: | |
| 62 n = visit.pop(0) | |
| 63 for p in self.parents(n): | |
| 64 if p not in needed: | |
| 65 needed[p] = 1 | |
| 66 visit.append(p) | |
| 200 | 67 else: |
| 68 # count how many times we'll use this | |
| 69 needed[p] += 1 | |
| 199 | 70 |
| 200 | 71 # sort by revision which is a topological order |
| 471 | 72 visit = [ (self.rev(n), n) for n in needed.keys() ] |
| 199 | 73 visit.sort() |
| 74 hist = {} | |
| 75 | |
| 471 | 76 for r,n in visit: |
| 199 | 77 curr = decorate(self.read(n), self.linkrev(n)) |
| 78 for p in self.parents(n): | |
| 79 if p != nullid: | |
| 80 curr = pair(hist[p], curr) | |
| 200 | 81 # trim the history of unneeded revs |
| 82 needed[p] -= 1 | |
| 83 if not needed[p]: | |
| 84 del hist[p] | |
| 199 | 85 hist[n] = curr |
| 86 | |
| 436 | 87 return zip(hist[n][0], hist[n][1].splitlines(1)) |
| 79 | 88 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
89 class manifest(revlog): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
90 def __init__(self, opener): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
91 self.mapcache = None |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
92 self.listcache = None |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
93 self.addlist = None |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
94 revlog.__init__(self, opener, "00manifest.i", "00manifest.d") |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
95 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
96 def read(self, node): |
| 313 | 97 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
|
98 if self.mapcache and self.mapcache[0] == node: |
| 561 | 99 return self.mapcache[1] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
100 text = self.revision(node) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
101 map = {} |
| 276 | 102 flag = {} |
|
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
103 self.listcache = (text, text.splitlines(1)) |
|
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
104 for l in self.listcache[1]: |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
105 (f, n) = l.split('\0') |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
106 map[f] = bin(n[:40]) |
| 276 | 107 flag[f] = (n[40:-1] == "x") |
| 108 self.mapcache = (node, map, flag) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
109 return map |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
110 |
| 276 | 111 def readflags(self, node): |
| 313 | 112 if node == nullid: return {} # don't upset local cache |
|
358
9f4077d7ef6f
[PATCH] manifest.readflags performance buglet
mpm@selenic.com
parents:
350
diff
changeset
|
113 if not self.mapcache or self.mapcache[0] != node: |
| 276 | 114 self.read(node) |
| 115 return self.mapcache[2] | |
| 116 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
117 def diff(self, a, b): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
118 # this is sneaky, as we're not actually using a and b |
| 140 | 119 if self.listcache and self.addlist and self.listcache[0] == a: |
| 98 | 120 d = mdiff.diff(self.listcache[1], self.addlist, 1) |
| 121 if mdiff.patch(a, d) != b: | |
| 122 sys.stderr.write("*** sortdiff failed, falling back ***\n") | |
| 123 return mdiff.textdiff(a, b) | |
| 124 return d | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
125 else: |
| 44 | 126 return mdiff.textdiff(a, b) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
127 |
| 644 | 128 def add(self, map, flags, transaction, link, p1=None, p2=None,changed=None): |
| 129 # directly generate the mdiff delta from the data collected during | |
| 130 # the bisect loop below | |
| 131 def gendelta(delta): | |
| 132 i = 0 | |
| 133 result = [] | |
| 134 while i < len(delta): | |
| 135 start = delta[i][2] | |
| 136 end = delta[i][3] | |
| 137 l = delta[i][4] | |
| 138 if l == None: | |
| 139 l = "" | |
| 140 while i < len(delta) - 1 and start <= delta[i+1][2] and end >= delta[i+1][2]: | |
| 141 if delta[i+1][3] > end: | |
| 142 end = delta[i+1][3] | |
| 143 if delta[i+1][4]: | |
| 144 l += delta[i+1][4] | |
| 145 i += 1 | |
| 146 result.append(struct.pack(">lll", start, end, len(l)) + l) | |
| 147 i += 1 | |
| 148 return result | |
| 149 | |
| 150 # apply the changes collected during the bisect loop to our addlist | |
| 151 def addlistdelta(addlist, delta): | |
| 152 # apply the deltas to the addlist. start from the bottom up | |
| 153 # so changes to the offsets don't mess things up. | |
| 154 i = len(delta) | |
| 155 while i > 0: | |
| 156 i -= 1 | |
| 157 start = delta[i][0] | |
| 158 end = delta[i][1] | |
| 159 if delta[i][4]: | |
| 160 addlist[start:end] = [delta[i][4]] | |
| 161 else: | |
| 162 del addlist[start:end] | |
| 163 return addlist | |
| 164 | |
| 165 # calculate the byte offset of the start of each line in the | |
| 166 # manifest | |
| 167 def calcoffsets(addlist): | |
| 168 offsets = [0] * (len(addlist) + 1) | |
| 169 offset = 0 | |
| 170 i = 0 | |
| 171 while i < len(addlist): | |
| 172 offsets[i] = offset | |
| 173 offset += len(addlist[i]) | |
| 174 i += 1 | |
| 175 offsets[i] = offset | |
| 176 return offsets | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
177 |
| 644 | 178 # if we're using the listcache, make sure it is valid and |
| 179 # parented by the same node we're diffing against | |
| 180 if not changed or not self.listcache or not p1 or self.mapcache[0] != p1: | |
| 181 files = map.keys() | |
| 182 files.sort() | |
| 183 | |
| 184 self.addlist = ["%s\000%s%s\n" % | |
| 185 (f, hex(map[f]), flags[f] and "x" or '') | |
| 186 for f in files] | |
| 187 cachedelta = None | |
| 188 else: | |
| 189 addlist = self.listcache[1] | |
| 190 | |
| 191 # find the starting offset for each line in the add list | |
| 192 offsets = calcoffsets(addlist) | |
| 193 | |
| 194 # combine the changed lists into one list for sorting | |
| 195 work = [[x, 0] for x in changed[0]] | |
| 196 work[len(work):] = [[x, 1] for x in changed[1]] | |
| 197 work.sort() | |
| 198 | |
| 199 delta = [] | |
| 200 bs = 0 | |
| 201 | |
| 202 for w in work: | |
| 203 f = w[0] | |
| 204 # bs will either be the index of the item or the insertion point | |
| 205 bs = bisect.bisect(addlist, f, bs) | |
| 206 if bs < len(addlist): | |
| 207 fn = addlist[bs][:addlist[bs].index('\0')] | |
| 208 else: | |
| 209 fn = None | |
| 210 if w[1] == 0: | |
| 211 l = "%s\000%s%s\n" % (f, hex(map[f]), flags[f] and "x" or '') | |
| 212 else: | |
| 213 l = None | |
| 214 start = bs | |
| 215 if fn != f: | |
| 216 # item not found, insert a new one | |
| 217 end = bs | |
| 218 if w[1] == 1: | |
| 219 sys.stderr.write("failed to remove %s from manifest" % f) | |
| 220 sys.exit(1) | |
| 221 else: | |
| 222 # item is found, replace/delete the existing line | |
| 223 end = bs + 1 | |
| 224 delta.append([start, end, offsets[start], offsets[end], l]) | |
| 225 | |
| 226 self.addlist = addlistdelta(addlist, delta) | |
| 227 if self.mapcache[0] == self.tip(): | |
| 228 cachedelta = "".join(gendelta(delta)) | |
| 229 else: | |
| 230 cachedelta = None | |
| 231 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
232 text = "".join(self.addlist) |
| 644 | 233 if cachedelta and mdiff.patch(self.listcache[0], cachedelta) != text: |
| 234 sys.stderr.write("manifest delta failure") | |
| 235 sys.exit(1) | |
| 236 n = self.addrevision(text, transaction, link, p1, p2, cachedelta) | |
| 302 | 237 self.mapcache = (n, map, flags) |
|
25
daa724b27300
Fix corruption from manifest.listcache optimization
mpm@selenic.com
parents:
20
diff
changeset
|
238 self.listcache = (text, self.addlist) |
| 140 | 239 self.addlist = None |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
240 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
241 return n |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
242 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
243 class changelog(revlog): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
244 def __init__(self, opener): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
245 revlog.__init__(self, opener, "00changelog.i", "00changelog.d") |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
246 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
247 def extract(self, text): |
| 37 | 248 if not text: |
| 40 | 249 return (nullid, "", "0", [], "") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
250 last = text.index("\n\n") |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
251 desc = text[last + 2:] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
252 l = text[:last].splitlines() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
253 manifest = bin(l[0]) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
254 user = l[1] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
255 date = l[2] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
256 files = l[3:] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
257 return (manifest, user, date, files, desc) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
258 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
259 def read(self, node): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
260 return self.extract(self.revision(node)) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
261 |
| 203 | 262 def add(self, manifest, list, desc, transaction, p1=None, p2=None, |
| 263 user=None, date=None): | |
| 264 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
|
265 list.sort() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
266 l = [hex(manifest), user, date] + list + ["", desc] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
267 text = "\n".join(l) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
268 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
|
269 |
| 220 | 270 class dirstate: |
| 244 | 271 def __init__(self, opener, ui, root): |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
272 self.opener = opener |
| 244 | 273 self.root = root |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
274 self.dirty = 0 |
| 20 | 275 self.ui = ui |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
276 self.map = None |
| 227 | 277 self.pl = None |
| 363 | 278 self.copies = {} |
| 220 | 279 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
280 def __del__(self): |
| 220 | 281 if self.dirty: |
| 282 self.write() | |
| 283 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
284 def __getitem__(self, key): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
285 try: |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
286 return self.map[key] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
287 except TypeError: |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
288 self.read() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
289 return self[key] |
| 220 | 290 |
| 291 def __contains__(self, key): | |
| 292 if not self.map: self.read() | |
| 293 return key in self.map | |
| 294 | |
| 227 | 295 def parents(self): |
| 296 if not self.pl: | |
| 297 self.read() | |
| 298 return self.pl | |
| 299 | |
| 300 def setparents(self, p1, p2 = nullid): | |
| 301 self.dirty = 1 | |
| 302 self.pl = p1, p2 | |
| 303 | |
| 220 | 304 def state(self, key): |
| 305 try: | |
| 306 return self[key][0] | |
| 307 except KeyError: | |
| 308 return "?" | |
| 309 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
310 def read(self): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
311 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
|
312 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
313 self.map = {} |
| 227 | 314 self.pl = [nullid, nullid] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
315 try: |
| 220 | 316 st = self.opener("dirstate").read() |
| 311 | 317 if not st: return |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
318 except: return |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
319 |
| 227 | 320 self.pl = [st[:20], st[20: 40]] |
| 321 | |
| 322 pos = 40 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
323 while pos < len(st): |
| 220 | 324 e = struct.unpack(">cllll", st[pos:pos+17]) |
| 325 l = e[4] | |
| 326 pos += 17 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
327 f = st[pos:pos + l] |
| 515 | 328 if '\0' in f: |
| 363 | 329 f, c = f.split('\0') |
| 330 self.copies[f] = c | |
| 220 | 331 self.map[f] = e[:4] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
332 pos += l |
| 363 | 333 |
| 334 def copy(self, source, dest): | |
| 335 self.read() | |
| 336 self.dirty = 1 | |
| 337 self.copies[dest] = source | |
| 338 | |
| 339 def copied(self, file): | |
| 340 return self.copies.get(file, None) | |
| 515 | 341 |
| 220 | 342 def update(self, files, state): |
| 343 ''' current states: | |
| 344 n normal | |
| 231 | 345 m needs merging |
| 220 | 346 r marked for removal |
| 347 a marked for addition''' | |
| 348 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
349 if not files: return |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
350 self.read() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
351 self.dirty = 1 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
352 for f in files: |
| 220 | 353 if state == "r": |
| 354 self.map[f] = ('r', 0, 0, 0) | |
| 355 else: | |
| 253 | 356 s = os.stat(os.path.join(self.root, f)) |
| 357 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
|
358 |
| 220 | 359 def forget(self, files): |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
360 if not files: return |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
361 self.read() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
362 self.dirty = 1 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
363 for f in files: |
| 20 | 364 try: |
| 365 del self.map[f] | |
| 366 except KeyError: | |
| 220 | 367 self.ui.warn("not in dirstate: %s!\n" % f) |
| 20 | 368 pass |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
369 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
370 def clear(self): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
371 self.map = {} |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
372 self.dirty = 1 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
373 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
374 def write(self): |
| 220 | 375 st = self.opener("dirstate", "w") |
| 227 | 376 st.write("".join(self.pl)) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
377 for f, e in self.map.items(): |
| 363 | 378 c = self.copied(f) |
| 379 if c: | |
| 380 f = f + "\0" + c | |
| 220 | 381 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
|
382 st.write(e + f) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
383 self.dirty = 0 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
384 |
| 536 | 385 def changes(self, files, ignore): |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
386 self.read() |
| 536 | 387 dc = self.map.copy() |
| 388 lookup, changed, added, unknown = [], [], [], [] | |
| 389 | |
| 390 # compare all files by default | |
| 391 if not files: files = [self.root] | |
| 392 | |
| 393 # recursive generator of all files listed | |
| 394 def walk(files): | |
| 556 | 395 for f in util.unique(files): |
| 537 | 396 f = os.path.join(self.root, f) |
| 536 | 397 if os.path.isdir(f): |
| 398 for dir, subdirs, fl in os.walk(f): | |
| 399 d = dir[len(self.root) + 1:] | |
| 400 if ".hg" in subdirs: subdirs.remove(".hg") | |
| 401 for fn in fl: | |
| 402 fn = util.pconvert(os.path.join(d, fn)) | |
| 403 yield fn | |
| 404 else: | |
| 405 yield f[len(self.root) + 1:] | |
| 406 | |
| 556 | 407 for fn in util.unique(walk(files)): |
| 536 | 408 try: s = os.stat(os.path.join(self.root, fn)) |
| 409 except: continue | |
| 410 | |
| 411 if fn in dc: | |
| 412 c = dc[fn] | |
| 413 del dc[fn] | |
| 414 | |
| 415 if c[0] == 'm': | |
| 416 changed.append(fn) | |
| 417 elif c[0] == 'a': | |
| 418 added.append(fn) | |
| 419 elif c[0] == 'r': | |
| 420 unknown.append(fn) | |
| 421 elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100: | |
| 422 changed.append(fn) | |
| 423 elif c[1] != s.st_mode or c[3] != s.st_mtime: | |
| 424 lookup.append(fn) | |
| 425 else: | |
| 426 if not ignore(fn): unknown.append(fn) | |
| 427 | |
| 428 return (lookup, changed, added, dc.keys(), unknown) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
429 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
430 # used to avoid circular references so destructors work |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
431 def opener(base): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
432 p = base |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
433 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
|
434 if p[:7] == "http://": |
|
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
435 f = os.path.join(p, urllib.quote(path)) |
| 372 | 436 return httprangereader.httprangereader(f) |
|
15
6daf7757e92b
Fix network pull of repo files with "%" in their base64 encoding.
mpm@selenic.com
parents:
10
diff
changeset
|
437 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
438 f = os.path.join(p, path) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
439 |
| 292 | 440 mode += "b" # for that other OS |
| 441 | |
| 442 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
|
443 try: |
|
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
444 s = os.stat(f) |
|
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
445 except OSError: |
|
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
446 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
|
447 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
|
448 os.makedirs(d) |
|
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
449 else: |
|
c37c7f784ee3
Move hg from storing files in data with base64 encoding to full
mpm@selenic.com
parents:
109
diff
changeset
|
450 if s.st_nlink > 1: |
| 417 | 451 file(f + ".tmp", "wb").write(file(f, "rb").read()) |
| 421 | 452 util.rename(f+".tmp", f) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
453 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
454 return file(f, mode) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
455 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
456 return o |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
457 |
| 499 | 458 class RepoError(Exception): pass |
| 459 | |
| 60 | 460 class localrepository: |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
461 def __init__(self, ui, path=None, create=0): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
462 self.remote = 0 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
463 if path and path[:7] == "http://": |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
464 self.remote = 1 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
465 self.path = path |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
466 else: |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
467 if not path: |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
468 p = os.getcwd() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
469 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
|
470 oldp = p |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
471 p = os.path.dirname(p) |
| 499 | 472 if p == oldp: raise RepoError("no repo found") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
473 path = p |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
474 self.path = os.path.join(path, ".hg") |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
475 |
| 405 | 476 if not create and not os.path.isdir(self.path): |
| 499 | 477 raise RepoError("repository %s not found" % self.path) |
| 405 | 478 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
479 self.root = path |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
480 self.ui = ui |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
481 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
482 if create: |
| 515 | 483 os.mkdir(self.path) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
484 os.mkdir(self.join("data")) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
485 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
486 self.opener = opener(self.path) |
|
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
487 self.wopener = opener(self.root) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
488 self.manifest = manifest(self.opener) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
489 self.changelog = changelog(self.opener) |
|
649
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
490 self.ignorefunc = None |
| 343 | 491 self.tagscache = None |
| 492 self.nodetagscache = None | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
493 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
494 if not self.remote: |
| 244 | 495 self.dirstate = dirstate(self.opener, ui, self.root) |
| 337 | 496 try: |
| 497 self.ui.readconfig(self.opener("hgrc")) | |
| 498 except IOError: pass | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
499 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
500 def ignore(self, f): |
|
649
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
501 if not self.ignorefunc: |
|
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
502 bigpat = [] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
503 try: |
| 417 | 504 l = file(self.wjoin(".hgignore")) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
505 for pat in l: |
| 9 | 506 if pat != "\n": |
|
656
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
507 p = util.pconvert(pat[:-1]) |
|
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
508 try: |
|
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
509 r = re.compile(p) |
|
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
510 except: |
|
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
511 self.ui.warn("ignoring invalid ignore" |
|
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
512 + " regular expression '%s'\n" % p) |
|
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
513 else: |
|
147d2fa2d766
Warn about bogus ignore expressions
Matt Mackall <mpm@selenic.com>
parents:
652
diff
changeset
|
514 bigpat.append(util.pconvert(pat[:-1])) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
515 except IOError: pass |
|
649
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
516 if bigpat: |
|
652
a54a1c101a9a
Non-grouping regex for ignore
Matt Mackall <mpm@selenic.com>
parents:
650
diff
changeset
|
517 s = "(?:%s)" % (")|(?:".join(bigpat)) |
|
649
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
518 r = re.compile(s) |
|
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
519 self.ignorefunc = r.search |
|
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
520 else: |
|
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
521 self.ignorefunc = lambda x: False |
|
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
522 |
|
a7e267222864
Experimental ignore regex speed-up
Matt Mackall <mpm@selenic.com>
parents:
648
diff
changeset
|
523 return self.ignorefunc(f) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
524 |
| 487 | 525 def hook(self, name, **args): |
| 526 s = self.ui.config("hooks", name) | |
| 527 if s: | |
| 528 self.ui.note("running hook %s: %s\n" % (name, s)) | |
| 529 old = {} | |
| 530 for k, v in args.items(): | |
| 531 k = k.upper() | |
| 532 old[k] = os.environ.get(k, None) | |
| 533 os.environ[k] = v | |
| 534 | |
| 535 r = os.system(s) | |
| 536 | |
| 537 for k, v in old.items(): | |
| 538 if v != None: | |
| 539 os.environ[k] = v | |
| 540 else: | |
| 541 del os.environ[k] | |
| 542 | |
| 543 if r: | |
| 544 self.ui.warn("abort: %s hook failed with status %d!\n" % | |
| 545 (name, r)) | |
| 546 return False | |
| 547 return True | |
| 548 | |
| 343 | 549 def tags(self): |
| 550 '''return a mapping of tag to node''' | |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
551 if not self.tagscache: |
| 343 | 552 self.tagscache = {} |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
553 def addtag(self, k, n): |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
554 try: |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
555 bin_n = bin(n) |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
556 except TypeError: |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
557 bin_n = '' |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
558 self.tagscache[k.strip()] = bin_n |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
559 |
| 67 | 560 try: |
| 254 | 561 # read each head of the tags file, ending with the tip |
| 562 # and add each tag found to the map, with "newer" ones | |
| 563 # taking precedence | |
| 67 | 564 fl = self.file(".hgtags") |
| 254 | 565 h = fl.heads() |
| 566 h.reverse() | |
| 567 for r in h: | |
| 568 for l in fl.revision(r).splitlines(): | |
| 569 if l: | |
|
385
e9e1efd5291c
Fixed problems with extra spaces around tags in .hgtags
Thomas Arendsen Hein <thomas@intevation.de>
parents:
383
diff
changeset
|
570 n, k = l.split(" ", 1) |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
571 addtag(self, k, n) |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
572 except KeyError: |
|
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
573 pass |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
574 |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
575 try: |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
576 f = self.opener("localtags") |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
577 for l in f: |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
578 n, k = l.split(" ", 1) |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
579 addtag(self, k, n) |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
580 except IOError: |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
581 pass |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
582 |
| 343 | 583 self.tagscache['tip'] = self.changelog.tip() |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
608
diff
changeset
|
584 |
| 343 | 585 return self.tagscache |
| 586 | |
| 587 def tagslist(self): | |
| 588 '''return a list of tags ordered by revision''' | |
| 589 l = [] | |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
471
diff
changeset
|
590 for t, n in self.tags().items(): |
| 343 | 591 try: |
| 592 r = self.changelog.rev(n) | |
| 593 except: | |
| 594 r = -2 # sort to the beginning of the list if unknown | |
| 595 l.append((r,t,n)) | |
| 596 l.sort() | |
| 597 return [(t,n) for r,t,n in l] | |
| 598 | |
| 599 def nodetags(self, node): | |
| 600 '''return the tags associated with a node''' | |
| 601 if not self.nodetagscache: | |
| 602 self.nodetagscache = {} | |
| 603 for t,n in self.tags().items(): | |
| 604 self.nodetagscache.setdefault(n,[]).append(t) | |
| 605 return self.nodetagscache.get(node, []) | |
| 606 | |
| 607 def lookup(self, key): | |
| 67 | 608 try: |
| 343 | 609 return self.tags()[key] |
| 67 | 610 except KeyError: |
| 611 return self.changelog.lookup(key) | |
| 612 | |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
613 def dev(self): |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
614 if self.remote: return -1 |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
615 return os.stat(self.path).st_dev |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
616 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
617 def join(self, f): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
618 return os.path.join(self.path, f) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
619 |
| 244 | 620 def wjoin(self, f): |
| 621 return os.path.join(self.root, f) | |
| 622 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
623 def file(self, f): |
| 192 | 624 if f[0] == '/': f = f[1:] |
|
144
ea9188538222
Fix transaction handling bug by reverting fileopener change
mpm@selenic.com
parents:
140
diff
changeset
|
625 return filelog(self.opener, f) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
626 |
| 627 | 627 def getcwd(self): |
| 628 cwd = os.getcwd() | |
| 629 if cwd == self.root: return '' | |
| 630 return cwd[len(self.root) + 1:] | |
| 631 | |
|
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
632 def wfile(self, f, mode='r'): |
|
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
633 return self.wopener(f, mode) |
|
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
634 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
635 def transaction(self): |
| 251 | 636 # save dirstate for undo |
| 263 | 637 try: |
| 638 ds = self.opener("dirstate").read() | |
| 639 except IOError: | |
| 640 ds = "" | |
| 251 | 641 self.opener("undo.dirstate", "w").write(ds) |
| 515 | 642 |
| 582 | 643 return transaction.transaction(self.ui.warn, |
| 644 self.opener, self.join("journal"), | |
| 262 | 645 self.join("undo")) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
646 |
| 210 | 647 def recover(self): |
| 225 | 648 lock = self.lock() |
| 557 | 649 if os.path.exists(self.join("journal")): |
| 501 | 650 self.ui.status("rolling back interrupted transaction\n") |
| 557 | 651 return transaction.rollback(self.opener, self.join("journal")) |
| 210 | 652 else: |
| 653 self.ui.warn("no interrupted transaction available\n") | |
| 654 | |
| 655 def undo(self): | |
| 225 | 656 lock = self.lock() |
| 210 | 657 if os.path.exists(self.join("undo")): |
| 501 | 658 self.ui.status("rolling back last transaction\n") |
| 262 | 659 transaction.rollback(self.opener, self.join("undo")) |
| 251 | 660 self.dirstate = None |
| 421 | 661 util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
| 251 | 662 self.dirstate = dirstate(self.opener, self.ui, self.root) |
| 163 | 663 else: |
| 210 | 664 self.ui.warn("no undo information available\n") |
| 162 | 665 |
| 161 | 666 def lock(self, wait = 1): |
| 667 try: | |
| 668 return lock.lock(self.join("lock"), 0) | |
| 669 except lock.LockHeld, inst: | |
| 670 if wait: | |
| 671 self.ui.warn("waiting for lock held by %s\n" % inst.args[0]) | |
| 672 return lock.lock(self.join("lock"), wait) | |
| 673 raise inst | |
| 674 | |
| 203 | 675 def rawcommit(self, files, text, user, date, p1=None, p2=None): |
| 442 | 676 orig_parent = self.dirstate.parents()[0] or nullid |
|
452
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
442
diff
changeset
|
677 p1 = p1 or self.dirstate.parents()[0] or nullid |
|
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
442
diff
changeset
|
678 p2 = p2 or self.dirstate.parents()[1] or nullid |
| 302 | 679 c1 = self.changelog.read(p1) |
| 680 c2 = self.changelog.read(p2) | |
| 681 m1 = self.manifest.read(c1[0]) | |
| 682 mf1 = self.manifest.readflags(c1[0]) | |
| 683 m2 = self.manifest.read(c2[0]) | |
| 684 | |
| 442 | 685 if orig_parent == p1: |
| 686 update_dirstate = 1 | |
| 687 else: | |
| 688 update_dirstate = 0 | |
| 689 | |
| 203 | 690 tr = self.transaction() |
| 302 | 691 mm = m1.copy() |
| 692 mfm = mf1.copy() | |
| 203 | 693 linkrev = self.changelog.count() |
| 694 for f in files: | |
| 695 try: | |
| 302 | 696 t = self.wfile(f).read() |
| 441 | 697 tm = util.is_exec(self.wjoin(f), mfm.get(f, False)) |
| 302 | 698 r = self.file(f) |
| 699 mfm[f] = tm | |
| 360 | 700 mm[f] = r.add(t, {}, tr, linkrev, |
| 302 | 701 m1.get(f, nullid), m2.get(f, nullid)) |
| 442 | 702 if update_dirstate: |
| 703 self.dirstate.update([f], "n") | |
| 203 | 704 except IOError: |
|
314
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
705 try: |
|
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
706 del mm[f] |
|
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
707 del mfm[f] |
| 442 | 708 if update_dirstate: |
| 709 self.dirstate.forget([f]) | |
|
314
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
710 except: |
|
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
711 # deleted from p2? |
|
3402cb9a4c06
More tweaking to rawcommit for repo conversion
mpm@selenic.com
parents:
313
diff
changeset
|
712 pass |
| 203 | 713 |
| 302 | 714 mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0]) |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
588
diff
changeset
|
715 user = user or self.ui.username() |
| 302 | 716 n = self.changelog.add(mnode, files, text, tr, p1, p2, user, date) |
| 203 | 717 tr.close() |
| 442 | 718 if update_dirstate: |
| 719 self.dirstate.setparents(n, nullid) | |
| 203 | 720 |
| 317 | 721 def commit(self, files = None, text = "", user = None, date = None): |
| 220 | 722 commit = [] |
| 723 remove = [] | |
| 724 if files: | |
| 725 for f in files: | |
| 726 s = self.dirstate.state(f) | |
| 244 | 727 if s in 'nmai': |
| 220 | 728 commit.append(f) |
| 729 elif s == 'r': | |
| 730 remove.append(f) | |
| 731 else: | |
| 244 | 732 self.ui.warn("%s not tracked!\n" % f) |
| 220 | 733 else: |
| 536 | 734 (c, a, d, u) = self.changes(None, None) |
| 220 | 735 commit = c + a |
| 736 remove = d | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
737 |
| 220 | 738 if not commit and not remove: |
| 151 | 739 self.ui.status("nothing changed\n") |
| 740 return | |
| 741 | |
| 487 | 742 if not self.hook("precommit"): |
| 743 return 1 | |
| 744 | |
| 229 | 745 p1, p2 = self.dirstate.parents() |
| 746 c1 = self.changelog.read(p1) | |
| 747 c2 = self.changelog.read(p2) | |
| 748 m1 = self.manifest.read(c1[0]) | |
| 276 | 749 mf1 = self.manifest.readflags(c1[0]) |
| 229 | 750 m2 = self.manifest.read(c2[0]) |
| 225 | 751 lock = self.lock() |
| 151 | 752 tr = self.transaction() |
| 753 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
754 # check in files |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
755 new = {} |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
756 linkrev = self.changelog.count() |
| 220 | 757 commit.sort() |
| 758 for f in commit: | |
| 83 | 759 self.ui.note(f + "\n") |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
760 try: |
| 441 | 761 mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False)) |
| 418 | 762 t = self.wfile(f).read() |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
763 except IOError: |
| 220 | 764 self.warn("trouble committing %s!\n" % f) |
| 765 raise | |
| 766 | |
| 363 | 767 meta = {} |
| 768 cp = self.dirstate.copied(f) | |
| 769 if cp: | |
| 770 meta["copy"] = cp | |
| 771 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid))) | |
| 575 | 772 self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"])) |
| 363 | 773 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
774 r = self.file(f) |
| 229 | 775 fp1 = m1.get(f, nullid) |
| 776 fp2 = m2.get(f, nullid) | |
| 363 | 777 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
|
778 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
779 # update manifest |
| 229 | 780 m1.update(new) |
|
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
781 for f in remove: |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
782 if f in m1: |
|
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
415
diff
changeset
|
783 del m1[f] |
| 644 | 784 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0], (new,remove)) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
785 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
786 # add changeset |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
787 new = new.keys() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
788 new.sort() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
789 |
| 288 | 790 if not text: |
| 791 edittext = "\n" + "HG: manifest hash %s\n" % hex(mn) | |
| 792 edittext += "".join(["HG: changed %s\n" % f for f in new]) | |
| 793 edittext += "".join(["HG: removed %s\n" % f for f in remove]) | |
| 794 edittext = self.ui.edit(edittext) | |
| 795 if not edittext.rstrip(): | |
| 796 return 1 | |
| 797 text = edittext | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
798 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
588
diff
changeset
|
799 user = user or self.ui.username() |
| 317 | 800 n = self.changelog.add(mn, new, text, tr, p1, p2, user, date) |
| 487 | 801 |
| 802 if not self.hook("commit", node=hex(n)): | |
| 803 return 1 | |
| 804 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
805 tr.close() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
806 |
| 229 | 807 self.dirstate.setparents(n) |
| 220 | 808 self.dirstate.update(new, "n") |
| 809 self.dirstate.forget(remove) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
810 |
| 537 | 811 def changes(self, node1, node2, files=None): |
| 566 | 812 mf2, u = None, [] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
813 |
| 536 | 814 def fcmp(fn, mf): |
|
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
815 t1 = self.wfile(fn).read() |
| 29 | 816 t2 = self.file(fn).revision(mf[fn]) |
| 817 return cmp(t1, t2) | |
| 818 | |
| 536 | 819 # are we comparing the working directory? |
| 561 | 820 if not node2: |
| 536 | 821 l, c, a, d, u = self.dirstate.changes(files, self.ignore) |
| 822 | |
| 823 # are we comparing working dir against its parent? | |
| 561 | 824 if not node1: |
| 536 | 825 if l: |
| 826 # do a full compare of any files that might have changed | |
| 827 change = self.changelog.read(self.dirstate.parents()[0]) | |
| 561 | 828 mf2 = self.manifest.read(change[0]) |
| 548 | 829 for f in l: |
| 561 | 830 if fcmp(f, mf2): |
| 536 | 831 c.append(f) |
| 561 | 832 |
| 833 for l in c, a, d, u: | |
| 834 l.sort() | |
| 835 | |
| 536 | 836 return (c, a, d, u) |
| 515 | 837 |
| 536 | 838 # are we comparing working dir against non-tip? |
| 839 # generate a pseudo-manifest for the working dir | |
| 561 | 840 if not node2: |
| 841 if not mf2: | |
| 536 | 842 change = self.changelog.read(self.dirstate.parents()[0]) |
| 561 | 843 mf2 = self.manifest.read(change[0]).copy() |
| 536 | 844 for f in a + c + l: |
| 561 | 845 mf2[f] = "" |
| 536 | 846 for f in d: |
| 561 | 847 if f in mf2: del mf2[f] |
| 536 | 848 else: |
| 561 | 849 change = self.changelog.read(node2) |
| 850 mf2 = self.manifest.read(change[0]) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
851 |
| 566 | 852 # flush lists from dirstate before comparing manifests |
| 853 c, a = [], [] | |
| 854 | |
| 561 | 855 change = self.changelog.read(node1) |
| 856 mf1 = self.manifest.read(change[0]).copy() | |
| 32 | 857 |
| 858 for fn in mf2: | |
| 859 if mf1.has_key(fn): | |
| 860 if mf1[fn] != mf2[fn]: | |
| 561 | 861 if mf2[fn] != "" or fcmp(fn, mf1): |
| 536 | 862 c.append(fn) |
| 32 | 863 del mf1[fn] |
| 864 else: | |
| 536 | 865 a.append(fn) |
| 515 | 866 |
| 536 | 867 d = mf1.keys() |
| 561 | 868 |
| 869 for l in c, a, d, u: | |
| 870 l.sort() | |
| 515 | 871 |
| 536 | 872 return (c, a, d, u) |
| 32 | 873 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
874 def add(self, list): |
| 220 | 875 for f in list: |
| 244 | 876 p = self.wjoin(f) |
|
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
877 if not os.path.exists(p): |
|
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
878 self.ui.warn("%s does not exist!\n" % f) |
|
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
879 elif not os.path.isfile(p): |
|
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
880 self.ui.warn("%s not added: mercurial only supports files currently\n" % f) |
| 220 | 881 elif self.dirstate.state(f) == 'n': |
| 882 self.ui.warn("%s already tracked!\n" % f) | |
| 883 else: | |
| 884 self.dirstate.update([f], "a") | |
| 885 | |
| 886 def forget(self, list): | |
| 887 for f in list: | |
| 888 if self.dirstate.state(f) not in 'ai': | |
| 889 self.ui.warn("%s not added!\n" % f) | |
| 890 else: | |
| 891 self.dirstate.forget([f]) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
892 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
893 def remove(self, list): |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
894 for f in list: |
| 244 | 895 p = self.wjoin(f) |
|
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
896 if os.path.exists(p): |
| 220 | 897 self.ui.warn("%s still exists!\n" % f) |
| 402 | 898 elif self.dirstate.state(f) == 'a': |
| 899 self.ui.warn("%s never committed!\n" % f) | |
|
657
22bc6fb9aefc
dirstate.forget() takes a list
Matt Mackall <mpm@selenic.com>
parents:
656
diff
changeset
|
900 self.dirstate.forget([f]) |
| 220 | 901 elif f not in self.dirstate: |
| 902 self.ui.warn("%s not tracked!\n" % f) | |
| 903 else: | |
| 904 self.dirstate.update([f], "r") | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
905 |
| 363 | 906 def copy(self, source, dest): |
| 907 p = self.wjoin(dest) | |
|
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
908 if not os.path.exists(dest): |
| 363 | 909 self.ui.warn("%s does not exist!\n" % dest) |
|
611
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
910 elif not os.path.isfile(dest): |
|
48c3eb2bf844
* clean up error handling when user requests to use a non file object
shaleh@speakeasy.net
parents:
609
diff
changeset
|
911 self.ui.warn("copy failed: %s is not a file\n" % dest) |
| 363 | 912 else: |
| 913 if self.dirstate.state(dest) == '?': | |
| 914 self.dirstate.update([dest], "a") | |
| 915 self.dirstate.copy(source, dest) | |
| 916 | |
| 222 | 917 def heads(self): |
| 918 return self.changelog.heads() | |
| 919 | |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
920 def branches(self, nodes): |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
921 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
|
922 b = [] |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
923 for n in nodes: |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
924 t = n |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
925 while n: |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
926 p = self.changelog.parents(n) |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
927 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
|
928 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
|
929 break |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
930 n = p[0] |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
931 return b |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
932 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
933 def between(self, pairs): |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
934 r = [] |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
935 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
936 for top, bottom in pairs: |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
937 n, l, i = top, [], 0 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
938 f = 1 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
939 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
940 while n != bottom: |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
941 p = self.changelog.parents(n)[0] |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
942 if i == f: |
| 575 | 943 l.append(n) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
944 f = f * 2 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
945 n = p |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
946 i += 1 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
947 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
948 r.append(l) |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
949 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
950 return r |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
951 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
952 def newer(self, nodes): |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
953 m = {} |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
954 nl = [] |
| 94 | 955 pm = {} |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
956 cl = self.changelog |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
957 t = l = cl.count() |
| 94 | 958 |
| 959 # find the lowest numbered node | |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
960 for n in nodes: |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
961 l = min(l, cl.rev(n)) |
| 94 | 962 m[n] = 1 |
| 46 | 963 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
964 for i in xrange(l, t): |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
965 n = cl.node(i) |
| 94 | 966 if n in m: # explicitly listed |
| 967 pm[n] = 1 | |
| 968 nl.append(n) | |
| 969 continue | |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
970 for p in cl.parents(n): |
| 94 | 971 if p in pm: # parent listed |
| 972 pm[n] = 1 | |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
973 nl.append(n) |
| 94 | 974 break |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
975 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
976 return nl |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
977 |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
978 def findincoming(self, remote, base={}): |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
979 m = self.changelog.nodemap |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
980 search = [] |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
981 fetch = [] |
|
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
982 seen = {} |
|
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
983 seenbranch = {} |
| 192 | 984 |
|
636
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
985 # assume we're closer to the tip than the root |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
986 # and start by examining the heads |
| 222 | 987 self.ui.status("searching for changes\n") |
| 988 heads = remote.heads() | |
| 989 unknown = [] | |
| 990 for h in heads: | |
| 991 if h not in m: | |
| 992 unknown.append(h) | |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
993 else: |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
994 base[h] = 1 |
| 46 | 995 |
| 222 | 996 if not unknown: |
| 60 | 997 return None |
| 324 | 998 |
| 999 rep = {} | |
| 1000 reqcnt = 0 | |
| 515 | 1001 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1002 # search through remote branches |
|
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1003 # a 'branch' here is a linear segment of history, with four parts: |
|
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1004 # head, root, first parent, second parent |
|
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1005 # (a branch always has two parents (or none) by definition) |
| 222 | 1006 unknown = remote.branches(unknown) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1007 while unknown: |
| 324 | 1008 r = [] |
| 1009 while unknown: | |
| 1010 n = unknown.pop(0) | |
| 1011 if n[0] in seen: | |
| 1012 continue | |
|
148
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
1013 |
| 324 | 1014 self.ui.debug("examining %s:%s\n" % (short(n[0]), short(n[1]))) |
| 1015 if n[0] == nullid: | |
| 1016 break | |
| 328 | 1017 if n in seenbranch: |
| 324 | 1018 self.ui.debug("branch already found\n") |
| 1019 continue | |
| 1020 if n[1] and n[1] in m: # do we know the base? | |
| 1021 self.ui.debug("found incomplete branch %s:%s\n" | |
| 1022 % (short(n[0]), short(n[1]))) | |
| 1023 search.append(n) # schedule branch range for scanning | |
| 328 | 1024 seenbranch[n] = 1 |
| 324 | 1025 else: |
| 1026 if n[1] not in seen and n[1] not in fetch: | |
| 1027 if n[2] in m and n[3] in m: | |
| 1028 self.ui.debug("found new changeset %s\n" % | |
| 1029 short(n[1])) | |
| 1030 fetch.append(n[1]) # earliest unknown | |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1031 base[n[2]] = 1 # latest known |
| 324 | 1032 continue |
| 1033 | |
| 1034 for a in n[2:4]: | |
| 1035 if a not in rep: | |
| 1036 r.append(a) | |
| 1037 rep[a] = 1 | |
| 1038 | |
| 328 | 1039 seen[n[0]] = 1 |
| 1040 | |
| 324 | 1041 if r: |
| 1042 reqcnt += 1 | |
| 1043 self.ui.debug("request %d: %s\n" % | |
| 1044 (reqcnt, " ".join(map(short, r)))) | |
| 1045 for p in range(0, len(r), 10): | |
| 1046 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
|
1047 self.ui.debug("received %s:%s\n" % |
|
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
1048 (short(b[0]), short(b[1]))) |
|
c32286d0a665
Improve pruning of branches in outstanding changeset algorithm
mpm@selenic.com
parents:
146
diff
changeset
|
1049 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
|
1050 unknown.append(b) |
| 515 | 1051 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1052 # do binary search on the branches we found |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1053 while search: |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1054 n = search.pop(0) |
| 324 | 1055 reqcnt += 1 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1056 l = remote.between([(n[0], n[1])])[0] |
| 328 | 1057 l.append(n[1]) |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1058 p = n[0] |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1059 f = 1 |
| 328 | 1060 for i in l: |
| 1061 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
|
1062 if i in m: |
| 85 | 1063 if f <= 2: |
| 83 | 1064 self.ui.debug("found new branch changeset %s\n" % |
| 1065 short(p)) | |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1066 fetch.append(p) |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1067 base[i] = 1 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1068 else: |
| 83 | 1069 self.ui.debug("narrowed branch search to %s:%s\n" |
| 1070 % (short(p), short(i))) | |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1071 search.append((p, i)) |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1072 break |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1073 p, f = i, f * 2 |
|
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1074 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1075 # sanity check our fetch list |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1076 for f in fetch: |
|
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
1077 if f in m: |
| 499 | 1078 raise RepoError("already have changeset " + short(f[:4])) |
| 83 | 1079 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
578
diff
changeset
|
1080 if base.keys() == [nullid]: |
|
514
874e577e332e
change unrelated repository error to a warning
mpm@selenic.com
parents:
511
diff
changeset
|
1081 self.ui.warn("warning: pulling from an unrelated repository!\n") |
| 511 | 1082 |
| 94 | 1083 self.ui.note("adding new changesets starting at " + |
| 83 | 1084 " ".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
|
1085 |
| 324 | 1086 self.ui.debug("%d total queries\n" % reqcnt) |
| 1087 | |
| 516 | 1088 return fetch |
| 1089 | |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1090 def findoutgoing(self, remote): |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1091 base = {} |
|
637
31e090c34d3b
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents:
636
diff
changeset
|
1092 self.findincoming(remote, base) |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1093 remain = dict.fromkeys(self.changelog.nodemap) |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1094 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1095 # prune everything remote has from the tree |
|
637
31e090c34d3b
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents:
636
diff
changeset
|
1096 del remain[nullid] |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1097 remove = base.keys() |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1098 while remove: |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1099 n = remove.pop(0) |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1100 if n in remain: |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1101 del remain[n] |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1102 for p in self.changelog.parents(n): |
|
637
31e090c34d3b
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com>
parents:
636
diff
changeset
|
1103 remove.append(p) |
|
621
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1104 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1105 # find every node whose parents have been pruned |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1106 subset = [] |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1107 for n in remain: |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1108 p1, p2 = self.changelog.parents(n) |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1109 if p1 not in remain and p2 not in remain: |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1110 subset.append(n) |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1111 |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1112 # this is the set of all roots we have to push |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1113 return subset |
|
004e811f7706
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com>
parents:
616
diff
changeset
|
1114 |
|
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1115 def pull(self, remote): |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1116 lock = self.lock() |
|
636
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1117 |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1118 # if we have an empty repo, fetch everything |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1119 if self.changelog.tip() == nullid: |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1120 self.ui.status("requesting all changes\n") |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1121 fetch = [nullid] |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1122 else: |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1123 fetch = self.findincoming(remote) |
|
ac0ec421e3a5
Move the empty changeset detection out of findincoming to pull
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1124 |
|
622
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1125 if not fetch: |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1126 self.ui.status("no changes found\n") |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1127 return 1 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1128 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1129 cg = remote.changegroup(fetch) |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1130 return self.addchangegroup(cg) |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1131 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1132 def push(self, remote): |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1133 lock = remote.lock() |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1134 update = self.findoutgoing(remote) |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1135 if not update: |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1136 self.ui.status("no changes found\n") |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1137 return 1 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1138 |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1139 cg = self.changegroup(update) |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1140 return remote.addchangegroup(cg) |
|
e9fe5d5e67f7
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com>
parents:
621
diff
changeset
|
1141 |
|
56
ad2ea1185f04
Add getchangegroup code to efficiently calculate and request a changegroup
mpm@selenic.com
parents:
55
diff
changeset
|
1142 def changegroup(self, basenodes): |
| 222 | 1143 class genread: |
| 1144 def __init__(self, generator): | |
| 1145 self.g = generator | |
| 1146 self.buf = "" | |
| 1147 def read(self, l): | |
| 1148 while l > len(self.buf): | |
| 1149 try: | |
| 1150 self.buf += self.g.next() | |
| 1151 except StopIteration: | |
| 1152 break | |
| 1153 d, self.buf = self.buf[:l], self.buf[l:] | |
| 1154 return d | |
| 515 | 1155 |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1156 def gengroup(): |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1157 nodes = self.newer(basenodes) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1158 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1159 # construct the link map |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1160 linkmap = {} |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1161 for n in nodes: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1162 linkmap[self.changelog.rev(n)] = n |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1163 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1164 # construct a list of all changed files |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1165 changed = {} |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1166 for n in nodes: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1167 c = self.changelog.read(n) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1168 for f in c[3]: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1169 changed[f] = 1 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1170 changed = changed.keys() |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1171 changed.sort() |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1172 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1173 # the changegroup is changesets + manifests + all file revs |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1174 revs = [ self.changelog.rev(n) for n in nodes ] |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1175 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1176 for y in self.changelog.group(linkmap): yield y |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1177 for y in self.manifest.group(linkmap): yield y |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1178 for f in changed: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1179 yield struct.pack(">l", len(f) + 4) + f |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1180 g = self.file(f).group(linkmap) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1181 for y in g: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1182 yield y |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1183 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1184 yield struct.pack(">l", 0) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1185 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1186 return genread(gengroup()) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1187 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1188 def addchangegroup(self, source): |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1189 |
| 222 | 1190 def getchunk(): |
| 1191 d = source.read(4) | |
| 1192 if not d: return "" | |
| 1193 l = struct.unpack(">l", d)[0] | |
| 1194 if l <= 4: return "" | |
| 1195 return source.read(l - 4) | |
| 1196 | |
| 1197 def getgroup(): | |
| 1198 while 1: | |
| 1199 c = getchunk() | |
| 1200 if not c: break | |
| 1201 yield c | |
| 1202 | |
| 1203 def csmap(x): | |
| 1204 self.ui.debug("add changeset %s\n" % short(x)) | |
| 1205 return self.changelog.count() | |
| 1206 | |
| 1207 def revmap(x): | |
| 1208 return self.changelog.rev(x) | |
| 1209 | |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1210 if not source: return |
| 222 | 1211 changesets = files = revisions = 0 |
| 225 | 1212 |
| 222 | 1213 tr = self.transaction() |
| 1214 | |
| 1215 # pull off the changeset group | |
| 1216 self.ui.status("adding changesets\n") | |
| 1217 co = self.changelog.tip() | |
|
224
ccbcc4d76f81
fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents:
223
diff
changeset
|
1218 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique |
| 222 | 1219 changesets = self.changelog.rev(cn) - self.changelog.rev(co) |
| 1220 | |
| 1221 # pull off the manifest group | |
| 1222 self.ui.status("adding manifests\n") | |
| 1223 mm = self.manifest.tip() | |
| 1224 mo = self.manifest.addgroup(getgroup(), revmap, tr) | |
| 1225 | |
| 1226 # process the files | |
| 1227 self.ui.status("adding file revisions\n") | |
| 1228 while 1: | |
| 1229 f = getchunk() | |
| 1230 if not f: break | |
| 1231 self.ui.debug("adding %s revisions\n" % f) | |
| 1232 fl = self.file(f) | |
|
529
aace5b681fe9
Attempt to fix negative revision count from pull
mpm@selenic.com
parents:
522
diff
changeset
|
1233 o = fl.count() |
| 222 | 1234 n = fl.addgroup(getgroup(), revmap, tr) |
|
529
aace5b681fe9
Attempt to fix negative revision count from pull
mpm@selenic.com
parents:
522
diff
changeset
|
1235 revisions += fl.count() - o |
| 222 | 1236 files += 1 |
| 1237 | |
| 1238 self.ui.status(("modified %d files, added %d changesets" + | |
| 1239 " and %d new revisions\n") | |
| 1240 % (files, changesets, revisions)) | |
| 1241 | |
| 1242 tr.close() | |
| 1243 return | |
| 1244 | |
| 588 | 1245 def update(self, node, allow=False, force=False, choose=None, |
| 1246 moddirstate=True): | |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1247 pl = self.dirstate.parents() |
| 275 | 1248 if not force and pl[1] != nullid: |
| 254 | 1249 self.ui.warn("aborting: outstanding uncommitted merges\n") |
| 46 | 1250 return |
| 1251 | |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1252 p1, p2 = pl[0], node |
| 305 | 1253 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
|
1254 m1n = self.changelog.read(p1)[0] |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1255 m2n = self.changelog.read(p2)[0] |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1256 man = self.manifest.ancestor(m1n, m2n) |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1257 m1 = self.manifest.read(m1n) |
| 276 | 1258 mf1 = self.manifest.readflags(m1n) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1259 m2 = self.manifest.read(m2n) |
| 276 | 1260 mf2 = self.manifest.readflags(m2n) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1261 ma = self.manifest.read(man) |
| 412 | 1262 mfa = self.manifest.readflags(man) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1263 |
| 536 | 1264 (c, a, d, u) = self.changes(None, None) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1265 |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1266 # 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
|
1267 # from p1 to p2? |
|
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1268 linear_path = (pa == p1 or pa == p2) |
|
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1269 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1270 # 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
|
1271 # we care about merging |
| 254 | 1272 self.ui.note("resolving manifests\n") |
|
650
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1273 self.ui.debug(" force %s allow %s moddirstate %s linear %s\n" % |
|
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1274 (force, allow, moddirstate, linear_path)) |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1275 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
|
1276 (short(man), short(m1n), short(m2n))) |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1277 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1278 merge = {} |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1279 get = {} |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1280 remove = [] |
| 305 | 1281 mark = {} |
| 46 | 1282 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1283 # construct a working dir manifest |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1284 mw = m1.copy() |
| 276 | 1285 mfw = mf1.copy() |
| 576 | 1286 umap = dict.fromkeys(u) |
| 1287 | |
| 254 | 1288 for f in a + c + u: |
| 1289 mw[f] = "" | |
| 441 | 1290 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) |
| 576 | 1291 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1292 for f in d: |
| 254 | 1293 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
|
1294 |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1295 # 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
|
1296 # 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
|
1297 # 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
|
1298 # 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
|
1299 # longer in the manifest. |
| 588 | 1300 if moddirstate and linear_path and f not in m2: |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1301 self.dirstate.forget((f,)) |
|
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1302 |
| 576 | 1303 # Compare manifests |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1304 for f, n in mw.iteritems(): |
| 588 | 1305 if choose and not choose(f): continue |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1306 if f in m2: |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1307 s = 0 |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1308 |
|
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1309 # is the wfile new since m1, and match m2? |
| 428 | 1310 if f not in m1: |
|
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1311 t1 = self.wfile(f).read() |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1312 t2 = self.file(f).revision(m2[f]) |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1313 if cmp(t1, t2) == 0: |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1314 mark[f] = 1 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1315 n = m2[f] |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1316 del t1, t2 |
|
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
405
diff
changeset
|
1317 |
|
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
1318 # are files different? |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1319 if n != m2[f]: |
| 254 | 1320 a = ma.get(f, nullid) |
|
296
a3d83bf86755
hg update: fix clobbering files when going backwards
mpm@selenic.com
parents:
292
diff
changeset
|
1321 # are both different from the ancestor? |
| 254 | 1322 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
|
1323 self.ui.debug(" %s versions differ, resolve\n" % f) |
| 276 | 1324 # merge executable bits |
| 1325 # "if we changed or they changed, change in merge" | |
| 1326 a, b, c = mfa.get(f, 0), mfw[f], mf2[f] | |
| 1327 mode = ((a^b) | (a^c)) ^ a | |
| 1328 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
|
1329 s = 1 |
| 305 | 1330 # are we clobbering? |
| 1331 # is remote's version newer? | |
| 1332 # or are we going back in time? | |
| 1333 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
|
1334 self.ui.debug(" remote %s is newer, get\n" % f) |
| 254 | 1335 get[f] = m2[f] |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1336 s = 1 |
| 305 | 1337 else: |
| 1338 mark[f] = 1 | |
| 576 | 1339 elif f in umap: |
| 1340 # this unknown file is the same as the checkout | |
| 1341 get[f] = m2[f] | |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1342 |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1343 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
|
1344 if force: |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1345 self.ui.debug(" updating permissions for %s\n" % f) |
| 441 | 1346 util.set_exec(self.wjoin(f), mf2[f]) |
|
277
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1347 else: |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1348 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
|
1349 mode = ((a^b) | (a^c)) ^ a |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1350 if mode != b: |
|
79279550c8ff
merge: update permissions even if file contents didn't change
mpm@selenic.com
parents:
276
diff
changeset
|
1351 self.ui.debug(" updating permissions for %s\n" % f) |
| 441 | 1352 util.set_exec(self.wjoin(f), mode) |
| 305 | 1353 mark[f] = 1 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1354 del m2[f] |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1355 elif f in ma: |
| 616 | 1356 if n != ma[f]: |
| 1357 r = "d" | |
| 1358 if not force and (linear_path or allow): | |
|
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
|
1359 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
|
1360 (" 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
|
1361 "(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
|
1362 if r == "d": |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1363 remove.append(f) |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1364 else: |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1365 self.ui.debug("other deleted %s\n" % f) |
| 254 | 1366 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
|
1367 else: |
| 254 | 1368 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
|
1369 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
|
1370 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
|
1371 remove.append(f) |
|
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
377
diff
changeset
|
1372 else: |
|
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
377
diff
changeset
|
1373 self.ui.debug("local created %s, keeping\n" % f) |
| 254 | 1374 else: |
| 1375 self.ui.debug("working dir created %s, keeping\n" % f) | |
| 46 | 1376 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1377 for f, n in m2.iteritems(): |
| 588 | 1378 if choose and not choose(f): continue |
| 256 | 1379 if f[0] == "/": continue |
| 616 | 1380 if f in ma and n != ma[f]: |
| 1381 r = "k" | |
| 1382 if not force and (linear_path or allow): | |
|
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
|
1383 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
|
1384 ("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
|
1385 "(k)eep or (d)elete?", "[kd]", "k") |
| 616 | 1386 if r == "k": get[f] = n |
| 1387 elif f not in ma: | |
| 254 | 1388 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
|
1389 get[f] = n |
| 616 | 1390 else: |
| 1391 self.ui.debug("local deleted %s\n" % f) | |
|
650
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1392 if force: |
|
2c934c7b79dc
Fix bug in reverting deleted files
Matt Mackall <mpm@selenic.com>
parents:
649
diff
changeset
|
1393 get[f] = n |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1394 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1395 del mw, m1, m2, ma |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1396 |
| 275 | 1397 if force: |
| 1398 for f in merge: | |
| 1399 get[f] = merge[f][1] | |
| 1400 merge = {} | |
| 1401 | |
|
408
3695fbd2c33b
[PATCH] Merging files that are deleted in both branches
mpm@selenic.com
parents:
407
diff
changeset
|
1402 if linear_path: |
| 254 | 1403 # we don't need to do any magic, just jump to the new rev |
| 1404 mode = 'n' | |
| 1405 p1, p2 = p2, nullid | |
| 1406 else: | |
| 275 | 1407 if not allow: |
| 305 | 1408 self.ui.status("this update spans a branch" + |
| 1409 " affecting the following files:\n") | |
| 1410 fl = merge.keys() + get.keys() | |
| 1411 fl.sort() | |
| 1412 for f in fl: | |
| 1413 cf = "" | |
| 1414 if f in merge: cf = " (resolve)" | |
| 1415 self.ui.status(" %s%s\n" % (f, cf)) | |
| 1416 self.ui.warn("aborting update spanning branches!\n") | |
| 1417 self.ui.status("(use update -m to perform a branch merge)\n") | |
| 275 | 1418 return 1 |
| 254 | 1419 # we have to remember what files we needed to get/change |
| 1420 # because any file that's different from either one of its | |
| 1421 # parents must be in the changeset | |
| 1422 mode = 'm' | |
| 588 | 1423 if moddirstate: |
| 1424 self.dirstate.update(mark.keys(), "m") | |
| 254 | 1425 |
| 588 | 1426 if moddirstate: |
| 1427 self.dirstate.setparents(p1, p2) | |
|
191
d7e859cf2f1b
merge: add count of new manifests, files, and revisions
mpm@selenic.com
parents:
190
diff
changeset
|
1428 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1429 # 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
|
1430 files = get.keys() |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1431 files.sort() |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1432 for f in files: |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1433 if f[0] == "/": continue |
|
273
4f8174389001
merge: Fix bug where we overwrote local when local was newer
mpm@selenic.com
parents:
263
diff
changeset
|
1434 self.ui.note("getting %s\n" % f) |
| 276 | 1435 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
|
1436 try: |
|
291
2c4f2be05587
Add wopener for opening files in the working directory
mpm@selenic.com
parents:
288
diff
changeset
|
1437 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
|
1438 except IOError: |
|
297
0dbcf3c9ff20
Fixed usage of removed variable 'wp'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
292
diff
changeset
|
1439 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
|
1440 self.wfile(f, "w").write(t) |
| 441 | 1441 util.set_exec(self.wjoin(f), mf2[f]) |
| 588 | 1442 if moddirstate: |
| 1443 self.dirstate.update([f], mode) | |
| 46 | 1444 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1445 # merge the tricky bits |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1446 files = merge.keys() |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1447 files.sort() |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1448 for f in files: |
| 256 | 1449 self.ui.status("merging %s\n" % f) |
| 276 | 1450 m, o, flag = merge[f] |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1451 self.merge3(f, m, o) |
| 441 | 1452 util.set_exec(self.wjoin(f), flag) |
| 588 | 1453 if moddirstate: |
| 1454 self.dirstate.update([f], 'm') | |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1455 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1456 for f in remove: |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1457 self.ui.note("removing %s\n" % f) |
| 254 | 1458 os.unlink(f) |
| 578 | 1459 # try removing directories that might now be empty |
| 1460 try: os.removedirs(os.path.dirname(f)) | |
| 1461 except: pass | |
| 588 | 1462 if moddirstate: |
| 1463 if mode == 'n': | |
| 1464 self.dirstate.forget(remove) | |
| 1465 else: | |
| 1466 self.dirstate.update(remove, 'r') | |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1467 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1468 def merge3(self, fn, my, other): |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1469 """perform a 3-way merge in the working directory""" |
| 249 | 1470 |
| 96 | 1471 def temp(prefix, node): |
| 1472 pre = "%s~%s." % (os.path.basename(fn), prefix) | |
| 1473 (fd, name) = tempfile.mkstemp("", pre) | |
| 417 | 1474 f = os.fdopen(fd, "wb") |
| 96 | 1475 f.write(fl.revision(node)) |
| 1476 f.close() | |
| 1477 return name | |
| 1478 | |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1479 fl = self.file(fn) |
| 96 | 1480 base = fl.ancestor(my, other) |
| 244 | 1481 a = self.wjoin(fn) |
| 346 | 1482 b = temp("base", base) |
| 1483 c = temp("other", other) | |
| 96 | 1484 |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1485 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
|
1486 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
|
1487 (fn, short(other), short(base))) |
| 96 | 1488 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
588
diff
changeset
|
1489 cmd = self.ui.config("ui", "merge") or \ |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
588
diff
changeset
|
1490 os.environ.get("HGMERGE", "hgmerge") |
| 240 | 1491 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
|
1492 if r: |
| 275 | 1493 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
|
1494 |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1495 os.unlink(b) |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
231
diff
changeset
|
1496 os.unlink(c) |
| 96 | 1497 |
| 247 | 1498 def verify(self): |
| 1499 filelinkrevs = {} | |
| 1500 filenodes = {} | |
| 1501 changesets = revisions = files = 0 | |
| 1502 errors = 0 | |
| 1503 | |
| 302 | 1504 seen = {} |
| 247 | 1505 self.ui.status("checking changesets\n") |
| 1506 for i in range(self.changelog.count()): | |
| 1507 changesets += 1 | |
| 1508 n = self.changelog.node(i) | |
| 302 | 1509 if n in seen: |
| 1510 self.ui.warn("duplicate changeset at revision %d\n" % i) | |
| 1511 errors += 1 | |
| 1512 seen[n] = 1 | |
| 515 | 1513 |
| 247 | 1514 for p in self.changelog.parents(n): |
| 1515 if p not in self.changelog.nodemap: | |
| 1516 self.ui.warn("changeset %s has unknown parent %s\n" % | |
| 1517 (short(n), short(p))) | |
| 1518 errors += 1 | |
| 1519 try: | |
| 1520 changes = self.changelog.read(n) | |
| 1521 except Exception, inst: | |
| 1522 self.ui.warn("unpacking changeset %s: %s\n" % (short(n), inst)) | |
| 1523 errors += 1 | |
| 1524 | |
| 1525 for f in changes[3]: | |
| 1526 filelinkrevs.setdefault(f, []).append(i) | |
| 1527 | |
| 302 | 1528 seen = {} |
| 247 | 1529 self.ui.status("checking manifests\n") |
| 1530 for i in range(self.manifest.count()): | |
| 1531 n = self.manifest.node(i) | |
| 302 | 1532 if n in seen: |
| 1533 self.ui.warn("duplicate manifest at revision %d\n" % i) | |
| 1534 errors += 1 | |
| 1535 seen[n] = 1 | |
| 515 | 1536 |
| 247 | 1537 for p in self.manifest.parents(n): |
| 1538 if p not in self.manifest.nodemap: | |
| 1539 self.ui.warn("manifest %s has unknown parent %s\n" % | |
| 1540 (short(n), short(p))) | |
| 1541 errors += 1 | |
| 1542 | |
| 1543 try: | |
| 1544 delta = mdiff.patchtext(self.manifest.delta(n)) | |
| 1545 except KeyboardInterrupt: | |
| 582 | 1546 self.ui.warn("aborted") |
| 247 | 1547 sys.exit(0) |
| 1548 except Exception, inst: | |
| 1549 self.ui.warn("unpacking manifest %s: %s\n" | |
| 1550 % (short(n), inst)) | |
| 1551 errors += 1 | |
| 1552 | |
| 1553 ff = [ l.split('\0') for l in delta.splitlines() ] | |
| 1554 for f, fn in ff: | |
| 284 | 1555 filenodes.setdefault(f, {})[bin(fn[:40])] = 1 |
| 247 | 1556 |
| 1557 self.ui.status("crosschecking files in changesets and manifests\n") | |
| 1558 for f in filenodes: | |
| 1559 if f not in filelinkrevs: | |
| 1560 self.ui.warn("file %s in manifest but not in changesets\n" % f) | |
| 1561 errors += 1 | |
| 1562 | |
| 1563 for f in filelinkrevs: | |
| 1564 if f not in filenodes: | |
| 1565 self.ui.warn("file %s in changeset but not in manifest\n" % f) | |
| 1566 errors += 1 | |
| 1567 | |
| 1568 self.ui.status("checking files\n") | |
| 1569 ff = filenodes.keys() | |
| 1570 ff.sort() | |
| 1571 for f in ff: | |
| 1572 if f == "/dev/null": continue | |
| 1573 files += 1 | |
| 1574 fl = self.file(f) | |
| 1575 nodes = { nullid: 1 } | |
| 302 | 1576 seen = {} |
| 247 | 1577 for i in range(fl.count()): |
| 1578 revisions += 1 | |
| 1579 n = fl.node(i) | |
| 1580 | |
| 302 | 1581 if n in seen: |
| 1582 self.ui.warn("%s: duplicate revision %d\n" % (f, i)) | |
| 1583 errors += 1 | |
| 1584 | |
| 247 | 1585 if n not in filenodes[f]: |
| 1586 self.ui.warn("%s: %d:%s not in manifests\n" | |
| 1587 % (f, i, short(n))) | |
| 1588 errors += 1 | |
| 1589 else: | |
| 1590 del filenodes[f][n] | |
| 1591 | |
| 1592 flr = fl.linkrev(n) | |
| 1593 if flr not in filelinkrevs[f]: | |
| 1594 self.ui.warn("%s:%s points to unexpected changeset %d\n" | |
| 1595 % (f, short(n), fl.linkrev(n))) | |
| 1596 errors += 1 | |
| 1597 else: | |
| 1598 filelinkrevs[f].remove(flr) | |
| 1599 | |
| 1600 # verify contents | |
| 1601 try: | |
| 1602 t = fl.read(n) | |
| 1603 except Exception, inst: | |
| 1604 self.ui.warn("unpacking file %s %s: %s\n" | |
| 1605 % (f, short(n), inst)) | |
| 1606 errors += 1 | |
| 1607 | |
| 1608 # verify parents | |
| 1609 (p1, p2) = fl.parents(n) | |
| 1610 if p1 not in nodes: | |
| 1611 self.ui.warn("file %s:%s unknown parent 1 %s" % | |
| 1612 (f, short(n), short(p1))) | |
| 1613 errors += 1 | |
| 1614 if p2 not in nodes: | |
| 1615 self.ui.warn("file %s:%s unknown parent 2 %s" % | |
| 1616 (f, short(n), short(p1))) | |
| 1617 errors += 1 | |
| 1618 nodes[n] = 1 | |
| 1619 | |
| 1620 # cross-check | |
| 1621 for node in filenodes[f]: | |
| 1622 self.ui.warn("node %s in manifests not in %s\n" | |
| 1623 % (hex(n), f)) | |
| 1624 errors += 1 | |
| 1625 | |
| 1626 self.ui.status("%d files, %d changesets, %d total revisions\n" % | |
| 1627 (files, changesets, revisions)) | |
| 1628 | |
| 1629 if errors: | |
| 1630 self.ui.warn("%d integrity errors encountered!\n" % errors) | |
| 1631 return 1 | |
| 1632 | |
|
623
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1633 class httprepository: |
| 60 | 1634 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
|
1635 self.url = path |
| 60 | 1636 self.ui = ui |
| 321 | 1637 no_list = [ "localhost", "127.0.0.1" ] |
| 1638 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
|
1639 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
|
1640 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
|
1641 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
|
1642 host = host[7:] |
| 321 | 1643 user = ui.config("http_proxy", "user") |
| 1644 passwd = ui.config("http_proxy", "passwd") | |
| 1645 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
|
1646 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
|
1647 no = os.environ.get("no_proxy") |
| 321 | 1648 if no: |
| 1649 no_list = no_list + no.split(",") | |
| 515 | 1650 |
| 321 | 1651 no_proxy = 0 |
| 1652 for h in no_list: | |
| 1653 if (path.startswith("http://" + h + "/") or | |
| 1654 path.startswith("http://" + h + ":") or | |
| 1655 path == "http://" + h): | |
| 1656 no_proxy = 1 | |
| 1657 | |
| 1658 # Note: urllib2 takes proxy values from the environment and those will | |
| 1659 # 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
|
1660 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
|
1661 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
|
1662 del os.environ[env] |
| 321 | 1663 |
| 1664 proxy_handler = urllib2.BaseHandler() | |
| 1665 if host and not no_proxy: | |
| 1666 proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host}) | |
| 1667 | |
| 1668 authinfo = None | |
| 1669 if user and passwd: | |
| 1670 passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm() | |
| 1671 passmgr.add_password(None, host, user, passwd) | |
| 1672 authinfo = urllib2.ProxyBasicAuthHandler(passmgr) | |
| 1673 | |
| 1674 opener = urllib2.build_opener(proxy_handler, authinfo) | |
| 1675 urllib2.install_opener(opener) | |
| 60 | 1676 |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1677 def dev(self): |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1678 return -1 |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1679 |
| 60 | 1680 def do_cmd(self, cmd, **args): |
| 83 | 1681 self.ui.debug("sending %s command\n" % cmd) |
| 60 | 1682 q = {"cmd": cmd} |
| 1683 q.update(args) | |
| 1684 qs = urllib.urlencode(q) | |
| 1685 cu = "%s?%s" % (self.url, qs) | |
| 321 | 1686 return urllib2.urlopen(cu) |
| 60 | 1687 |
| 222 | 1688 def heads(self): |
| 1689 d = self.do_cmd("heads").read() | |
| 1690 try: | |
| 1691 return map(bin, d[:-1].split(" ")) | |
| 1692 except: | |
| 1693 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") | |
| 1694 raise | |
| 1695 | |
| 60 | 1696 def branches(self, nodes): |
| 1697 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
|
1698 d = self.do_cmd("branches", nodes=n).read() |
| 217 | 1699 try: |
| 1700 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] | |
| 1701 return br | |
| 1702 except: | |
| 1703 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") | |
| 1704 raise | |
| 60 | 1705 |
| 1706 def between(self, pairs): | |
| 1707 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
|
1708 d = self.do_cmd("between", pairs=n).read() |
| 217 | 1709 try: |
| 1710 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] | |
| 1711 return p | |
| 1712 except: | |
| 1713 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") | |
| 1714 raise | |
| 60 | 1715 |
| 1716 def changegroup(self, nodes): | |
| 1717 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
|
1718 f = self.do_cmd("changegroup", roots=n) |
| 192 | 1719 bytes = 0 |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1720 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1721 class zread: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1722 def __init__(self, f): |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1723 self.zd = zlib.decompressobj() |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1724 self.f = f |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1725 self.buf = "" |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1726 def read(self, l): |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1727 while l > len(self.buf): |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1728 r = f.read(4096) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1729 if r: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1730 self.buf += self.zd.decompress(r) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1731 else: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1732 self.buf += self.zd.flush() |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1733 break |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1734 d, self.buf = self.buf[:l], self.buf[l:] |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1735 return d |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1736 |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1737 return zread(f) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1738 |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1739 class remotelock: |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1740 def __init__(self, repo): |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1741 self.repo = repo |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1742 def release(self): |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1743 self.repo.unlock() |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1744 self.repo = None |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1745 def __del__(self): |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1746 if self.repo: |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1747 self.release() |
| 60 | 1748 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1749 class sshrepository: |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1750 def __init__(self, ui, path): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1751 self.url = path |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1752 self.ui = ui |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1753 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1754 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1755 if not m: |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1756 raise RepoError("couldn't parse destination %s\n" % path) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1757 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1758 self.user = m.group(2) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1759 self.host = m.group(3) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1760 self.port = m.group(5) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1761 self.path = m.group(7) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1762 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1763 args = self.user and ("%s@%s" % (self.user, self.host)) or self.host |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1764 args = self.port and ("%s -p %s") % (args, self.port) or args |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1765 path = self.path or "" |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1766 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1767 cmd = "ssh %s 'hg -R %s serve --stdio'" |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1768 cmd = cmd % (args, path) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1769 |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1770 self.pipeo, self.pipei, self.pipee = os.popen3(cmd) |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1771 |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1772 def readerr(self): |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1773 while 1: |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1774 r,w,x = select.select([self.pipee], [], [], 0) |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1775 if not r: break |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1776 l = self.pipee.readline() |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1777 if not l: break |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1778 self.ui.status("remote: ", l) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1779 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1780 def __del__(self): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1781 self.pipeo.close() |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1782 self.pipei.close() |
|
648
8c89408a7154
Attempt to read all remaining remote output at close
Matt Mackall <mpm@selenic.com>
parents:
646
diff
changeset
|
1783 for l in self.pipee: |
|
8c89408a7154
Attempt to read all remaining remote output at close
Matt Mackall <mpm@selenic.com>
parents:
646
diff
changeset
|
1784 self.ui.status("remote: ", l) |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1785 self.pipee.close() |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1786 |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1787 def dev(self): |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1788 return -1 |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
1789 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1790 def do_cmd(self, cmd, **args): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1791 self.ui.debug("sending %s command\n" % cmd) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1792 self.pipeo.write("%s\n" % cmd) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1793 for k, v in args.items(): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1794 self.pipeo.write("%s %d\n" % (k, len(v))) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1795 self.pipeo.write(v) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1796 self.pipeo.flush() |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1797 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1798 return self.pipei |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1799 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1800 def call(self, cmd, **args): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1801 r = self.do_cmd(cmd, **args) |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1802 l = r.readline() |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1803 self.readerr() |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1804 try: |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1805 l = int(l) |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1806 except: |
|
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1807 raise RepoError("unexpected response '%s'" % l) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1808 return r.read(l) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1809 |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1810 def lock(self): |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1811 self.call("lock") |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1812 return remotelock(self) |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1813 |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1814 def unlock(self): |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1815 self.call("unlock") |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
637
diff
changeset
|
1816 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1817 def heads(self): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1818 d = self.call("heads") |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1819 try: |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1820 return map(bin, d[:-1].split(" ")) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1821 except: |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1822 raise RepoError("unexpected response '%s'" % (d[:400] + "...")) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1823 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1824 def branches(self, nodes): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1825 n = " ".join(map(hex, nodes)) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1826 d = self.call("branches", nodes=n) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1827 try: |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1828 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1829 return br |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1830 except: |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1831 raise RepoError("unexpected response '%s'" % (d[:400] + "...")) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1832 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1833 def between(self, pairs): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1834 n = "\n".join(["-".join(map(hex, p)) for p in pairs]) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1835 d = self.call("between", pairs=n) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1836 try: |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1837 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1838 return p |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1839 except: |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1840 raise RepoError("unexpected response '%s'" % (d[:400] + "...")) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1841 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1842 def changegroup(self, nodes): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1843 n = " ".join(map(hex, nodes)) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1844 f = self.do_cmd("changegroup", roots=n) |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1845 return self.pipei |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1846 |
|
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1847 def addchangegroup(self, cg): |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1848 d = self.call("addchangegroup") |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1849 if d: |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1850 raise RepoError("push refused: %s", d) |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1851 |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1852 while 1: |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1853 d = cg.read(4096) |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1854 if not d: break |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1855 self.pipeo.write(d) |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1856 self.readerr() |
|
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1857 |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1858 self.pipeo.flush() |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1859 |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1860 self.readerr() |
|
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1861 l = int(self.pipei.readline()) |
|
646
342927da4f4c
Show remote client output with "remote:"
Matt Mackall <mpm@selenic.com>
parents:
644
diff
changeset
|
1862 return self.pipei.read(l) != "" |
|
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1863 |
| 60 | 1864 def repository(ui, path=None, create=0): |
|
623
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1865 if path: |
|
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1866 if path.startswith("http://"): |
|
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1867 return httprepository(ui, path) |
|
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1868 if path.startswith("hg://"): |
|
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1869 return httprepository(ui, path.replace("hg://", "http://")) |
|
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1870 if path.startswith("old-http://"): |
|
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1871 return localrepository(ui, path.replace("old-http://", "http://")) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1872 if path.startswith("ssh://"): |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
623
diff
changeset
|
1873 return sshrepository(ui, path) |
| 60 | 1874 |
|
623
314867960a4a
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com>
parents:
622
diff
changeset
|
1875 return localrepository(ui, path, create) |