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