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