Show More
@@ -1,2192 +1,2191 b'' | |||||
1 | # localrepo.py - read/write repository class for mercurial |
|
1 | # localrepo.py - read/write repository class for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2, incorporated herein by reference. |
|
6 | # GNU General Public License version 2, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from node import bin, hex, nullid, nullrev, short |
|
8 | from node import bin, hex, nullid, nullrev, short | |
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | import repo, changegroup, subrepo |
|
10 | import repo, changegroup, subrepo | |
11 | import changelog, dirstate, filelog, manifest, context |
|
11 | import changelog, dirstate, filelog, manifest, context | |
12 | import lock, transaction, store, encoding |
|
12 | import lock, transaction, store, encoding | |
13 | import util, extensions, hook, error |
|
13 | import util, extensions, hook, error | |
14 | import match as match_ |
|
14 | import match as match_ | |
15 | import merge as merge_ |
|
15 | import merge as merge_ | |
16 | from lock import release |
|
16 | from lock import release | |
17 | import weakref, stat, errno, os, time, inspect |
|
17 | import weakref, stat, errno, os, time, inspect | |
18 | propertycache = util.propertycache |
|
18 | propertycache = util.propertycache | |
19 |
|
19 | |||
20 | class localrepository(repo.repository): |
|
20 | class localrepository(repo.repository): | |
21 | capabilities = set(('lookup', 'changegroupsubset', 'branchmap')) |
|
21 | capabilities = set(('lookup', 'changegroupsubset', 'branchmap')) | |
22 | supported = set('revlogv1 store fncache shared'.split()) |
|
22 | supported = set('revlogv1 store fncache shared'.split()) | |
23 |
|
23 | |||
24 | def __init__(self, baseui, path=None, create=0): |
|
24 | def __init__(self, baseui, path=None, create=0): | |
25 | repo.repository.__init__(self) |
|
25 | repo.repository.__init__(self) | |
26 | self.root = os.path.realpath(path) |
|
26 | self.root = os.path.realpath(path) | |
27 | self.path = os.path.join(self.root, ".hg") |
|
27 | self.path = os.path.join(self.root, ".hg") | |
28 | self.origroot = path |
|
28 | self.origroot = path | |
29 | self.opener = util.opener(self.path) |
|
29 | self.opener = util.opener(self.path) | |
30 | self.wopener = util.opener(self.root) |
|
30 | self.wopener = util.opener(self.root) | |
31 | self.baseui = baseui |
|
31 | self.baseui = baseui | |
32 | self.ui = baseui.copy() |
|
32 | self.ui = baseui.copy() | |
33 |
|
33 | |||
34 | try: |
|
34 | try: | |
35 | self.ui.readconfig(self.join("hgrc"), self.root) |
|
35 | self.ui.readconfig(self.join("hgrc"), self.root) | |
36 | extensions.loadall(self.ui) |
|
36 | extensions.loadall(self.ui) | |
37 | except IOError: |
|
37 | except IOError: | |
38 | pass |
|
38 | pass | |
39 |
|
39 | |||
40 | if not os.path.isdir(self.path): |
|
40 | if not os.path.isdir(self.path): | |
41 | if create: |
|
41 | if create: | |
42 | if not os.path.exists(path): |
|
42 | if not os.path.exists(path): | |
43 | os.mkdir(path) |
|
43 | os.mkdir(path) | |
44 | os.mkdir(self.path) |
|
44 | os.mkdir(self.path) | |
45 | requirements = ["revlogv1"] |
|
45 | requirements = ["revlogv1"] | |
46 | if self.ui.configbool('format', 'usestore', True): |
|
46 | if self.ui.configbool('format', 'usestore', True): | |
47 | os.mkdir(os.path.join(self.path, "store")) |
|
47 | os.mkdir(os.path.join(self.path, "store")) | |
48 | requirements.append("store") |
|
48 | requirements.append("store") | |
49 | if self.ui.configbool('format', 'usefncache', True): |
|
49 | if self.ui.configbool('format', 'usefncache', True): | |
50 | requirements.append("fncache") |
|
50 | requirements.append("fncache") | |
51 | # create an invalid changelog |
|
51 | # create an invalid changelog | |
52 | self.opener("00changelog.i", "a").write( |
|
52 | self.opener("00changelog.i", "a").write( | |
53 | '\0\0\0\2' # represents revlogv2 |
|
53 | '\0\0\0\2' # represents revlogv2 | |
54 | ' dummy changelog to prevent using the old repo layout' |
|
54 | ' dummy changelog to prevent using the old repo layout' | |
55 | ) |
|
55 | ) | |
56 | reqfile = self.opener("requires", "w") |
|
56 | reqfile = self.opener("requires", "w") | |
57 | for r in requirements: |
|
57 | for r in requirements: | |
58 | reqfile.write("%s\n" % r) |
|
58 | reqfile.write("%s\n" % r) | |
59 | reqfile.close() |
|
59 | reqfile.close() | |
60 | else: |
|
60 | else: | |
61 | raise error.RepoError(_("repository %s not found") % path) |
|
61 | raise error.RepoError(_("repository %s not found") % path) | |
62 | elif create: |
|
62 | elif create: | |
63 | raise error.RepoError(_("repository %s already exists") % path) |
|
63 | raise error.RepoError(_("repository %s already exists") % path) | |
64 | else: |
|
64 | else: | |
65 | # find requirements |
|
65 | # find requirements | |
66 | requirements = set() |
|
66 | requirements = set() | |
67 | try: |
|
67 | try: | |
68 | requirements = set(self.opener("requires").read().splitlines()) |
|
68 | requirements = set(self.opener("requires").read().splitlines()) | |
69 | except IOError, inst: |
|
69 | except IOError, inst: | |
70 | if inst.errno != errno.ENOENT: |
|
70 | if inst.errno != errno.ENOENT: | |
71 | raise |
|
71 | raise | |
72 | for r in requirements - self.supported: |
|
72 | for r in requirements - self.supported: | |
73 | raise error.RepoError(_("requirement '%s' not supported") % r) |
|
73 | raise error.RepoError(_("requirement '%s' not supported") % r) | |
74 |
|
74 | |||
75 | self.sharedpath = self.path |
|
75 | self.sharedpath = self.path | |
76 | try: |
|
76 | try: | |
77 | s = os.path.realpath(self.opener("sharedpath").read()) |
|
77 | s = os.path.realpath(self.opener("sharedpath").read()) | |
78 | if not os.path.exists(s): |
|
78 | if not os.path.exists(s): | |
79 | raise error.RepoError( |
|
79 | raise error.RepoError( | |
80 | _('.hg/sharedpath points to nonexistent directory %s') % s) |
|
80 | _('.hg/sharedpath points to nonexistent directory %s') % s) | |
81 | self.sharedpath = s |
|
81 | self.sharedpath = s | |
82 | except IOError, inst: |
|
82 | except IOError, inst: | |
83 | if inst.errno != errno.ENOENT: |
|
83 | if inst.errno != errno.ENOENT: | |
84 | raise |
|
84 | raise | |
85 |
|
85 | |||
86 | self.store = store.store(requirements, self.sharedpath, util.opener) |
|
86 | self.store = store.store(requirements, self.sharedpath, util.opener) | |
87 | self.spath = self.store.path |
|
87 | self.spath = self.store.path | |
88 | self.sopener = self.store.opener |
|
88 | self.sopener = self.store.opener | |
89 | self.sjoin = self.store.join |
|
89 | self.sjoin = self.store.join | |
90 | self.opener.createmode = self.store.createmode |
|
90 | self.opener.createmode = self.store.createmode | |
91 |
|
91 | |||
92 | self.tagscache = None |
|
92 | self.tagscache = None | |
93 | self._tagstypecache = None |
|
93 | self._tagstypecache = None | |
94 | self.branchcache = None |
|
94 | self.branchcache = None | |
95 | self._ubranchcache = None # UTF-8 version of branchcache |
|
95 | self._ubranchcache = None # UTF-8 version of branchcache | |
96 | self._branchcachetip = None |
|
96 | self._branchcachetip = None | |
97 | self.nodetagscache = None |
|
97 | self.nodetagscache = None | |
98 | self.filterpats = {} |
|
98 | self.filterpats = {} | |
99 | self._datafilters = {} |
|
99 | self._datafilters = {} | |
100 | self._transref = self._lockref = self._wlockref = None |
|
100 | self._transref = self._lockref = self._wlockref = None | |
101 |
|
101 | |||
102 | @propertycache |
|
102 | @propertycache | |
103 | def changelog(self): |
|
103 | def changelog(self): | |
104 | c = changelog.changelog(self.sopener) |
|
104 | c = changelog.changelog(self.sopener) | |
105 | if 'HG_PENDING' in os.environ: |
|
105 | if 'HG_PENDING' in os.environ: | |
106 | p = os.environ['HG_PENDING'] |
|
106 | p = os.environ['HG_PENDING'] | |
107 | if p.startswith(self.root): |
|
107 | if p.startswith(self.root): | |
108 | c.readpending('00changelog.i.a') |
|
108 | c.readpending('00changelog.i.a') | |
109 | self.sopener.defversion = c.version |
|
109 | self.sopener.defversion = c.version | |
110 | return c |
|
110 | return c | |
111 |
|
111 | |||
112 | @propertycache |
|
112 | @propertycache | |
113 | def manifest(self): |
|
113 | def manifest(self): | |
114 | return manifest.manifest(self.sopener) |
|
114 | return manifest.manifest(self.sopener) | |
115 |
|
115 | |||
116 | @propertycache |
|
116 | @propertycache | |
117 | def dirstate(self): |
|
117 | def dirstate(self): | |
118 | return dirstate.dirstate(self.opener, self.ui, self.root) |
|
118 | return dirstate.dirstate(self.opener, self.ui, self.root) | |
119 |
|
119 | |||
120 | def __getitem__(self, changeid): |
|
120 | def __getitem__(self, changeid): | |
121 | if changeid is None: |
|
121 | if changeid is None: | |
122 | return context.workingctx(self) |
|
122 | return context.workingctx(self) | |
123 | return context.changectx(self, changeid) |
|
123 | return context.changectx(self, changeid) | |
124 |
|
124 | |||
125 | def __nonzero__(self): |
|
125 | def __nonzero__(self): | |
126 | return True |
|
126 | return True | |
127 |
|
127 | |||
128 | def __len__(self): |
|
128 | def __len__(self): | |
129 | return len(self.changelog) |
|
129 | return len(self.changelog) | |
130 |
|
130 | |||
131 | def __iter__(self): |
|
131 | def __iter__(self): | |
132 | for i in xrange(len(self)): |
|
132 | for i in xrange(len(self)): | |
133 | yield i |
|
133 | yield i | |
134 |
|
134 | |||
135 | def url(self): |
|
135 | def url(self): | |
136 | return 'file:' + self.root |
|
136 | return 'file:' + self.root | |
137 |
|
137 | |||
138 | def hook(self, name, throw=False, **args): |
|
138 | def hook(self, name, throw=False, **args): | |
139 | return hook.hook(self.ui, self, name, throw, **args) |
|
139 | return hook.hook(self.ui, self, name, throw, **args) | |
140 |
|
140 | |||
141 | tag_disallowed = ':\r\n' |
|
141 | tag_disallowed = ':\r\n' | |
142 |
|
142 | |||
143 | def _tag(self, names, node, message, local, user, date, extra={}): |
|
143 | def _tag(self, names, node, message, local, user, date, extra={}): | |
144 | if isinstance(names, str): |
|
144 | if isinstance(names, str): | |
145 | allchars = names |
|
145 | allchars = names | |
146 | names = (names,) |
|
146 | names = (names,) | |
147 | else: |
|
147 | else: | |
148 | allchars = ''.join(names) |
|
148 | allchars = ''.join(names) | |
149 | for c in self.tag_disallowed: |
|
149 | for c in self.tag_disallowed: | |
150 | if c in allchars: |
|
150 | if c in allchars: | |
151 | raise util.Abort(_('%r cannot be used in a tag name') % c) |
|
151 | raise util.Abort(_('%r cannot be used in a tag name') % c) | |
152 |
|
152 | |||
153 | for name in names: |
|
153 | for name in names: | |
154 | self.hook('pretag', throw=True, node=hex(node), tag=name, |
|
154 | self.hook('pretag', throw=True, node=hex(node), tag=name, | |
155 | local=local) |
|
155 | local=local) | |
156 |
|
156 | |||
157 | def writetags(fp, names, munge, prevtags): |
|
157 | def writetags(fp, names, munge, prevtags): | |
158 | fp.seek(0, 2) |
|
158 | fp.seek(0, 2) | |
159 | if prevtags and prevtags[-1] != '\n': |
|
159 | if prevtags and prevtags[-1] != '\n': | |
160 | fp.write('\n') |
|
160 | fp.write('\n') | |
161 | for name in names: |
|
161 | for name in names: | |
162 | m = munge and munge(name) or name |
|
162 | m = munge and munge(name) or name | |
163 | if self._tagstypecache and name in self._tagstypecache: |
|
163 | if self._tagstypecache and name in self._tagstypecache: | |
164 | old = self.tagscache.get(name, nullid) |
|
164 | old = self.tagscache.get(name, nullid) | |
165 | fp.write('%s %s\n' % (hex(old), m)) |
|
165 | fp.write('%s %s\n' % (hex(old), m)) | |
166 | fp.write('%s %s\n' % (hex(node), m)) |
|
166 | fp.write('%s %s\n' % (hex(node), m)) | |
167 | fp.close() |
|
167 | fp.close() | |
168 |
|
168 | |||
169 | prevtags = '' |
|
169 | prevtags = '' | |
170 | if local: |
|
170 | if local: | |
171 | try: |
|
171 | try: | |
172 | fp = self.opener('localtags', 'r+') |
|
172 | fp = self.opener('localtags', 'r+') | |
173 | except IOError: |
|
173 | except IOError: | |
174 | fp = self.opener('localtags', 'a') |
|
174 | fp = self.opener('localtags', 'a') | |
175 | else: |
|
175 | else: | |
176 | prevtags = fp.read() |
|
176 | prevtags = fp.read() | |
177 |
|
177 | |||
178 | # local tags are stored in the current charset |
|
178 | # local tags are stored in the current charset | |
179 | writetags(fp, names, None, prevtags) |
|
179 | writetags(fp, names, None, prevtags) | |
180 | for name in names: |
|
180 | for name in names: | |
181 | self.hook('tag', node=hex(node), tag=name, local=local) |
|
181 | self.hook('tag', node=hex(node), tag=name, local=local) | |
182 | return |
|
182 | return | |
183 |
|
183 | |||
184 | try: |
|
184 | try: | |
185 | fp = self.wfile('.hgtags', 'rb+') |
|
185 | fp = self.wfile('.hgtags', 'rb+') | |
186 | except IOError: |
|
186 | except IOError: | |
187 | fp = self.wfile('.hgtags', 'ab') |
|
187 | fp = self.wfile('.hgtags', 'ab') | |
188 | else: |
|
188 | else: | |
189 | prevtags = fp.read() |
|
189 | prevtags = fp.read() | |
190 |
|
190 | |||
191 | # committed tags are stored in UTF-8 |
|
191 | # committed tags are stored in UTF-8 | |
192 | writetags(fp, names, encoding.fromlocal, prevtags) |
|
192 | writetags(fp, names, encoding.fromlocal, prevtags) | |
193 |
|
193 | |||
194 | if '.hgtags' not in self.dirstate: |
|
194 | if '.hgtags' not in self.dirstate: | |
195 | self.add(['.hgtags']) |
|
195 | self.add(['.hgtags']) | |
196 |
|
196 | |||
197 | m = match_.exact(self.root, '', ['.hgtags']) |
|
197 | m = match_.exact(self.root, '', ['.hgtags']) | |
198 | tagnode = self.commit(message, user, date, extra=extra, match=m) |
|
198 | tagnode = self.commit(message, user, date, extra=extra, match=m) | |
199 |
|
199 | |||
200 | for name in names: |
|
200 | for name in names: | |
201 | self.hook('tag', node=hex(node), tag=name, local=local) |
|
201 | self.hook('tag', node=hex(node), tag=name, local=local) | |
202 |
|
202 | |||
203 | return tagnode |
|
203 | return tagnode | |
204 |
|
204 | |||
205 | def tag(self, names, node, message, local, user, date): |
|
205 | def tag(self, names, node, message, local, user, date): | |
206 | '''tag a revision with one or more symbolic names. |
|
206 | '''tag a revision with one or more symbolic names. | |
207 |
|
207 | |||
208 | names is a list of strings or, when adding a single tag, names may be a |
|
208 | names is a list of strings or, when adding a single tag, names may be a | |
209 | string. |
|
209 | string. | |
210 |
|
210 | |||
211 | if local is True, the tags are stored in a per-repository file. |
|
211 | if local is True, the tags are stored in a per-repository file. | |
212 | otherwise, they are stored in the .hgtags file, and a new |
|
212 | otherwise, they are stored in the .hgtags file, and a new | |
213 | changeset is committed with the change. |
|
213 | changeset is committed with the change. | |
214 |
|
214 | |||
215 | keyword arguments: |
|
215 | keyword arguments: | |
216 |
|
216 | |||
217 | local: whether to store tags in non-version-controlled file |
|
217 | local: whether to store tags in non-version-controlled file | |
218 | (default False) |
|
218 | (default False) | |
219 |
|
219 | |||
220 | message: commit message to use if committing |
|
220 | message: commit message to use if committing | |
221 |
|
221 | |||
222 | user: name of user to use if committing |
|
222 | user: name of user to use if committing | |
223 |
|
223 | |||
224 | date: date tuple to use if committing''' |
|
224 | date: date tuple to use if committing''' | |
225 |
|
225 | |||
226 | for x in self.status()[:5]: |
|
226 | for x in self.status()[:5]: | |
227 | if '.hgtags' in x: |
|
227 | if '.hgtags' in x: | |
228 | raise util.Abort(_('working copy of .hgtags is changed ' |
|
228 | raise util.Abort(_('working copy of .hgtags is changed ' | |
229 | '(please commit .hgtags manually)')) |
|
229 | '(please commit .hgtags manually)')) | |
230 |
|
230 | |||
231 | self.tags() # instantiate the cache |
|
231 | self.tags() # instantiate the cache | |
232 | self._tag(names, node, message, local, user, date) |
|
232 | self._tag(names, node, message, local, user, date) | |
233 |
|
233 | |||
234 | def tags(self): |
|
234 | def tags(self): | |
235 | '''return a mapping of tag to node''' |
|
235 | '''return a mapping of tag to node''' | |
236 | if self.tagscache: |
|
236 | if self.tagscache: | |
237 | return self.tagscache |
|
237 | return self.tagscache | |
238 |
|
238 | |||
239 | globaltags = {} |
|
239 | globaltags = {} | |
240 | tagtypes = {} |
|
240 | tagtypes = {} | |
241 |
|
241 | |||
242 | def readtags(lines, fn, tagtype): |
|
242 | def readtags(lines, fn, tagtype): | |
243 | filetags = {} |
|
243 | filetags = {} | |
244 | count = 0 |
|
244 | count = 0 | |
245 |
|
245 | |||
246 | def warn(msg): |
|
246 | def warn(msg): | |
247 | self.ui.warn(_("%s, line %s: %s\n") % (fn, count, msg)) |
|
247 | self.ui.warn(_("%s, line %s: %s\n") % (fn, count, msg)) | |
248 |
|
248 | |||
249 | for l in lines: |
|
249 | for l in lines: | |
250 | count += 1 |
|
250 | count += 1 | |
251 | if not l: |
|
251 | if not l: | |
252 | continue |
|
252 | continue | |
253 | s = l.split(" ", 1) |
|
253 | s = l.split(" ", 1) | |
254 | if len(s) != 2: |
|
254 | if len(s) != 2: | |
255 | warn(_("cannot parse entry")) |
|
255 | warn(_("cannot parse entry")) | |
256 | continue |
|
256 | continue | |
257 | node, key = s |
|
257 | node, key = s | |
258 | key = encoding.tolocal(key.strip()) # stored in UTF-8 |
|
258 | key = encoding.tolocal(key.strip()) # stored in UTF-8 | |
259 | try: |
|
259 | try: | |
260 | bin_n = bin(node) |
|
260 | bin_n = bin(node) | |
261 | except TypeError: |
|
261 | except TypeError: | |
262 | warn(_("node '%s' is not well formed") % node) |
|
262 | warn(_("node '%s' is not well formed") % node) | |
263 | continue |
|
263 | continue | |
264 | if bin_n not in self.changelog.nodemap: |
|
264 | if bin_n not in self.changelog.nodemap: | |
265 | # silently ignore as pull -r might cause this |
|
265 | # silently ignore as pull -r might cause this | |
266 | continue |
|
266 | continue | |
267 |
|
267 | |||
268 | h = [] |
|
268 | h = [] | |
269 | if key in filetags: |
|
269 | if key in filetags: | |
270 | n, h = filetags[key] |
|
270 | n, h = filetags[key] | |
271 | h.append(n) |
|
271 | h.append(n) | |
272 | filetags[key] = (bin_n, h) |
|
272 | filetags[key] = (bin_n, h) | |
273 |
|
273 | |||
274 | for k, nh in filetags.iteritems(): |
|
274 | for k, nh in filetags.iteritems(): | |
275 | if k not in globaltags: |
|
275 | if k not in globaltags: | |
276 | globaltags[k] = nh |
|
276 | globaltags[k] = nh | |
277 | tagtypes[k] = tagtype |
|
277 | tagtypes[k] = tagtype | |
278 | continue |
|
278 | continue | |
279 |
|
279 | |||
280 | # we prefer the global tag if: |
|
280 | # we prefer the global tag if: | |
281 | # it supercedes us OR |
|
281 | # it supercedes us OR | |
282 | # mutual supercedes and it has a higher rank |
|
282 | # mutual supercedes and it has a higher rank | |
283 | # otherwise we win because we're tip-most |
|
283 | # otherwise we win because we're tip-most | |
284 | an, ah = nh |
|
284 | an, ah = nh | |
285 | bn, bh = globaltags[k] |
|
285 | bn, bh = globaltags[k] | |
286 | if (bn != an and an in bh and |
|
286 | if (bn != an and an in bh and | |
287 | (bn not in ah or len(bh) > len(ah))): |
|
287 | (bn not in ah or len(bh) > len(ah))): | |
288 | an = bn |
|
288 | an = bn | |
289 | ah.extend([n for n in bh if n not in ah]) |
|
289 | ah.extend([n for n in bh if n not in ah]) | |
290 | globaltags[k] = an, ah |
|
290 | globaltags[k] = an, ah | |
291 | tagtypes[k] = tagtype |
|
291 | tagtypes[k] = tagtype | |
292 |
|
292 | |||
293 | seen = set() |
|
293 | seen = set() | |
294 | f = None |
|
294 | f = None | |
295 | ctxs = [] |
|
295 | ctxs = [] | |
296 | for node in self.heads(): |
|
296 | for node in self.heads(): | |
297 | try: |
|
297 | try: | |
298 | fnode = self[node].filenode('.hgtags') |
|
298 | fnode = self[node].filenode('.hgtags') | |
299 | except error.LookupError: |
|
299 | except error.LookupError: | |
300 | continue |
|
300 | continue | |
301 | if fnode not in seen: |
|
301 | if fnode not in seen: | |
302 | seen.add(fnode) |
|
302 | seen.add(fnode) | |
303 | if not f: |
|
303 | if not f: | |
304 | f = self.filectx('.hgtags', fileid=fnode) |
|
304 | f = self.filectx('.hgtags', fileid=fnode) | |
305 | else: |
|
305 | else: | |
306 | f = f.filectx(fnode) |
|
306 | f = f.filectx(fnode) | |
307 | ctxs.append(f) |
|
307 | ctxs.append(f) | |
308 |
|
308 | |||
309 | # read the tags file from each head, ending with the tip |
|
309 | # read the tags file from each head, ending with the tip | |
310 | for f in reversed(ctxs): |
|
310 | for f in reversed(ctxs): | |
311 | readtags(f.data().splitlines(), f, "global") |
|
311 | readtags(f.data().splitlines(), f, "global") | |
312 |
|
312 | |||
313 | try: |
|
313 | try: | |
314 | data = encoding.fromlocal(self.opener("localtags").read()) |
|
314 | data = encoding.fromlocal(self.opener("localtags").read()) | |
315 | # localtags are stored in the local character set |
|
315 | # localtags are stored in the local character set | |
316 | # while the internal tag table is stored in UTF-8 |
|
316 | # while the internal tag table is stored in UTF-8 | |
317 | readtags(data.splitlines(), "localtags", "local") |
|
317 | readtags(data.splitlines(), "localtags", "local") | |
318 | except IOError: |
|
318 | except IOError: | |
319 | pass |
|
319 | pass | |
320 |
|
320 | |||
321 | self.tagscache = {} |
|
321 | self.tagscache = {} | |
322 | self._tagstypecache = {} |
|
322 | self._tagstypecache = {} | |
323 | for k, nh in globaltags.iteritems(): |
|
323 | for k, nh in globaltags.iteritems(): | |
324 | n = nh[0] |
|
324 | n = nh[0] | |
325 | if n != nullid: |
|
325 | if n != nullid: | |
326 | self.tagscache[k] = n |
|
326 | self.tagscache[k] = n | |
327 | self._tagstypecache[k] = tagtypes[k] |
|
327 | self._tagstypecache[k] = tagtypes[k] | |
328 | self.tagscache['tip'] = self.changelog.tip() |
|
328 | self.tagscache['tip'] = self.changelog.tip() | |
329 | return self.tagscache |
|
329 | return self.tagscache | |
330 |
|
330 | |||
331 | def tagtype(self, tagname): |
|
331 | def tagtype(self, tagname): | |
332 | ''' |
|
332 | ''' | |
333 | return the type of the given tag. result can be: |
|
333 | return the type of the given tag. result can be: | |
334 |
|
334 | |||
335 | 'local' : a local tag |
|
335 | 'local' : a local tag | |
336 | 'global' : a global tag |
|
336 | 'global' : a global tag | |
337 | None : tag does not exist |
|
337 | None : tag does not exist | |
338 | ''' |
|
338 | ''' | |
339 |
|
339 | |||
340 | self.tags() |
|
340 | self.tags() | |
341 |
|
341 | |||
342 | return self._tagstypecache.get(tagname) |
|
342 | return self._tagstypecache.get(tagname) | |
343 |
|
343 | |||
344 | def tagslist(self): |
|
344 | def tagslist(self): | |
345 | '''return a list of tags ordered by revision''' |
|
345 | '''return a list of tags ordered by revision''' | |
346 | l = [] |
|
346 | l = [] | |
347 | for t, n in self.tags().iteritems(): |
|
347 | for t, n in self.tags().iteritems(): | |
348 | try: |
|
348 | try: | |
349 | r = self.changelog.rev(n) |
|
349 | r = self.changelog.rev(n) | |
350 | except: |
|
350 | except: | |
351 | r = -2 # sort to the beginning of the list if unknown |
|
351 | r = -2 # sort to the beginning of the list if unknown | |
352 | l.append((r, t, n)) |
|
352 | l.append((r, t, n)) | |
353 | return [(t, n) for r, t, n in sorted(l)] |
|
353 | return [(t, n) for r, t, n in sorted(l)] | |
354 |
|
354 | |||
355 | def nodetags(self, node): |
|
355 | def nodetags(self, node): | |
356 | '''return the tags associated with a node''' |
|
356 | '''return the tags associated with a node''' | |
357 | if not self.nodetagscache: |
|
357 | if not self.nodetagscache: | |
358 | self.nodetagscache = {} |
|
358 | self.nodetagscache = {} | |
359 | for t, n in self.tags().iteritems(): |
|
359 | for t, n in self.tags().iteritems(): | |
360 | self.nodetagscache.setdefault(n, []).append(t) |
|
360 | self.nodetagscache.setdefault(n, []).append(t) | |
361 | return self.nodetagscache.get(node, []) |
|
361 | return self.nodetagscache.get(node, []) | |
362 |
|
362 | |||
363 | def _branchtags(self, partial, lrev): |
|
363 | def _branchtags(self, partial, lrev): | |
364 | # TODO: rename this function? |
|
364 | # TODO: rename this function? | |
365 | tiprev = len(self) - 1 |
|
365 | tiprev = len(self) - 1 | |
366 | if lrev != tiprev: |
|
366 | if lrev != tiprev: | |
367 | self._updatebranchcache(partial, lrev+1, tiprev+1) |
|
367 | self._updatebranchcache(partial, lrev+1, tiprev+1) | |
368 | self._writebranchcache(partial, self.changelog.tip(), tiprev) |
|
368 | self._writebranchcache(partial, self.changelog.tip(), tiprev) | |
369 |
|
369 | |||
370 | return partial |
|
370 | return partial | |
371 |
|
371 | |||
372 | def branchmap(self): |
|
372 | def branchmap(self): | |
373 | tip = self.changelog.tip() |
|
373 | tip = self.changelog.tip() | |
374 | if self.branchcache is not None and self._branchcachetip == tip: |
|
374 | if self.branchcache is not None and self._branchcachetip == tip: | |
375 | return self.branchcache |
|
375 | return self.branchcache | |
376 |
|
376 | |||
377 | oldtip = self._branchcachetip |
|
377 | oldtip = self._branchcachetip | |
378 | self._branchcachetip = tip |
|
378 | self._branchcachetip = tip | |
379 | if self.branchcache is None: |
|
379 | if self.branchcache is None: | |
380 | self.branchcache = {} # avoid recursion in changectx |
|
380 | self.branchcache = {} # avoid recursion in changectx | |
381 | else: |
|
381 | else: | |
382 | self.branchcache.clear() # keep using the same dict |
|
382 | self.branchcache.clear() # keep using the same dict | |
383 | if oldtip is None or oldtip not in self.changelog.nodemap: |
|
383 | if oldtip is None or oldtip not in self.changelog.nodemap: | |
384 | partial, last, lrev = self._readbranchcache() |
|
384 | partial, last, lrev = self._readbranchcache() | |
385 | else: |
|
385 | else: | |
386 | lrev = self.changelog.rev(oldtip) |
|
386 | lrev = self.changelog.rev(oldtip) | |
387 | partial = self._ubranchcache |
|
387 | partial = self._ubranchcache | |
388 |
|
388 | |||
389 | self._branchtags(partial, lrev) |
|
389 | self._branchtags(partial, lrev) | |
390 | # this private cache holds all heads (not just tips) |
|
390 | # this private cache holds all heads (not just tips) | |
391 | self._ubranchcache = partial |
|
391 | self._ubranchcache = partial | |
392 |
|
392 | |||
393 | # the branch cache is stored on disk as UTF-8, but in the local |
|
393 | # the branch cache is stored on disk as UTF-8, but in the local | |
394 | # charset internally |
|
394 | # charset internally | |
395 | for k, v in partial.iteritems(): |
|
395 | for k, v in partial.iteritems(): | |
396 | self.branchcache[encoding.tolocal(k)] = v |
|
396 | self.branchcache[encoding.tolocal(k)] = v | |
397 | return self.branchcache |
|
397 | return self.branchcache | |
398 |
|
398 | |||
399 |
|
399 | |||
400 | def branchtags(self): |
|
400 | def branchtags(self): | |
401 | '''return a dict where branch names map to the tipmost head of |
|
401 | '''return a dict where branch names map to the tipmost head of | |
402 | the branch, open heads come before closed''' |
|
402 | the branch, open heads come before closed''' | |
403 | bt = {} |
|
403 | bt = {} | |
404 | for bn, heads in self.branchmap().iteritems(): |
|
404 | for bn, heads in self.branchmap().iteritems(): | |
405 | head = None |
|
405 | head = None | |
406 | for i in range(len(heads)-1, -1, -1): |
|
406 | for i in range(len(heads)-1, -1, -1): | |
407 | h = heads[i] |
|
407 | h = heads[i] | |
408 | if 'close' not in self.changelog.read(h)[5]: |
|
408 | if 'close' not in self.changelog.read(h)[5]: | |
409 | head = h |
|
409 | head = h | |
410 | break |
|
410 | break | |
411 | # no open heads were found |
|
411 | # no open heads were found | |
412 | if head is None: |
|
412 | if head is None: | |
413 | head = heads[-1] |
|
413 | head = heads[-1] | |
414 | bt[bn] = head |
|
414 | bt[bn] = head | |
415 | return bt |
|
415 | return bt | |
416 |
|
416 | |||
417 |
|
417 | |||
418 | def _readbranchcache(self): |
|
418 | def _readbranchcache(self): | |
419 | partial = {} |
|
419 | partial = {} | |
420 | try: |
|
420 | try: | |
421 | f = self.opener("branchheads.cache") |
|
421 | f = self.opener("branchheads.cache") | |
422 | lines = f.read().split('\n') |
|
422 | lines = f.read().split('\n') | |
423 | f.close() |
|
423 | f.close() | |
424 | except (IOError, OSError): |
|
424 | except (IOError, OSError): | |
425 | return {}, nullid, nullrev |
|
425 | return {}, nullid, nullrev | |
426 |
|
426 | |||
427 | try: |
|
427 | try: | |
428 | last, lrev = lines.pop(0).split(" ", 1) |
|
428 | last, lrev = lines.pop(0).split(" ", 1) | |
429 | last, lrev = bin(last), int(lrev) |
|
429 | last, lrev = bin(last), int(lrev) | |
430 | if lrev >= len(self) or self[lrev].node() != last: |
|
430 | if lrev >= len(self) or self[lrev].node() != last: | |
431 | # invalidate the cache |
|
431 | # invalidate the cache | |
432 | raise ValueError('invalidating branch cache (tip differs)') |
|
432 | raise ValueError('invalidating branch cache (tip differs)') | |
433 | for l in lines: |
|
433 | for l in lines: | |
434 | if not l: continue |
|
434 | if not l: continue | |
435 | node, label = l.split(" ", 1) |
|
435 | node, label = l.split(" ", 1) | |
436 | partial.setdefault(label.strip(), []).append(bin(node)) |
|
436 | partial.setdefault(label.strip(), []).append(bin(node)) | |
437 | except KeyboardInterrupt: |
|
437 | except KeyboardInterrupt: | |
438 | raise |
|
438 | raise | |
439 | except Exception, inst: |
|
439 | except Exception, inst: | |
440 | if self.ui.debugflag: |
|
440 | if self.ui.debugflag: | |
441 | self.ui.warn(str(inst), '\n') |
|
441 | self.ui.warn(str(inst), '\n') | |
442 | partial, last, lrev = {}, nullid, nullrev |
|
442 | partial, last, lrev = {}, nullid, nullrev | |
443 | return partial, last, lrev |
|
443 | return partial, last, lrev | |
444 |
|
444 | |||
445 | def _writebranchcache(self, branches, tip, tiprev): |
|
445 | def _writebranchcache(self, branches, tip, tiprev): | |
446 | try: |
|
446 | try: | |
447 | f = self.opener("branchheads.cache", "w", atomictemp=True) |
|
447 | f = self.opener("branchheads.cache", "w", atomictemp=True) | |
448 | f.write("%s %s\n" % (hex(tip), tiprev)) |
|
448 | f.write("%s %s\n" % (hex(tip), tiprev)) | |
449 | for label, nodes in branches.iteritems(): |
|
449 | for label, nodes in branches.iteritems(): | |
450 | for node in nodes: |
|
450 | for node in nodes: | |
451 | f.write("%s %s\n" % (hex(node), label)) |
|
451 | f.write("%s %s\n" % (hex(node), label)) | |
452 | f.rename() |
|
452 | f.rename() | |
453 | except (IOError, OSError): |
|
453 | except (IOError, OSError): | |
454 | pass |
|
454 | pass | |
455 |
|
455 | |||
456 | def _updatebranchcache(self, partial, start, end): |
|
456 | def _updatebranchcache(self, partial, start, end): | |
457 | # collect new branch entries |
|
457 | # collect new branch entries | |
458 | newbranches = {} |
|
458 | newbranches = {} | |
459 | for r in xrange(start, end): |
|
459 | for r in xrange(start, end): | |
460 | c = self[r] |
|
460 | c = self[r] | |
461 | newbranches.setdefault(c.branch(), []).append(c.node()) |
|
461 | newbranches.setdefault(c.branch(), []).append(c.node()) | |
462 | # if older branchheads are reachable from new ones, they aren't |
|
462 | # if older branchheads are reachable from new ones, they aren't | |
463 | # really branchheads. Note checking parents is insufficient: |
|
463 | # really branchheads. Note checking parents is insufficient: | |
464 | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) |
|
464 | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) | |
465 | for branch, newnodes in newbranches.iteritems(): |
|
465 | for branch, newnodes in newbranches.iteritems(): | |
466 | bheads = partial.setdefault(branch, []) |
|
466 | bheads = partial.setdefault(branch, []) | |
467 | bheads.extend(newnodes) |
|
467 | bheads.extend(newnodes) | |
468 | if len(bheads) < 2: |
|
468 | if len(bheads) < 2: | |
469 | continue |
|
469 | continue | |
470 | newbheads = [] |
|
470 | newbheads = [] | |
471 | # starting from tip means fewer passes over reachable |
|
471 | # starting from tip means fewer passes over reachable | |
472 | while newnodes: |
|
472 | while newnodes: | |
473 | latest = newnodes.pop() |
|
473 | latest = newnodes.pop() | |
474 | if latest not in bheads: |
|
474 | if latest not in bheads: | |
475 | continue |
|
475 | continue | |
476 | reachable = set() |
|
476 | minbhrev = self[min([self[bh].rev() for bh in bheads])].node() | |
477 | for bh in bheads: |
|
477 | reachable = self.changelog.reachable(latest, minbhrev) | |
478 | reachable |= self.changelog.reachable(latest, bh) |
|
|||
479 | bheads = [b for b in bheads if b not in reachable] |
|
478 | bheads = [b for b in bheads if b not in reachable] | |
480 | newbheads.insert(0, latest) |
|
479 | newbheads.insert(0, latest) | |
481 | bheads.extend(newbheads) |
|
480 | bheads.extend(newbheads) | |
482 | partial[branch] = bheads |
|
481 | partial[branch] = bheads | |
483 |
|
482 | |||
484 | def lookup(self, key): |
|
483 | def lookup(self, key): | |
485 | if isinstance(key, int): |
|
484 | if isinstance(key, int): | |
486 | return self.changelog.node(key) |
|
485 | return self.changelog.node(key) | |
487 | elif key == '.': |
|
486 | elif key == '.': | |
488 | return self.dirstate.parents()[0] |
|
487 | return self.dirstate.parents()[0] | |
489 | elif key == 'null': |
|
488 | elif key == 'null': | |
490 | return nullid |
|
489 | return nullid | |
491 | elif key == 'tip': |
|
490 | elif key == 'tip': | |
492 | return self.changelog.tip() |
|
491 | return self.changelog.tip() | |
493 | n = self.changelog._match(key) |
|
492 | n = self.changelog._match(key) | |
494 | if n: |
|
493 | if n: | |
495 | return n |
|
494 | return n | |
496 | if key in self.tags(): |
|
495 | if key in self.tags(): | |
497 | return self.tags()[key] |
|
496 | return self.tags()[key] | |
498 | if key in self.branchtags(): |
|
497 | if key in self.branchtags(): | |
499 | return self.branchtags()[key] |
|
498 | return self.branchtags()[key] | |
500 | n = self.changelog._partialmatch(key) |
|
499 | n = self.changelog._partialmatch(key) | |
501 | if n: |
|
500 | if n: | |
502 | return n |
|
501 | return n | |
503 |
|
502 | |||
504 | # can't find key, check if it might have come from damaged dirstate |
|
503 | # can't find key, check if it might have come from damaged dirstate | |
505 | if key in self.dirstate.parents(): |
|
504 | if key in self.dirstate.parents(): | |
506 | raise error.Abort(_("working directory has unknown parent '%s'!") |
|
505 | raise error.Abort(_("working directory has unknown parent '%s'!") | |
507 | % short(key)) |
|
506 | % short(key)) | |
508 | try: |
|
507 | try: | |
509 | if len(key) == 20: |
|
508 | if len(key) == 20: | |
510 | key = hex(key) |
|
509 | key = hex(key) | |
511 | except: |
|
510 | except: | |
512 | pass |
|
511 | pass | |
513 | raise error.RepoError(_("unknown revision '%s'") % key) |
|
512 | raise error.RepoError(_("unknown revision '%s'") % key) | |
514 |
|
513 | |||
515 | def local(self): |
|
514 | def local(self): | |
516 | return True |
|
515 | return True | |
517 |
|
516 | |||
518 | def join(self, f): |
|
517 | def join(self, f): | |
519 | return os.path.join(self.path, f) |
|
518 | return os.path.join(self.path, f) | |
520 |
|
519 | |||
521 | def wjoin(self, f): |
|
520 | def wjoin(self, f): | |
522 | return os.path.join(self.root, f) |
|
521 | return os.path.join(self.root, f) | |
523 |
|
522 | |||
524 | def rjoin(self, f): |
|
523 | def rjoin(self, f): | |
525 | return os.path.join(self.root, util.pconvert(f)) |
|
524 | return os.path.join(self.root, util.pconvert(f)) | |
526 |
|
525 | |||
527 | def file(self, f): |
|
526 | def file(self, f): | |
528 | if f[0] == '/': |
|
527 | if f[0] == '/': | |
529 | f = f[1:] |
|
528 | f = f[1:] | |
530 | return filelog.filelog(self.sopener, f) |
|
529 | return filelog.filelog(self.sopener, f) | |
531 |
|
530 | |||
532 | def changectx(self, changeid): |
|
531 | def changectx(self, changeid): | |
533 | return self[changeid] |
|
532 | return self[changeid] | |
534 |
|
533 | |||
535 | def parents(self, changeid=None): |
|
534 | def parents(self, changeid=None): | |
536 | '''get list of changectxs for parents of changeid''' |
|
535 | '''get list of changectxs for parents of changeid''' | |
537 | return self[changeid].parents() |
|
536 | return self[changeid].parents() | |
538 |
|
537 | |||
539 | def filectx(self, path, changeid=None, fileid=None): |
|
538 | def filectx(self, path, changeid=None, fileid=None): | |
540 | """changeid can be a changeset revision, node, or tag. |
|
539 | """changeid can be a changeset revision, node, or tag. | |
541 | fileid can be a file revision or node.""" |
|
540 | fileid can be a file revision or node.""" | |
542 | return context.filectx(self, path, changeid, fileid) |
|
541 | return context.filectx(self, path, changeid, fileid) | |
543 |
|
542 | |||
544 | def getcwd(self): |
|
543 | def getcwd(self): | |
545 | return self.dirstate.getcwd() |
|
544 | return self.dirstate.getcwd() | |
546 |
|
545 | |||
547 | def pathto(self, f, cwd=None): |
|
546 | def pathto(self, f, cwd=None): | |
548 | return self.dirstate.pathto(f, cwd) |
|
547 | return self.dirstate.pathto(f, cwd) | |
549 |
|
548 | |||
550 | def wfile(self, f, mode='r'): |
|
549 | def wfile(self, f, mode='r'): | |
551 | return self.wopener(f, mode) |
|
550 | return self.wopener(f, mode) | |
552 |
|
551 | |||
553 | def _link(self, f): |
|
552 | def _link(self, f): | |
554 | return os.path.islink(self.wjoin(f)) |
|
553 | return os.path.islink(self.wjoin(f)) | |
555 |
|
554 | |||
556 | def _filter(self, filter, filename, data): |
|
555 | def _filter(self, filter, filename, data): | |
557 | if filter not in self.filterpats: |
|
556 | if filter not in self.filterpats: | |
558 | l = [] |
|
557 | l = [] | |
559 | for pat, cmd in self.ui.configitems(filter): |
|
558 | for pat, cmd in self.ui.configitems(filter): | |
560 | if cmd == '!': |
|
559 | if cmd == '!': | |
561 | continue |
|
560 | continue | |
562 | mf = match_.match(self.root, '', [pat]) |
|
561 | mf = match_.match(self.root, '', [pat]) | |
563 | fn = None |
|
562 | fn = None | |
564 | params = cmd |
|
563 | params = cmd | |
565 | for name, filterfn in self._datafilters.iteritems(): |
|
564 | for name, filterfn in self._datafilters.iteritems(): | |
566 | if cmd.startswith(name): |
|
565 | if cmd.startswith(name): | |
567 | fn = filterfn |
|
566 | fn = filterfn | |
568 | params = cmd[len(name):].lstrip() |
|
567 | params = cmd[len(name):].lstrip() | |
569 | break |
|
568 | break | |
570 | if not fn: |
|
569 | if not fn: | |
571 | fn = lambda s, c, **kwargs: util.filter(s, c) |
|
570 | fn = lambda s, c, **kwargs: util.filter(s, c) | |
572 | # Wrap old filters not supporting keyword arguments |
|
571 | # Wrap old filters not supporting keyword arguments | |
573 | if not inspect.getargspec(fn)[2]: |
|
572 | if not inspect.getargspec(fn)[2]: | |
574 | oldfn = fn |
|
573 | oldfn = fn | |
575 | fn = lambda s, c, **kwargs: oldfn(s, c) |
|
574 | fn = lambda s, c, **kwargs: oldfn(s, c) | |
576 | l.append((mf, fn, params)) |
|
575 | l.append((mf, fn, params)) | |
577 | self.filterpats[filter] = l |
|
576 | self.filterpats[filter] = l | |
578 |
|
577 | |||
579 | for mf, fn, cmd in self.filterpats[filter]: |
|
578 | for mf, fn, cmd in self.filterpats[filter]: | |
580 | if mf(filename): |
|
579 | if mf(filename): | |
581 | self.ui.debug(_("filtering %s through %s\n") % (filename, cmd)) |
|
580 | self.ui.debug(_("filtering %s through %s\n") % (filename, cmd)) | |
582 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
581 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) | |
583 | break |
|
582 | break | |
584 |
|
583 | |||
585 | return data |
|
584 | return data | |
586 |
|
585 | |||
587 | def adddatafilter(self, name, filter): |
|
586 | def adddatafilter(self, name, filter): | |
588 | self._datafilters[name] = filter |
|
587 | self._datafilters[name] = filter | |
589 |
|
588 | |||
590 | def wread(self, filename): |
|
589 | def wread(self, filename): | |
591 | if self._link(filename): |
|
590 | if self._link(filename): | |
592 | data = os.readlink(self.wjoin(filename)) |
|
591 | data = os.readlink(self.wjoin(filename)) | |
593 | else: |
|
592 | else: | |
594 | data = self.wopener(filename, 'r').read() |
|
593 | data = self.wopener(filename, 'r').read() | |
595 | return self._filter("encode", filename, data) |
|
594 | return self._filter("encode", filename, data) | |
596 |
|
595 | |||
597 | def wwrite(self, filename, data, flags): |
|
596 | def wwrite(self, filename, data, flags): | |
598 | data = self._filter("decode", filename, data) |
|
597 | data = self._filter("decode", filename, data) | |
599 | try: |
|
598 | try: | |
600 | os.unlink(self.wjoin(filename)) |
|
599 | os.unlink(self.wjoin(filename)) | |
601 | except OSError: |
|
600 | except OSError: | |
602 | pass |
|
601 | pass | |
603 | if 'l' in flags: |
|
602 | if 'l' in flags: | |
604 | self.wopener.symlink(data, filename) |
|
603 | self.wopener.symlink(data, filename) | |
605 | else: |
|
604 | else: | |
606 | self.wopener(filename, 'w').write(data) |
|
605 | self.wopener(filename, 'w').write(data) | |
607 | if 'x' in flags: |
|
606 | if 'x' in flags: | |
608 | util.set_flags(self.wjoin(filename), False, True) |
|
607 | util.set_flags(self.wjoin(filename), False, True) | |
609 |
|
608 | |||
610 | def wwritedata(self, filename, data): |
|
609 | def wwritedata(self, filename, data): | |
611 | return self._filter("decode", filename, data) |
|
610 | return self._filter("decode", filename, data) | |
612 |
|
611 | |||
613 | def transaction(self): |
|
612 | def transaction(self): | |
614 | tr = self._transref and self._transref() or None |
|
613 | tr = self._transref and self._transref() or None | |
615 | if tr and tr.running(): |
|
614 | if tr and tr.running(): | |
616 | return tr.nest() |
|
615 | return tr.nest() | |
617 |
|
616 | |||
618 | # abort here if the journal already exists |
|
617 | # abort here if the journal already exists | |
619 | if os.path.exists(self.sjoin("journal")): |
|
618 | if os.path.exists(self.sjoin("journal")): | |
620 | raise error.RepoError(_("journal already exists - run hg recover")) |
|
619 | raise error.RepoError(_("journal already exists - run hg recover")) | |
621 |
|
620 | |||
622 | # save dirstate for rollback |
|
621 | # save dirstate for rollback | |
623 | try: |
|
622 | try: | |
624 | ds = self.opener("dirstate").read() |
|
623 | ds = self.opener("dirstate").read() | |
625 | except IOError: |
|
624 | except IOError: | |
626 | ds = "" |
|
625 | ds = "" | |
627 | self.opener("journal.dirstate", "w").write(ds) |
|
626 | self.opener("journal.dirstate", "w").write(ds) | |
628 | self.opener("journal.branch", "w").write(self.dirstate.branch()) |
|
627 | self.opener("journal.branch", "w").write(self.dirstate.branch()) | |
629 |
|
628 | |||
630 | renames = [(self.sjoin("journal"), self.sjoin("undo")), |
|
629 | renames = [(self.sjoin("journal"), self.sjoin("undo")), | |
631 | (self.join("journal.dirstate"), self.join("undo.dirstate")), |
|
630 | (self.join("journal.dirstate"), self.join("undo.dirstate")), | |
632 | (self.join("journal.branch"), self.join("undo.branch"))] |
|
631 | (self.join("journal.branch"), self.join("undo.branch"))] | |
633 | tr = transaction.transaction(self.ui.warn, self.sopener, |
|
632 | tr = transaction.transaction(self.ui.warn, self.sopener, | |
634 | self.sjoin("journal"), |
|
633 | self.sjoin("journal"), | |
635 | aftertrans(renames), |
|
634 | aftertrans(renames), | |
636 | self.store.createmode) |
|
635 | self.store.createmode) | |
637 | self._transref = weakref.ref(tr) |
|
636 | self._transref = weakref.ref(tr) | |
638 | return tr |
|
637 | return tr | |
639 |
|
638 | |||
640 | def recover(self): |
|
639 | def recover(self): | |
641 | lock = self.lock() |
|
640 | lock = self.lock() | |
642 | try: |
|
641 | try: | |
643 | if os.path.exists(self.sjoin("journal")): |
|
642 | if os.path.exists(self.sjoin("journal")): | |
644 | self.ui.status(_("rolling back interrupted transaction\n")) |
|
643 | self.ui.status(_("rolling back interrupted transaction\n")) | |
645 | transaction.rollback(self.sopener, self.sjoin("journal"), self.ui.warn) |
|
644 | transaction.rollback(self.sopener, self.sjoin("journal"), self.ui.warn) | |
646 | self.invalidate() |
|
645 | self.invalidate() | |
647 | return True |
|
646 | return True | |
648 | else: |
|
647 | else: | |
649 | self.ui.warn(_("no interrupted transaction available\n")) |
|
648 | self.ui.warn(_("no interrupted transaction available\n")) | |
650 | return False |
|
649 | return False | |
651 | finally: |
|
650 | finally: | |
652 | lock.release() |
|
651 | lock.release() | |
653 |
|
652 | |||
654 | def rollback(self): |
|
653 | def rollback(self): | |
655 | wlock = lock = None |
|
654 | wlock = lock = None | |
656 | try: |
|
655 | try: | |
657 | wlock = self.wlock() |
|
656 | wlock = self.wlock() | |
658 | lock = self.lock() |
|
657 | lock = self.lock() | |
659 | if os.path.exists(self.sjoin("undo")): |
|
658 | if os.path.exists(self.sjoin("undo")): | |
660 | self.ui.status(_("rolling back last transaction\n")) |
|
659 | self.ui.status(_("rolling back last transaction\n")) | |
661 | transaction.rollback(self.sopener, self.sjoin("undo"), self.ui.warn) |
|
660 | transaction.rollback(self.sopener, self.sjoin("undo"), self.ui.warn) | |
662 | util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
|
661 | util.rename(self.join("undo.dirstate"), self.join("dirstate")) | |
663 | try: |
|
662 | try: | |
664 | branch = self.opener("undo.branch").read() |
|
663 | branch = self.opener("undo.branch").read() | |
665 | self.dirstate.setbranch(branch) |
|
664 | self.dirstate.setbranch(branch) | |
666 | except IOError: |
|
665 | except IOError: | |
667 | self.ui.warn(_("Named branch could not be reset, " |
|
666 | self.ui.warn(_("Named branch could not be reset, " | |
668 | "current branch still is: %s\n") |
|
667 | "current branch still is: %s\n") | |
669 | % encoding.tolocal(self.dirstate.branch())) |
|
668 | % encoding.tolocal(self.dirstate.branch())) | |
670 | self.invalidate() |
|
669 | self.invalidate() | |
671 | self.dirstate.invalidate() |
|
670 | self.dirstate.invalidate() | |
672 | else: |
|
671 | else: | |
673 | self.ui.warn(_("no rollback information available\n")) |
|
672 | self.ui.warn(_("no rollback information available\n")) | |
674 | finally: |
|
673 | finally: | |
675 | release(lock, wlock) |
|
674 | release(lock, wlock) | |
676 |
|
675 | |||
677 | def invalidate(self): |
|
676 | def invalidate(self): | |
678 | for a in "changelog manifest".split(): |
|
677 | for a in "changelog manifest".split(): | |
679 | if a in self.__dict__: |
|
678 | if a in self.__dict__: | |
680 | delattr(self, a) |
|
679 | delattr(self, a) | |
681 | self.tagscache = None |
|
680 | self.tagscache = None | |
682 | self._tagstypecache = None |
|
681 | self._tagstypecache = None | |
683 | self.nodetagscache = None |
|
682 | self.nodetagscache = None | |
684 | self.branchcache = None |
|
683 | self.branchcache = None | |
685 | self._ubranchcache = None |
|
684 | self._ubranchcache = None | |
686 | self._branchcachetip = None |
|
685 | self._branchcachetip = None | |
687 |
|
686 | |||
688 | def _lock(self, lockname, wait, releasefn, acquirefn, desc): |
|
687 | def _lock(self, lockname, wait, releasefn, acquirefn, desc): | |
689 | try: |
|
688 | try: | |
690 | l = lock.lock(lockname, 0, releasefn, desc=desc) |
|
689 | l = lock.lock(lockname, 0, releasefn, desc=desc) | |
691 | except error.LockHeld, inst: |
|
690 | except error.LockHeld, inst: | |
692 | if not wait: |
|
691 | if not wait: | |
693 | raise |
|
692 | raise | |
694 | self.ui.warn(_("waiting for lock on %s held by %r\n") % |
|
693 | self.ui.warn(_("waiting for lock on %s held by %r\n") % | |
695 | (desc, inst.locker)) |
|
694 | (desc, inst.locker)) | |
696 | # default to 600 seconds timeout |
|
695 | # default to 600 seconds timeout | |
697 | l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")), |
|
696 | l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")), | |
698 | releasefn, desc=desc) |
|
697 | releasefn, desc=desc) | |
699 | if acquirefn: |
|
698 | if acquirefn: | |
700 | acquirefn() |
|
699 | acquirefn() | |
701 | return l |
|
700 | return l | |
702 |
|
701 | |||
703 | def lock(self, wait=True): |
|
702 | def lock(self, wait=True): | |
704 | l = self._lockref and self._lockref() |
|
703 | l = self._lockref and self._lockref() | |
705 | if l is not None and l.held: |
|
704 | if l is not None and l.held: | |
706 | l.lock() |
|
705 | l.lock() | |
707 | return l |
|
706 | return l | |
708 |
|
707 | |||
709 | l = self._lock(self.sjoin("lock"), wait, None, self.invalidate, |
|
708 | l = self._lock(self.sjoin("lock"), wait, None, self.invalidate, | |
710 | _('repository %s') % self.origroot) |
|
709 | _('repository %s') % self.origroot) | |
711 | self._lockref = weakref.ref(l) |
|
710 | self._lockref = weakref.ref(l) | |
712 | return l |
|
711 | return l | |
713 |
|
712 | |||
714 | def wlock(self, wait=True): |
|
713 | def wlock(self, wait=True): | |
715 | l = self._wlockref and self._wlockref() |
|
714 | l = self._wlockref and self._wlockref() | |
716 | if l is not None and l.held: |
|
715 | if l is not None and l.held: | |
717 | l.lock() |
|
716 | l.lock() | |
718 | return l |
|
717 | return l | |
719 |
|
718 | |||
720 | l = self._lock(self.join("wlock"), wait, self.dirstate.write, |
|
719 | l = self._lock(self.join("wlock"), wait, self.dirstate.write, | |
721 | self.dirstate.invalidate, _('working directory of %s') % |
|
720 | self.dirstate.invalidate, _('working directory of %s') % | |
722 | self.origroot) |
|
721 | self.origroot) | |
723 | self._wlockref = weakref.ref(l) |
|
722 | self._wlockref = weakref.ref(l) | |
724 | return l |
|
723 | return l | |
725 |
|
724 | |||
726 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): |
|
725 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): | |
727 | """ |
|
726 | """ | |
728 | commit an individual file as part of a larger transaction |
|
727 | commit an individual file as part of a larger transaction | |
729 | """ |
|
728 | """ | |
730 |
|
729 | |||
731 | fname = fctx.path() |
|
730 | fname = fctx.path() | |
732 | text = fctx.data() |
|
731 | text = fctx.data() | |
733 | flog = self.file(fname) |
|
732 | flog = self.file(fname) | |
734 | fparent1 = manifest1.get(fname, nullid) |
|
733 | fparent1 = manifest1.get(fname, nullid) | |
735 | fparent2 = fparent2o = manifest2.get(fname, nullid) |
|
734 | fparent2 = fparent2o = manifest2.get(fname, nullid) | |
736 |
|
735 | |||
737 | meta = {} |
|
736 | meta = {} | |
738 | copy = fctx.renamed() |
|
737 | copy = fctx.renamed() | |
739 | if copy and copy[0] != fname: |
|
738 | if copy and copy[0] != fname: | |
740 | # Mark the new revision of this file as a copy of another |
|
739 | # Mark the new revision of this file as a copy of another | |
741 | # file. This copy data will effectively act as a parent |
|
740 | # file. This copy data will effectively act as a parent | |
742 | # of this new revision. If this is a merge, the first |
|
741 | # of this new revision. If this is a merge, the first | |
743 | # parent will be the nullid (meaning "look up the copy data") |
|
742 | # parent will be the nullid (meaning "look up the copy data") | |
744 | # and the second one will be the other parent. For example: |
|
743 | # and the second one will be the other parent. For example: | |
745 | # |
|
744 | # | |
746 | # 0 --- 1 --- 3 rev1 changes file foo |
|
745 | # 0 --- 1 --- 3 rev1 changes file foo | |
747 | # \ / rev2 renames foo to bar and changes it |
|
746 | # \ / rev2 renames foo to bar and changes it | |
748 | # \- 2 -/ rev3 should have bar with all changes and |
|
747 | # \- 2 -/ rev3 should have bar with all changes and | |
749 | # should record that bar descends from |
|
748 | # should record that bar descends from | |
750 | # bar in rev2 and foo in rev1 |
|
749 | # bar in rev2 and foo in rev1 | |
751 | # |
|
750 | # | |
752 | # this allows this merge to succeed: |
|
751 | # this allows this merge to succeed: | |
753 | # |
|
752 | # | |
754 | # 0 --- 1 --- 3 rev4 reverts the content change from rev2 |
|
753 | # 0 --- 1 --- 3 rev4 reverts the content change from rev2 | |
755 | # \ / merging rev3 and rev4 should use bar@rev2 |
|
754 | # \ / merging rev3 and rev4 should use bar@rev2 | |
756 | # \- 2 --- 4 as the merge base |
|
755 | # \- 2 --- 4 as the merge base | |
757 | # |
|
756 | # | |
758 |
|
757 | |||
759 | cfname = copy[0] |
|
758 | cfname = copy[0] | |
760 | crev = manifest1.get(cfname) |
|
759 | crev = manifest1.get(cfname) | |
761 | newfparent = fparent2 |
|
760 | newfparent = fparent2 | |
762 |
|
761 | |||
763 | if manifest2: # branch merge |
|
762 | if manifest2: # branch merge | |
764 | if fparent2 == nullid or crev is None: # copied on remote side |
|
763 | if fparent2 == nullid or crev is None: # copied on remote side | |
765 | if cfname in manifest2: |
|
764 | if cfname in manifest2: | |
766 | crev = manifest2[cfname] |
|
765 | crev = manifest2[cfname] | |
767 | newfparent = fparent1 |
|
766 | newfparent = fparent1 | |
768 |
|
767 | |||
769 | # find source in nearest ancestor if we've lost track |
|
768 | # find source in nearest ancestor if we've lost track | |
770 | if not crev: |
|
769 | if not crev: | |
771 | self.ui.debug(_(" %s: searching for copy revision for %s\n") % |
|
770 | self.ui.debug(_(" %s: searching for copy revision for %s\n") % | |
772 | (fname, cfname)) |
|
771 | (fname, cfname)) | |
773 | for ancestor in self['.'].ancestors(): |
|
772 | for ancestor in self['.'].ancestors(): | |
774 | if cfname in ancestor: |
|
773 | if cfname in ancestor: | |
775 | crev = ancestor[cfname].filenode() |
|
774 | crev = ancestor[cfname].filenode() | |
776 | break |
|
775 | break | |
777 |
|
776 | |||
778 | self.ui.debug(_(" %s: copy %s:%s\n") % (fname, cfname, hex(crev))) |
|
777 | self.ui.debug(_(" %s: copy %s:%s\n") % (fname, cfname, hex(crev))) | |
779 | meta["copy"] = cfname |
|
778 | meta["copy"] = cfname | |
780 | meta["copyrev"] = hex(crev) |
|
779 | meta["copyrev"] = hex(crev) | |
781 | fparent1, fparent2 = nullid, newfparent |
|
780 | fparent1, fparent2 = nullid, newfparent | |
782 | elif fparent2 != nullid: |
|
781 | elif fparent2 != nullid: | |
783 | # is one parent an ancestor of the other? |
|
782 | # is one parent an ancestor of the other? | |
784 | fparentancestor = flog.ancestor(fparent1, fparent2) |
|
783 | fparentancestor = flog.ancestor(fparent1, fparent2) | |
785 | if fparentancestor == fparent1: |
|
784 | if fparentancestor == fparent1: | |
786 | fparent1, fparent2 = fparent2, nullid |
|
785 | fparent1, fparent2 = fparent2, nullid | |
787 | elif fparentancestor == fparent2: |
|
786 | elif fparentancestor == fparent2: | |
788 | fparent2 = nullid |
|
787 | fparent2 = nullid | |
789 |
|
788 | |||
790 | # is the file changed? |
|
789 | # is the file changed? | |
791 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
|
790 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: | |
792 | changelist.append(fname) |
|
791 | changelist.append(fname) | |
793 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
|
792 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) | |
794 |
|
793 | |||
795 | # are just the flags changed during merge? |
|
794 | # are just the flags changed during merge? | |
796 | if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): |
|
795 | if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): | |
797 | changelist.append(fname) |
|
796 | changelist.append(fname) | |
798 |
|
797 | |||
799 | return fparent1 |
|
798 | return fparent1 | |
800 |
|
799 | |||
801 | def commit(self, text="", user=None, date=None, match=None, force=False, |
|
800 | def commit(self, text="", user=None, date=None, match=None, force=False, | |
802 | editor=False, extra={}): |
|
801 | editor=False, extra={}): | |
803 | """Add a new revision to current repository. |
|
802 | """Add a new revision to current repository. | |
804 |
|
803 | |||
805 | Revision information is gathered from the working directory, |
|
804 | Revision information is gathered from the working directory, | |
806 | match can be used to filter the committed files. If editor is |
|
805 | match can be used to filter the committed files. If editor is | |
807 | supplied, it is called to get a commit message. |
|
806 | supplied, it is called to get a commit message. | |
808 | """ |
|
807 | """ | |
809 |
|
808 | |||
810 | def fail(f, msg): |
|
809 | def fail(f, msg): | |
811 | raise util.Abort('%s: %s' % (f, msg)) |
|
810 | raise util.Abort('%s: %s' % (f, msg)) | |
812 |
|
811 | |||
813 | if not match: |
|
812 | if not match: | |
814 | match = match_.always(self.root, '') |
|
813 | match = match_.always(self.root, '') | |
815 |
|
814 | |||
816 | if not force: |
|
815 | if not force: | |
817 | vdirs = [] |
|
816 | vdirs = [] | |
818 | match.dir = vdirs.append |
|
817 | match.dir = vdirs.append | |
819 | match.bad = fail |
|
818 | match.bad = fail | |
820 |
|
819 | |||
821 | wlock = self.wlock() |
|
820 | wlock = self.wlock() | |
822 | try: |
|
821 | try: | |
823 | p1, p2 = self.dirstate.parents() |
|
822 | p1, p2 = self.dirstate.parents() | |
824 | wctx = self[None] |
|
823 | wctx = self[None] | |
825 |
|
824 | |||
826 | if (not force and p2 != nullid and match and |
|
825 | if (not force and p2 != nullid and match and | |
827 | (match.files() or match.anypats())): |
|
826 | (match.files() or match.anypats())): | |
828 | raise util.Abort(_('cannot partially commit a merge ' |
|
827 | raise util.Abort(_('cannot partially commit a merge ' | |
829 | '(do not specify files or patterns)')) |
|
828 | '(do not specify files or patterns)')) | |
830 |
|
829 | |||
831 | changes = self.status(match=match, clean=force) |
|
830 | changes = self.status(match=match, clean=force) | |
832 | if force: |
|
831 | if force: | |
833 | changes[0].extend(changes[6]) # mq may commit unchanged files |
|
832 | changes[0].extend(changes[6]) # mq may commit unchanged files | |
834 |
|
833 | |||
835 | # check subrepos |
|
834 | # check subrepos | |
836 | subs = [] |
|
835 | subs = [] | |
837 | for s in wctx.substate: |
|
836 | for s in wctx.substate: | |
838 | if match(s) and wctx.sub(s).dirty(): |
|
837 | if match(s) and wctx.sub(s).dirty(): | |
839 | subs.append(s) |
|
838 | subs.append(s) | |
840 | if subs and '.hgsubstate' not in changes[0]: |
|
839 | if subs and '.hgsubstate' not in changes[0]: | |
841 | changes[0].insert(0, '.hgsubstate') |
|
840 | changes[0].insert(0, '.hgsubstate') | |
842 |
|
841 | |||
843 | # make sure all explicit patterns are matched |
|
842 | # make sure all explicit patterns are matched | |
844 | if not force and match.files(): |
|
843 | if not force and match.files(): | |
845 | matched = set(changes[0] + changes[1] + changes[2]) |
|
844 | matched = set(changes[0] + changes[1] + changes[2]) | |
846 |
|
845 | |||
847 | for f in match.files(): |
|
846 | for f in match.files(): | |
848 | if f == '.' or f in matched or f in wctx.substate: |
|
847 | if f == '.' or f in matched or f in wctx.substate: | |
849 | continue |
|
848 | continue | |
850 | if f in changes[3]: # missing |
|
849 | if f in changes[3]: # missing | |
851 | fail(f, _('file not found!')) |
|
850 | fail(f, _('file not found!')) | |
852 | if f in vdirs: # visited directory |
|
851 | if f in vdirs: # visited directory | |
853 | d = f + '/' |
|
852 | d = f + '/' | |
854 | for mf in matched: |
|
853 | for mf in matched: | |
855 | if mf.startswith(d): |
|
854 | if mf.startswith(d): | |
856 | break |
|
855 | break | |
857 | else: |
|
856 | else: | |
858 | fail(f, _("no match under directory!")) |
|
857 | fail(f, _("no match under directory!")) | |
859 | elif f not in self.dirstate: |
|
858 | elif f not in self.dirstate: | |
860 | fail(f, _("file not tracked!")) |
|
859 | fail(f, _("file not tracked!")) | |
861 |
|
860 | |||
862 | if (not force and not extra.get("close") and p2 == nullid |
|
861 | if (not force and not extra.get("close") and p2 == nullid | |
863 | and not (changes[0] or changes[1] or changes[2]) |
|
862 | and not (changes[0] or changes[1] or changes[2]) | |
864 | and self[None].branch() == self['.'].branch()): |
|
863 | and self[None].branch() == self['.'].branch()): | |
865 | return None |
|
864 | return None | |
866 |
|
865 | |||
867 | ms = merge_.mergestate(self) |
|
866 | ms = merge_.mergestate(self) | |
868 | for f in changes[0]: |
|
867 | for f in changes[0]: | |
869 | if f in ms and ms[f] == 'u': |
|
868 | if f in ms and ms[f] == 'u': | |
870 | raise util.Abort(_("unresolved merge conflicts " |
|
869 | raise util.Abort(_("unresolved merge conflicts " | |
871 | "(see hg resolve)")) |
|
870 | "(see hg resolve)")) | |
872 |
|
871 | |||
873 | cctx = context.workingctx(self, (p1, p2), text, user, date, |
|
872 | cctx = context.workingctx(self, (p1, p2), text, user, date, | |
874 | extra, changes) |
|
873 | extra, changes) | |
875 | if editor: |
|
874 | if editor: | |
876 | cctx._text = editor(self, cctx, subs) |
|
875 | cctx._text = editor(self, cctx, subs) | |
877 |
|
876 | |||
878 | # commit subs |
|
877 | # commit subs | |
879 | if subs: |
|
878 | if subs: | |
880 | state = wctx.substate.copy() |
|
879 | state = wctx.substate.copy() | |
881 | for s in subs: |
|
880 | for s in subs: | |
882 | self.ui.status(_('committing subrepository %s\n') % s) |
|
881 | self.ui.status(_('committing subrepository %s\n') % s) | |
883 | sr = wctx.sub(s).commit(cctx._text, user, date) |
|
882 | sr = wctx.sub(s).commit(cctx._text, user, date) | |
884 | state[s] = (state[s][0], sr) |
|
883 | state[s] = (state[s][0], sr) | |
885 | subrepo.writestate(self, state) |
|
884 | subrepo.writestate(self, state) | |
886 |
|
885 | |||
887 | ret = self.commitctx(cctx, True) |
|
886 | ret = self.commitctx(cctx, True) | |
888 |
|
887 | |||
889 | # update dirstate and mergestate |
|
888 | # update dirstate and mergestate | |
890 | for f in changes[0] + changes[1]: |
|
889 | for f in changes[0] + changes[1]: | |
891 | self.dirstate.normal(f) |
|
890 | self.dirstate.normal(f) | |
892 | for f in changes[2]: |
|
891 | for f in changes[2]: | |
893 | self.dirstate.forget(f) |
|
892 | self.dirstate.forget(f) | |
894 | self.dirstate.setparents(ret) |
|
893 | self.dirstate.setparents(ret) | |
895 | ms.reset() |
|
894 | ms.reset() | |
896 |
|
895 | |||
897 | return ret |
|
896 | return ret | |
898 |
|
897 | |||
899 | finally: |
|
898 | finally: | |
900 | wlock.release() |
|
899 | wlock.release() | |
901 |
|
900 | |||
902 | def commitctx(self, ctx, error=False): |
|
901 | def commitctx(self, ctx, error=False): | |
903 | """Add a new revision to current repository. |
|
902 | """Add a new revision to current repository. | |
904 |
|
903 | |||
905 | Revision information is passed via the context argument. |
|
904 | Revision information is passed via the context argument. | |
906 | """ |
|
905 | """ | |
907 |
|
906 | |||
908 | tr = lock = None |
|
907 | tr = lock = None | |
909 | removed = ctx.removed() |
|
908 | removed = ctx.removed() | |
910 | p1, p2 = ctx.p1(), ctx.p2() |
|
909 | p1, p2 = ctx.p1(), ctx.p2() | |
911 | m1 = p1.manifest().copy() |
|
910 | m1 = p1.manifest().copy() | |
912 | m2 = p2.manifest() |
|
911 | m2 = p2.manifest() | |
913 | user = ctx.user() |
|
912 | user = ctx.user() | |
914 |
|
913 | |||
915 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' |
|
914 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | |
916 | self.hook("precommit", throw=True, parent1=xp1, parent2=xp2) |
|
915 | self.hook("precommit", throw=True, parent1=xp1, parent2=xp2) | |
917 |
|
916 | |||
918 | lock = self.lock() |
|
917 | lock = self.lock() | |
919 | try: |
|
918 | try: | |
920 | tr = self.transaction() |
|
919 | tr = self.transaction() | |
921 | trp = weakref.proxy(tr) |
|
920 | trp = weakref.proxy(tr) | |
922 |
|
921 | |||
923 | # check in files |
|
922 | # check in files | |
924 | new = {} |
|
923 | new = {} | |
925 | changed = [] |
|
924 | changed = [] | |
926 | linkrev = len(self) |
|
925 | linkrev = len(self) | |
927 | for f in sorted(ctx.modified() + ctx.added()): |
|
926 | for f in sorted(ctx.modified() + ctx.added()): | |
928 | self.ui.note(f + "\n") |
|
927 | self.ui.note(f + "\n") | |
929 | try: |
|
928 | try: | |
930 | fctx = ctx[f] |
|
929 | fctx = ctx[f] | |
931 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, |
|
930 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, | |
932 | changed) |
|
931 | changed) | |
933 | m1.set(f, fctx.flags()) |
|
932 | m1.set(f, fctx.flags()) | |
934 | except (OSError, IOError): |
|
933 | except (OSError, IOError): | |
935 | if error: |
|
934 | if error: | |
936 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
935 | self.ui.warn(_("trouble committing %s!\n") % f) | |
937 | raise |
|
936 | raise | |
938 | else: |
|
937 | else: | |
939 | removed.append(f) |
|
938 | removed.append(f) | |
940 |
|
939 | |||
941 | # update manifest |
|
940 | # update manifest | |
942 | m1.update(new) |
|
941 | m1.update(new) | |
943 | removed = [f for f in sorted(removed) if f in m1 or f in m2] |
|
942 | removed = [f for f in sorted(removed) if f in m1 or f in m2] | |
944 | drop = [f for f in removed if f in m1] |
|
943 | drop = [f for f in removed if f in m1] | |
945 | for f in drop: |
|
944 | for f in drop: | |
946 | del m1[f] |
|
945 | del m1[f] | |
947 | mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(), |
|
946 | mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(), | |
948 | p2.manifestnode(), (new, drop)) |
|
947 | p2.manifestnode(), (new, drop)) | |
949 |
|
948 | |||
950 | # update changelog |
|
949 | # update changelog | |
951 | self.changelog.delayupdate() |
|
950 | self.changelog.delayupdate() | |
952 | n = self.changelog.add(mn, changed + removed, ctx.description(), |
|
951 | n = self.changelog.add(mn, changed + removed, ctx.description(), | |
953 | trp, p1.node(), p2.node(), |
|
952 | trp, p1.node(), p2.node(), | |
954 | user, ctx.date(), ctx.extra().copy()) |
|
953 | user, ctx.date(), ctx.extra().copy()) | |
955 | p = lambda: self.changelog.writepending() and self.root or "" |
|
954 | p = lambda: self.changelog.writepending() and self.root or "" | |
956 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
|
955 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | |
957 | parent2=xp2, pending=p) |
|
956 | parent2=xp2, pending=p) | |
958 | self.changelog.finalize(trp) |
|
957 | self.changelog.finalize(trp) | |
959 | tr.close() |
|
958 | tr.close() | |
960 |
|
959 | |||
961 | if self.branchcache: |
|
960 | if self.branchcache: | |
962 | self.branchtags() |
|
961 | self.branchtags() | |
963 |
|
962 | |||
964 | self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) |
|
963 | self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) | |
965 | return n |
|
964 | return n | |
966 | finally: |
|
965 | finally: | |
967 | del tr |
|
966 | del tr | |
968 | lock.release() |
|
967 | lock.release() | |
969 |
|
968 | |||
970 | def walk(self, match, node=None): |
|
969 | def walk(self, match, node=None): | |
971 | ''' |
|
970 | ''' | |
972 | walk recursively through the directory tree or a given |
|
971 | walk recursively through the directory tree or a given | |
973 | changeset, finding all files matched by the match |
|
972 | changeset, finding all files matched by the match | |
974 | function |
|
973 | function | |
975 | ''' |
|
974 | ''' | |
976 | return self[node].walk(match) |
|
975 | return self[node].walk(match) | |
977 |
|
976 | |||
978 | def status(self, node1='.', node2=None, match=None, |
|
977 | def status(self, node1='.', node2=None, match=None, | |
979 | ignored=False, clean=False, unknown=False): |
|
978 | ignored=False, clean=False, unknown=False): | |
980 | """return status of files between two nodes or node and working directory |
|
979 | """return status of files between two nodes or node and working directory | |
981 |
|
980 | |||
982 | If node1 is None, use the first dirstate parent instead. |
|
981 | If node1 is None, use the first dirstate parent instead. | |
983 | If node2 is None, compare node1 with working directory. |
|
982 | If node2 is None, compare node1 with working directory. | |
984 | """ |
|
983 | """ | |
985 |
|
984 | |||
986 | def mfmatches(ctx): |
|
985 | def mfmatches(ctx): | |
987 | mf = ctx.manifest().copy() |
|
986 | mf = ctx.manifest().copy() | |
988 | for fn in mf.keys(): |
|
987 | for fn in mf.keys(): | |
989 | if not match(fn): |
|
988 | if not match(fn): | |
990 | del mf[fn] |
|
989 | del mf[fn] | |
991 | return mf |
|
990 | return mf | |
992 |
|
991 | |||
993 | if isinstance(node1, context.changectx): |
|
992 | if isinstance(node1, context.changectx): | |
994 | ctx1 = node1 |
|
993 | ctx1 = node1 | |
995 | else: |
|
994 | else: | |
996 | ctx1 = self[node1] |
|
995 | ctx1 = self[node1] | |
997 | if isinstance(node2, context.changectx): |
|
996 | if isinstance(node2, context.changectx): | |
998 | ctx2 = node2 |
|
997 | ctx2 = node2 | |
999 | else: |
|
998 | else: | |
1000 | ctx2 = self[node2] |
|
999 | ctx2 = self[node2] | |
1001 |
|
1000 | |||
1002 | working = ctx2.rev() is None |
|
1001 | working = ctx2.rev() is None | |
1003 | parentworking = working and ctx1 == self['.'] |
|
1002 | parentworking = working and ctx1 == self['.'] | |
1004 | match = match or match_.always(self.root, self.getcwd()) |
|
1003 | match = match or match_.always(self.root, self.getcwd()) | |
1005 | listignored, listclean, listunknown = ignored, clean, unknown |
|
1004 | listignored, listclean, listunknown = ignored, clean, unknown | |
1006 |
|
1005 | |||
1007 | # load earliest manifest first for caching reasons |
|
1006 | # load earliest manifest first for caching reasons | |
1008 | if not working and ctx2.rev() < ctx1.rev(): |
|
1007 | if not working and ctx2.rev() < ctx1.rev(): | |
1009 | ctx2.manifest() |
|
1008 | ctx2.manifest() | |
1010 |
|
1009 | |||
1011 | if not parentworking: |
|
1010 | if not parentworking: | |
1012 | def bad(f, msg): |
|
1011 | def bad(f, msg): | |
1013 | if f not in ctx1: |
|
1012 | if f not in ctx1: | |
1014 | self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
|
1013 | self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) | |
1015 | match.bad = bad |
|
1014 | match.bad = bad | |
1016 |
|
1015 | |||
1017 | if working: # we need to scan the working dir |
|
1016 | if working: # we need to scan the working dir | |
1018 | s = self.dirstate.status(match, listignored, listclean, listunknown) |
|
1017 | s = self.dirstate.status(match, listignored, listclean, listunknown) | |
1019 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
|
1018 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s | |
1020 |
|
1019 | |||
1021 | # check for any possibly clean files |
|
1020 | # check for any possibly clean files | |
1022 | if parentworking and cmp: |
|
1021 | if parentworking and cmp: | |
1023 | fixup = [] |
|
1022 | fixup = [] | |
1024 | # do a full compare of any files that might have changed |
|
1023 | # do a full compare of any files that might have changed | |
1025 | for f in sorted(cmp): |
|
1024 | for f in sorted(cmp): | |
1026 | if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) |
|
1025 | if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) | |
1027 | or ctx1[f].cmp(ctx2[f].data())): |
|
1026 | or ctx1[f].cmp(ctx2[f].data())): | |
1028 | modified.append(f) |
|
1027 | modified.append(f) | |
1029 | else: |
|
1028 | else: | |
1030 | fixup.append(f) |
|
1029 | fixup.append(f) | |
1031 |
|
1030 | |||
1032 | if listclean: |
|
1031 | if listclean: | |
1033 | clean += fixup |
|
1032 | clean += fixup | |
1034 |
|
1033 | |||
1035 | # update dirstate for files that are actually clean |
|
1034 | # update dirstate for files that are actually clean | |
1036 | if fixup: |
|
1035 | if fixup: | |
1037 | try: |
|
1036 | try: | |
1038 | # updating the dirstate is optional |
|
1037 | # updating the dirstate is optional | |
1039 | # so we don't wait on the lock |
|
1038 | # so we don't wait on the lock | |
1040 | wlock = self.wlock(False) |
|
1039 | wlock = self.wlock(False) | |
1041 | try: |
|
1040 | try: | |
1042 | for f in fixup: |
|
1041 | for f in fixup: | |
1043 | self.dirstate.normal(f) |
|
1042 | self.dirstate.normal(f) | |
1044 | finally: |
|
1043 | finally: | |
1045 | wlock.release() |
|
1044 | wlock.release() | |
1046 | except error.LockError: |
|
1045 | except error.LockError: | |
1047 | pass |
|
1046 | pass | |
1048 |
|
1047 | |||
1049 | if not parentworking: |
|
1048 | if not parentworking: | |
1050 | mf1 = mfmatches(ctx1) |
|
1049 | mf1 = mfmatches(ctx1) | |
1051 | if working: |
|
1050 | if working: | |
1052 | # we are comparing working dir against non-parent |
|
1051 | # we are comparing working dir against non-parent | |
1053 | # generate a pseudo-manifest for the working dir |
|
1052 | # generate a pseudo-manifest for the working dir | |
1054 | mf2 = mfmatches(self['.']) |
|
1053 | mf2 = mfmatches(self['.']) | |
1055 | for f in cmp + modified + added: |
|
1054 | for f in cmp + modified + added: | |
1056 | mf2[f] = None |
|
1055 | mf2[f] = None | |
1057 | mf2.set(f, ctx2.flags(f)) |
|
1056 | mf2.set(f, ctx2.flags(f)) | |
1058 | for f in removed: |
|
1057 | for f in removed: | |
1059 | if f in mf2: |
|
1058 | if f in mf2: | |
1060 | del mf2[f] |
|
1059 | del mf2[f] | |
1061 | else: |
|
1060 | else: | |
1062 | # we are comparing two revisions |
|
1061 | # we are comparing two revisions | |
1063 | deleted, unknown, ignored = [], [], [] |
|
1062 | deleted, unknown, ignored = [], [], [] | |
1064 | mf2 = mfmatches(ctx2) |
|
1063 | mf2 = mfmatches(ctx2) | |
1065 |
|
1064 | |||
1066 | modified, added, clean = [], [], [] |
|
1065 | modified, added, clean = [], [], [] | |
1067 | for fn in mf2: |
|
1066 | for fn in mf2: | |
1068 | if fn in mf1: |
|
1067 | if fn in mf1: | |
1069 | if (mf1.flags(fn) != mf2.flags(fn) or |
|
1068 | if (mf1.flags(fn) != mf2.flags(fn) or | |
1070 | (mf1[fn] != mf2[fn] and |
|
1069 | (mf1[fn] != mf2[fn] and | |
1071 | (mf2[fn] or ctx1[fn].cmp(ctx2[fn].data())))): |
|
1070 | (mf2[fn] or ctx1[fn].cmp(ctx2[fn].data())))): | |
1072 | modified.append(fn) |
|
1071 | modified.append(fn) | |
1073 | elif listclean: |
|
1072 | elif listclean: | |
1074 | clean.append(fn) |
|
1073 | clean.append(fn) | |
1075 | del mf1[fn] |
|
1074 | del mf1[fn] | |
1076 | else: |
|
1075 | else: | |
1077 | added.append(fn) |
|
1076 | added.append(fn) | |
1078 | removed = mf1.keys() |
|
1077 | removed = mf1.keys() | |
1079 |
|
1078 | |||
1080 | r = modified, added, removed, deleted, unknown, ignored, clean |
|
1079 | r = modified, added, removed, deleted, unknown, ignored, clean | |
1081 | [l.sort() for l in r] |
|
1080 | [l.sort() for l in r] | |
1082 | return r |
|
1081 | return r | |
1083 |
|
1082 | |||
1084 | def add(self, list): |
|
1083 | def add(self, list): | |
1085 | wlock = self.wlock() |
|
1084 | wlock = self.wlock() | |
1086 | try: |
|
1085 | try: | |
1087 | rejected = [] |
|
1086 | rejected = [] | |
1088 | for f in list: |
|
1087 | for f in list: | |
1089 | p = self.wjoin(f) |
|
1088 | p = self.wjoin(f) | |
1090 | try: |
|
1089 | try: | |
1091 | st = os.lstat(p) |
|
1090 | st = os.lstat(p) | |
1092 | except: |
|
1091 | except: | |
1093 | self.ui.warn(_("%s does not exist!\n") % f) |
|
1092 | self.ui.warn(_("%s does not exist!\n") % f) | |
1094 | rejected.append(f) |
|
1093 | rejected.append(f) | |
1095 | continue |
|
1094 | continue | |
1096 | if st.st_size > 10000000: |
|
1095 | if st.st_size > 10000000: | |
1097 | self.ui.warn(_("%s: files over 10MB may cause memory and" |
|
1096 | self.ui.warn(_("%s: files over 10MB may cause memory and" | |
1098 | " performance problems\n" |
|
1097 | " performance problems\n" | |
1099 | "(use 'hg revert %s' to unadd the file)\n") |
|
1098 | "(use 'hg revert %s' to unadd the file)\n") | |
1100 | % (f, f)) |
|
1099 | % (f, f)) | |
1101 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): |
|
1100 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | |
1102 | self.ui.warn(_("%s not added: only files and symlinks " |
|
1101 | self.ui.warn(_("%s not added: only files and symlinks " | |
1103 | "supported currently\n") % f) |
|
1102 | "supported currently\n") % f) | |
1104 | rejected.append(p) |
|
1103 | rejected.append(p) | |
1105 | elif self.dirstate[f] in 'amn': |
|
1104 | elif self.dirstate[f] in 'amn': | |
1106 | self.ui.warn(_("%s already tracked!\n") % f) |
|
1105 | self.ui.warn(_("%s already tracked!\n") % f) | |
1107 | elif self.dirstate[f] == 'r': |
|
1106 | elif self.dirstate[f] == 'r': | |
1108 | self.dirstate.normallookup(f) |
|
1107 | self.dirstate.normallookup(f) | |
1109 | else: |
|
1108 | else: | |
1110 | self.dirstate.add(f) |
|
1109 | self.dirstate.add(f) | |
1111 | return rejected |
|
1110 | return rejected | |
1112 | finally: |
|
1111 | finally: | |
1113 | wlock.release() |
|
1112 | wlock.release() | |
1114 |
|
1113 | |||
1115 | def forget(self, list): |
|
1114 | def forget(self, list): | |
1116 | wlock = self.wlock() |
|
1115 | wlock = self.wlock() | |
1117 | try: |
|
1116 | try: | |
1118 | for f in list: |
|
1117 | for f in list: | |
1119 | if self.dirstate[f] != 'a': |
|
1118 | if self.dirstate[f] != 'a': | |
1120 | self.ui.warn(_("%s not added!\n") % f) |
|
1119 | self.ui.warn(_("%s not added!\n") % f) | |
1121 | else: |
|
1120 | else: | |
1122 | self.dirstate.forget(f) |
|
1121 | self.dirstate.forget(f) | |
1123 | finally: |
|
1122 | finally: | |
1124 | wlock.release() |
|
1123 | wlock.release() | |
1125 |
|
1124 | |||
1126 | def remove(self, list, unlink=False): |
|
1125 | def remove(self, list, unlink=False): | |
1127 | if unlink: |
|
1126 | if unlink: | |
1128 | for f in list: |
|
1127 | for f in list: | |
1129 | try: |
|
1128 | try: | |
1130 | util.unlink(self.wjoin(f)) |
|
1129 | util.unlink(self.wjoin(f)) | |
1131 | except OSError, inst: |
|
1130 | except OSError, inst: | |
1132 | if inst.errno != errno.ENOENT: |
|
1131 | if inst.errno != errno.ENOENT: | |
1133 | raise |
|
1132 | raise | |
1134 | wlock = self.wlock() |
|
1133 | wlock = self.wlock() | |
1135 | try: |
|
1134 | try: | |
1136 | for f in list: |
|
1135 | for f in list: | |
1137 | if unlink and os.path.exists(self.wjoin(f)): |
|
1136 | if unlink and os.path.exists(self.wjoin(f)): | |
1138 | self.ui.warn(_("%s still exists!\n") % f) |
|
1137 | self.ui.warn(_("%s still exists!\n") % f) | |
1139 | elif self.dirstate[f] == 'a': |
|
1138 | elif self.dirstate[f] == 'a': | |
1140 | self.dirstate.forget(f) |
|
1139 | self.dirstate.forget(f) | |
1141 | elif f not in self.dirstate: |
|
1140 | elif f not in self.dirstate: | |
1142 | self.ui.warn(_("%s not tracked!\n") % f) |
|
1141 | self.ui.warn(_("%s not tracked!\n") % f) | |
1143 | else: |
|
1142 | else: | |
1144 | self.dirstate.remove(f) |
|
1143 | self.dirstate.remove(f) | |
1145 | finally: |
|
1144 | finally: | |
1146 | wlock.release() |
|
1145 | wlock.release() | |
1147 |
|
1146 | |||
1148 | def undelete(self, list): |
|
1147 | def undelete(self, list): | |
1149 | manifests = [self.manifest.read(self.changelog.read(p)[0]) |
|
1148 | manifests = [self.manifest.read(self.changelog.read(p)[0]) | |
1150 | for p in self.dirstate.parents() if p != nullid] |
|
1149 | for p in self.dirstate.parents() if p != nullid] | |
1151 | wlock = self.wlock() |
|
1150 | wlock = self.wlock() | |
1152 | try: |
|
1151 | try: | |
1153 | for f in list: |
|
1152 | for f in list: | |
1154 | if self.dirstate[f] != 'r': |
|
1153 | if self.dirstate[f] != 'r': | |
1155 | self.ui.warn(_("%s not removed!\n") % f) |
|
1154 | self.ui.warn(_("%s not removed!\n") % f) | |
1156 | else: |
|
1155 | else: | |
1157 | m = f in manifests[0] and manifests[0] or manifests[1] |
|
1156 | m = f in manifests[0] and manifests[0] or manifests[1] | |
1158 | t = self.file(f).read(m[f]) |
|
1157 | t = self.file(f).read(m[f]) | |
1159 | self.wwrite(f, t, m.flags(f)) |
|
1158 | self.wwrite(f, t, m.flags(f)) | |
1160 | self.dirstate.normal(f) |
|
1159 | self.dirstate.normal(f) | |
1161 | finally: |
|
1160 | finally: | |
1162 | wlock.release() |
|
1161 | wlock.release() | |
1163 |
|
1162 | |||
1164 | def copy(self, source, dest): |
|
1163 | def copy(self, source, dest): | |
1165 | p = self.wjoin(dest) |
|
1164 | p = self.wjoin(dest) | |
1166 | if not (os.path.exists(p) or os.path.islink(p)): |
|
1165 | if not (os.path.exists(p) or os.path.islink(p)): | |
1167 | self.ui.warn(_("%s does not exist!\n") % dest) |
|
1166 | self.ui.warn(_("%s does not exist!\n") % dest) | |
1168 | elif not (os.path.isfile(p) or os.path.islink(p)): |
|
1167 | elif not (os.path.isfile(p) or os.path.islink(p)): | |
1169 | self.ui.warn(_("copy failed: %s is not a file or a " |
|
1168 | self.ui.warn(_("copy failed: %s is not a file or a " | |
1170 | "symbolic link\n") % dest) |
|
1169 | "symbolic link\n") % dest) | |
1171 | else: |
|
1170 | else: | |
1172 | wlock = self.wlock() |
|
1171 | wlock = self.wlock() | |
1173 | try: |
|
1172 | try: | |
1174 | if self.dirstate[dest] in '?r': |
|
1173 | if self.dirstate[dest] in '?r': | |
1175 | self.dirstate.add(dest) |
|
1174 | self.dirstate.add(dest) | |
1176 | self.dirstate.copy(source, dest) |
|
1175 | self.dirstate.copy(source, dest) | |
1177 | finally: |
|
1176 | finally: | |
1178 | wlock.release() |
|
1177 | wlock.release() | |
1179 |
|
1178 | |||
1180 | def heads(self, start=None): |
|
1179 | def heads(self, start=None): | |
1181 | heads = self.changelog.heads(start) |
|
1180 | heads = self.changelog.heads(start) | |
1182 | # sort the output in rev descending order |
|
1181 | # sort the output in rev descending order | |
1183 | heads = [(-self.changelog.rev(h), h) for h in heads] |
|
1182 | heads = [(-self.changelog.rev(h), h) for h in heads] | |
1184 | return [n for (r, n) in sorted(heads)] |
|
1183 | return [n for (r, n) in sorted(heads)] | |
1185 |
|
1184 | |||
1186 | def branchheads(self, branch=None, start=None, closed=False): |
|
1185 | def branchheads(self, branch=None, start=None, closed=False): | |
1187 | if branch is None: |
|
1186 | if branch is None: | |
1188 | branch = self[None].branch() |
|
1187 | branch = self[None].branch() | |
1189 | branches = self.branchmap() |
|
1188 | branches = self.branchmap() | |
1190 | if branch not in branches: |
|
1189 | if branch not in branches: | |
1191 | return [] |
|
1190 | return [] | |
1192 | bheads = branches[branch] |
|
1191 | bheads = branches[branch] | |
1193 | # the cache returns heads ordered lowest to highest |
|
1192 | # the cache returns heads ordered lowest to highest | |
1194 | bheads.reverse() |
|
1193 | bheads.reverse() | |
1195 | if start is not None: |
|
1194 | if start is not None: | |
1196 | # filter out the heads that cannot be reached from startrev |
|
1195 | # filter out the heads that cannot be reached from startrev | |
1197 | bheads = self.changelog.nodesbetween([start], bheads)[2] |
|
1196 | bheads = self.changelog.nodesbetween([start], bheads)[2] | |
1198 | if not closed: |
|
1197 | if not closed: | |
1199 | bheads = [h for h in bheads if |
|
1198 | bheads = [h for h in bheads if | |
1200 | ('close' not in self.changelog.read(h)[5])] |
|
1199 | ('close' not in self.changelog.read(h)[5])] | |
1201 | return bheads |
|
1200 | return bheads | |
1202 |
|
1201 | |||
1203 | def branches(self, nodes): |
|
1202 | def branches(self, nodes): | |
1204 | if not nodes: |
|
1203 | if not nodes: | |
1205 | nodes = [self.changelog.tip()] |
|
1204 | nodes = [self.changelog.tip()] | |
1206 | b = [] |
|
1205 | b = [] | |
1207 | for n in nodes: |
|
1206 | for n in nodes: | |
1208 | t = n |
|
1207 | t = n | |
1209 | while 1: |
|
1208 | while 1: | |
1210 | p = self.changelog.parents(n) |
|
1209 | p = self.changelog.parents(n) | |
1211 | if p[1] != nullid or p[0] == nullid: |
|
1210 | if p[1] != nullid or p[0] == nullid: | |
1212 | b.append((t, n, p[0], p[1])) |
|
1211 | b.append((t, n, p[0], p[1])) | |
1213 | break |
|
1212 | break | |
1214 | n = p[0] |
|
1213 | n = p[0] | |
1215 | return b |
|
1214 | return b | |
1216 |
|
1215 | |||
1217 | def between(self, pairs): |
|
1216 | def between(self, pairs): | |
1218 | r = [] |
|
1217 | r = [] | |
1219 |
|
1218 | |||
1220 | for top, bottom in pairs: |
|
1219 | for top, bottom in pairs: | |
1221 | n, l, i = top, [], 0 |
|
1220 | n, l, i = top, [], 0 | |
1222 | f = 1 |
|
1221 | f = 1 | |
1223 |
|
1222 | |||
1224 | while n != bottom and n != nullid: |
|
1223 | while n != bottom and n != nullid: | |
1225 | p = self.changelog.parents(n)[0] |
|
1224 | p = self.changelog.parents(n)[0] | |
1226 | if i == f: |
|
1225 | if i == f: | |
1227 | l.append(n) |
|
1226 | l.append(n) | |
1228 | f = f * 2 |
|
1227 | f = f * 2 | |
1229 | n = p |
|
1228 | n = p | |
1230 | i += 1 |
|
1229 | i += 1 | |
1231 |
|
1230 | |||
1232 | r.append(l) |
|
1231 | r.append(l) | |
1233 |
|
1232 | |||
1234 | return r |
|
1233 | return r | |
1235 |
|
1234 | |||
1236 | def findincoming(self, remote, base=None, heads=None, force=False): |
|
1235 | def findincoming(self, remote, base=None, heads=None, force=False): | |
1237 | """Return list of roots of the subsets of missing nodes from remote |
|
1236 | """Return list of roots of the subsets of missing nodes from remote | |
1238 |
|
1237 | |||
1239 | If base dict is specified, assume that these nodes and their parents |
|
1238 | If base dict is specified, assume that these nodes and their parents | |
1240 | exist on the remote side and that no child of a node of base exists |
|
1239 | exist on the remote side and that no child of a node of base exists | |
1241 | in both remote and self. |
|
1240 | in both remote and self. | |
1242 | Furthermore base will be updated to include the nodes that exists |
|
1241 | Furthermore base will be updated to include the nodes that exists | |
1243 | in self and remote but no children exists in self and remote. |
|
1242 | in self and remote but no children exists in self and remote. | |
1244 | If a list of heads is specified, return only nodes which are heads |
|
1243 | If a list of heads is specified, return only nodes which are heads | |
1245 | or ancestors of these heads. |
|
1244 | or ancestors of these heads. | |
1246 |
|
1245 | |||
1247 | All the ancestors of base are in self and in remote. |
|
1246 | All the ancestors of base are in self and in remote. | |
1248 | All the descendants of the list returned are missing in self. |
|
1247 | All the descendants of the list returned are missing in self. | |
1249 | (and so we know that the rest of the nodes are missing in remote, see |
|
1248 | (and so we know that the rest of the nodes are missing in remote, see | |
1250 | outgoing) |
|
1249 | outgoing) | |
1251 | """ |
|
1250 | """ | |
1252 | return self.findcommonincoming(remote, base, heads, force)[1] |
|
1251 | return self.findcommonincoming(remote, base, heads, force)[1] | |
1253 |
|
1252 | |||
1254 | def findcommonincoming(self, remote, base=None, heads=None, force=False): |
|
1253 | def findcommonincoming(self, remote, base=None, heads=None, force=False): | |
1255 | """Return a tuple (common, missing roots, heads) used to identify |
|
1254 | """Return a tuple (common, missing roots, heads) used to identify | |
1256 | missing nodes from remote. |
|
1255 | missing nodes from remote. | |
1257 |
|
1256 | |||
1258 | If base dict is specified, assume that these nodes and their parents |
|
1257 | If base dict is specified, assume that these nodes and their parents | |
1259 | exist on the remote side and that no child of a node of base exists |
|
1258 | exist on the remote side and that no child of a node of base exists | |
1260 | in both remote and self. |
|
1259 | in both remote and self. | |
1261 | Furthermore base will be updated to include the nodes that exists |
|
1260 | Furthermore base will be updated to include the nodes that exists | |
1262 | in self and remote but no children exists in self and remote. |
|
1261 | in self and remote but no children exists in self and remote. | |
1263 | If a list of heads is specified, return only nodes which are heads |
|
1262 | If a list of heads is specified, return only nodes which are heads | |
1264 | or ancestors of these heads. |
|
1263 | or ancestors of these heads. | |
1265 |
|
1264 | |||
1266 | All the ancestors of base are in self and in remote. |
|
1265 | All the ancestors of base are in self and in remote. | |
1267 | """ |
|
1266 | """ | |
1268 | m = self.changelog.nodemap |
|
1267 | m = self.changelog.nodemap | |
1269 | search = [] |
|
1268 | search = [] | |
1270 | fetch = set() |
|
1269 | fetch = set() | |
1271 | seen = set() |
|
1270 | seen = set() | |
1272 | seenbranch = set() |
|
1271 | seenbranch = set() | |
1273 | if base is None: |
|
1272 | if base is None: | |
1274 | base = {} |
|
1273 | base = {} | |
1275 |
|
1274 | |||
1276 | if not heads: |
|
1275 | if not heads: | |
1277 | heads = remote.heads() |
|
1276 | heads = remote.heads() | |
1278 |
|
1277 | |||
1279 | if self.changelog.tip() == nullid: |
|
1278 | if self.changelog.tip() == nullid: | |
1280 | base[nullid] = 1 |
|
1279 | base[nullid] = 1 | |
1281 | if heads != [nullid]: |
|
1280 | if heads != [nullid]: | |
1282 | return [nullid], [nullid], list(heads) |
|
1281 | return [nullid], [nullid], list(heads) | |
1283 | return [nullid], [], [] |
|
1282 | return [nullid], [], [] | |
1284 |
|
1283 | |||
1285 | # assume we're closer to the tip than the root |
|
1284 | # assume we're closer to the tip than the root | |
1286 | # and start by examining the heads |
|
1285 | # and start by examining the heads | |
1287 | self.ui.status(_("searching for changes\n")) |
|
1286 | self.ui.status(_("searching for changes\n")) | |
1288 |
|
1287 | |||
1289 | unknown = [] |
|
1288 | unknown = [] | |
1290 | for h in heads: |
|
1289 | for h in heads: | |
1291 | if h not in m: |
|
1290 | if h not in m: | |
1292 | unknown.append(h) |
|
1291 | unknown.append(h) | |
1293 | else: |
|
1292 | else: | |
1294 | base[h] = 1 |
|
1293 | base[h] = 1 | |
1295 |
|
1294 | |||
1296 | heads = unknown |
|
1295 | heads = unknown | |
1297 | if not unknown: |
|
1296 | if not unknown: | |
1298 | return base.keys(), [], [] |
|
1297 | return base.keys(), [], [] | |
1299 |
|
1298 | |||
1300 | req = set(unknown) |
|
1299 | req = set(unknown) | |
1301 | reqcnt = 0 |
|
1300 | reqcnt = 0 | |
1302 |
|
1301 | |||
1303 | # search through remote branches |
|
1302 | # search through remote branches | |
1304 | # a 'branch' here is a linear segment of history, with four parts: |
|
1303 | # a 'branch' here is a linear segment of history, with four parts: | |
1305 | # head, root, first parent, second parent |
|
1304 | # head, root, first parent, second parent | |
1306 | # (a branch always has two parents (or none) by definition) |
|
1305 | # (a branch always has two parents (or none) by definition) | |
1307 | unknown = remote.branches(unknown) |
|
1306 | unknown = remote.branches(unknown) | |
1308 | while unknown: |
|
1307 | while unknown: | |
1309 | r = [] |
|
1308 | r = [] | |
1310 | while unknown: |
|
1309 | while unknown: | |
1311 | n = unknown.pop(0) |
|
1310 | n = unknown.pop(0) | |
1312 | if n[0] in seen: |
|
1311 | if n[0] in seen: | |
1313 | continue |
|
1312 | continue | |
1314 |
|
1313 | |||
1315 | self.ui.debug(_("examining %s:%s\n") |
|
1314 | self.ui.debug(_("examining %s:%s\n") | |
1316 | % (short(n[0]), short(n[1]))) |
|
1315 | % (short(n[0]), short(n[1]))) | |
1317 | if n[0] == nullid: # found the end of the branch |
|
1316 | if n[0] == nullid: # found the end of the branch | |
1318 | pass |
|
1317 | pass | |
1319 | elif n in seenbranch: |
|
1318 | elif n in seenbranch: | |
1320 | self.ui.debug(_("branch already found\n")) |
|
1319 | self.ui.debug(_("branch already found\n")) | |
1321 | continue |
|
1320 | continue | |
1322 | elif n[1] and n[1] in m: # do we know the base? |
|
1321 | elif n[1] and n[1] in m: # do we know the base? | |
1323 | self.ui.debug(_("found incomplete branch %s:%s\n") |
|
1322 | self.ui.debug(_("found incomplete branch %s:%s\n") | |
1324 | % (short(n[0]), short(n[1]))) |
|
1323 | % (short(n[0]), short(n[1]))) | |
1325 | search.append(n[0:2]) # schedule branch range for scanning |
|
1324 | search.append(n[0:2]) # schedule branch range for scanning | |
1326 | seenbranch.add(n) |
|
1325 | seenbranch.add(n) | |
1327 | else: |
|
1326 | else: | |
1328 | if n[1] not in seen and n[1] not in fetch: |
|
1327 | if n[1] not in seen and n[1] not in fetch: | |
1329 | if n[2] in m and n[3] in m: |
|
1328 | if n[2] in m and n[3] in m: | |
1330 | self.ui.debug(_("found new changeset %s\n") % |
|
1329 | self.ui.debug(_("found new changeset %s\n") % | |
1331 | short(n[1])) |
|
1330 | short(n[1])) | |
1332 | fetch.add(n[1]) # earliest unknown |
|
1331 | fetch.add(n[1]) # earliest unknown | |
1333 | for p in n[2:4]: |
|
1332 | for p in n[2:4]: | |
1334 | if p in m: |
|
1333 | if p in m: | |
1335 | base[p] = 1 # latest known |
|
1334 | base[p] = 1 # latest known | |
1336 |
|
1335 | |||
1337 | for p in n[2:4]: |
|
1336 | for p in n[2:4]: | |
1338 | if p not in req and p not in m: |
|
1337 | if p not in req and p not in m: | |
1339 | r.append(p) |
|
1338 | r.append(p) | |
1340 | req.add(p) |
|
1339 | req.add(p) | |
1341 | seen.add(n[0]) |
|
1340 | seen.add(n[0]) | |
1342 |
|
1341 | |||
1343 | if r: |
|
1342 | if r: | |
1344 | reqcnt += 1 |
|
1343 | reqcnt += 1 | |
1345 | self.ui.debug(_("request %d: %s\n") % |
|
1344 | self.ui.debug(_("request %d: %s\n") % | |
1346 | (reqcnt, " ".join(map(short, r)))) |
|
1345 | (reqcnt, " ".join(map(short, r)))) | |
1347 | for p in xrange(0, len(r), 10): |
|
1346 | for p in xrange(0, len(r), 10): | |
1348 | for b in remote.branches(r[p:p+10]): |
|
1347 | for b in remote.branches(r[p:p+10]): | |
1349 | self.ui.debug(_("received %s:%s\n") % |
|
1348 | self.ui.debug(_("received %s:%s\n") % | |
1350 | (short(b[0]), short(b[1]))) |
|
1349 | (short(b[0]), short(b[1]))) | |
1351 | unknown.append(b) |
|
1350 | unknown.append(b) | |
1352 |
|
1351 | |||
1353 | # do binary search on the branches we found |
|
1352 | # do binary search on the branches we found | |
1354 | while search: |
|
1353 | while search: | |
1355 | newsearch = [] |
|
1354 | newsearch = [] | |
1356 | reqcnt += 1 |
|
1355 | reqcnt += 1 | |
1357 | for n, l in zip(search, remote.between(search)): |
|
1356 | for n, l in zip(search, remote.between(search)): | |
1358 | l.append(n[1]) |
|
1357 | l.append(n[1]) | |
1359 | p = n[0] |
|
1358 | p = n[0] | |
1360 | f = 1 |
|
1359 | f = 1 | |
1361 | for i in l: |
|
1360 | for i in l: | |
1362 | self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i))) |
|
1361 | self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i))) | |
1363 | if i in m: |
|
1362 | if i in m: | |
1364 | if f <= 2: |
|
1363 | if f <= 2: | |
1365 | self.ui.debug(_("found new branch changeset %s\n") % |
|
1364 | self.ui.debug(_("found new branch changeset %s\n") % | |
1366 | short(p)) |
|
1365 | short(p)) | |
1367 | fetch.add(p) |
|
1366 | fetch.add(p) | |
1368 | base[i] = 1 |
|
1367 | base[i] = 1 | |
1369 | else: |
|
1368 | else: | |
1370 | self.ui.debug(_("narrowed branch search to %s:%s\n") |
|
1369 | self.ui.debug(_("narrowed branch search to %s:%s\n") | |
1371 | % (short(p), short(i))) |
|
1370 | % (short(p), short(i))) | |
1372 | newsearch.append((p, i)) |
|
1371 | newsearch.append((p, i)) | |
1373 | break |
|
1372 | break | |
1374 | p, f = i, f * 2 |
|
1373 | p, f = i, f * 2 | |
1375 | search = newsearch |
|
1374 | search = newsearch | |
1376 |
|
1375 | |||
1377 | # sanity check our fetch list |
|
1376 | # sanity check our fetch list | |
1378 | for f in fetch: |
|
1377 | for f in fetch: | |
1379 | if f in m: |
|
1378 | if f in m: | |
1380 | raise error.RepoError(_("already have changeset ") |
|
1379 | raise error.RepoError(_("already have changeset ") | |
1381 | + short(f[:4])) |
|
1380 | + short(f[:4])) | |
1382 |
|
1381 | |||
1383 | if base.keys() == [nullid]: |
|
1382 | if base.keys() == [nullid]: | |
1384 | if force: |
|
1383 | if force: | |
1385 | self.ui.warn(_("warning: repository is unrelated\n")) |
|
1384 | self.ui.warn(_("warning: repository is unrelated\n")) | |
1386 | else: |
|
1385 | else: | |
1387 | raise util.Abort(_("repository is unrelated")) |
|
1386 | raise util.Abort(_("repository is unrelated")) | |
1388 |
|
1387 | |||
1389 | self.ui.debug(_("found new changesets starting at ") + |
|
1388 | self.ui.debug(_("found new changesets starting at ") + | |
1390 | " ".join([short(f) for f in fetch]) + "\n") |
|
1389 | " ".join([short(f) for f in fetch]) + "\n") | |
1391 |
|
1390 | |||
1392 | self.ui.debug(_("%d total queries\n") % reqcnt) |
|
1391 | self.ui.debug(_("%d total queries\n") % reqcnt) | |
1393 |
|
1392 | |||
1394 | return base.keys(), list(fetch), heads |
|
1393 | return base.keys(), list(fetch), heads | |
1395 |
|
1394 | |||
1396 | def findoutgoing(self, remote, base=None, heads=None, force=False): |
|
1395 | def findoutgoing(self, remote, base=None, heads=None, force=False): | |
1397 | """Return list of nodes that are roots of subsets not in remote |
|
1396 | """Return list of nodes that are roots of subsets not in remote | |
1398 |
|
1397 | |||
1399 | If base dict is specified, assume that these nodes and their parents |
|
1398 | If base dict is specified, assume that these nodes and their parents | |
1400 | exist on the remote side. |
|
1399 | exist on the remote side. | |
1401 | If a list of heads is specified, return only nodes which are heads |
|
1400 | If a list of heads is specified, return only nodes which are heads | |
1402 | or ancestors of these heads, and return a second element which |
|
1401 | or ancestors of these heads, and return a second element which | |
1403 | contains all remote heads which get new children. |
|
1402 | contains all remote heads which get new children. | |
1404 | """ |
|
1403 | """ | |
1405 | if base is None: |
|
1404 | if base is None: | |
1406 | base = {} |
|
1405 | base = {} | |
1407 | self.findincoming(remote, base, heads, force=force) |
|
1406 | self.findincoming(remote, base, heads, force=force) | |
1408 |
|
1407 | |||
1409 | self.ui.debug(_("common changesets up to ") |
|
1408 | self.ui.debug(_("common changesets up to ") | |
1410 | + " ".join(map(short, base.keys())) + "\n") |
|
1409 | + " ".join(map(short, base.keys())) + "\n") | |
1411 |
|
1410 | |||
1412 | remain = set(self.changelog.nodemap) |
|
1411 | remain = set(self.changelog.nodemap) | |
1413 |
|
1412 | |||
1414 | # prune everything remote has from the tree |
|
1413 | # prune everything remote has from the tree | |
1415 | remain.remove(nullid) |
|
1414 | remain.remove(nullid) | |
1416 | remove = base.keys() |
|
1415 | remove = base.keys() | |
1417 | while remove: |
|
1416 | while remove: | |
1418 | n = remove.pop(0) |
|
1417 | n = remove.pop(0) | |
1419 | if n in remain: |
|
1418 | if n in remain: | |
1420 | remain.remove(n) |
|
1419 | remain.remove(n) | |
1421 | for p in self.changelog.parents(n): |
|
1420 | for p in self.changelog.parents(n): | |
1422 | remove.append(p) |
|
1421 | remove.append(p) | |
1423 |
|
1422 | |||
1424 | # find every node whose parents have been pruned |
|
1423 | # find every node whose parents have been pruned | |
1425 | subset = [] |
|
1424 | subset = [] | |
1426 | # find every remote head that will get new children |
|
1425 | # find every remote head that will get new children | |
1427 | updated_heads = set() |
|
1426 | updated_heads = set() | |
1428 | for n in remain: |
|
1427 | for n in remain: | |
1429 | p1, p2 = self.changelog.parents(n) |
|
1428 | p1, p2 = self.changelog.parents(n) | |
1430 | if p1 not in remain and p2 not in remain: |
|
1429 | if p1 not in remain and p2 not in remain: | |
1431 | subset.append(n) |
|
1430 | subset.append(n) | |
1432 | if heads: |
|
1431 | if heads: | |
1433 | if p1 in heads: |
|
1432 | if p1 in heads: | |
1434 | updated_heads.add(p1) |
|
1433 | updated_heads.add(p1) | |
1435 | if p2 in heads: |
|
1434 | if p2 in heads: | |
1436 | updated_heads.add(p2) |
|
1435 | updated_heads.add(p2) | |
1437 |
|
1436 | |||
1438 | # this is the set of all roots we have to push |
|
1437 | # this is the set of all roots we have to push | |
1439 | if heads: |
|
1438 | if heads: | |
1440 | return subset, list(updated_heads) |
|
1439 | return subset, list(updated_heads) | |
1441 | else: |
|
1440 | else: | |
1442 | return subset |
|
1441 | return subset | |
1443 |
|
1442 | |||
1444 | def pull(self, remote, heads=None, force=False): |
|
1443 | def pull(self, remote, heads=None, force=False): | |
1445 | lock = self.lock() |
|
1444 | lock = self.lock() | |
1446 | try: |
|
1445 | try: | |
1447 | common, fetch, rheads = self.findcommonincoming(remote, heads=heads, |
|
1446 | common, fetch, rheads = self.findcommonincoming(remote, heads=heads, | |
1448 | force=force) |
|
1447 | force=force) | |
1449 | if fetch == [nullid]: |
|
1448 | if fetch == [nullid]: | |
1450 | self.ui.status(_("requesting all changes\n")) |
|
1449 | self.ui.status(_("requesting all changes\n")) | |
1451 |
|
1450 | |||
1452 | if not fetch: |
|
1451 | if not fetch: | |
1453 | self.ui.status(_("no changes found\n")) |
|
1452 | self.ui.status(_("no changes found\n")) | |
1454 | return 0 |
|
1453 | return 0 | |
1455 |
|
1454 | |||
1456 | if heads is None and remote.capable('changegroupsubset'): |
|
1455 | if heads is None and remote.capable('changegroupsubset'): | |
1457 | heads = rheads |
|
1456 | heads = rheads | |
1458 |
|
1457 | |||
1459 | if heads is None: |
|
1458 | if heads is None: | |
1460 | cg = remote.changegroup(fetch, 'pull') |
|
1459 | cg = remote.changegroup(fetch, 'pull') | |
1461 | else: |
|
1460 | else: | |
1462 | if not remote.capable('changegroupsubset'): |
|
1461 | if not remote.capable('changegroupsubset'): | |
1463 | raise util.Abort(_("Partial pull cannot be done because " |
|
1462 | raise util.Abort(_("Partial pull cannot be done because " | |
1464 | "other repository doesn't support " |
|
1463 | "other repository doesn't support " | |
1465 | "changegroupsubset.")) |
|
1464 | "changegroupsubset.")) | |
1466 | cg = remote.changegroupsubset(fetch, heads, 'pull') |
|
1465 | cg = remote.changegroupsubset(fetch, heads, 'pull') | |
1467 | return self.addchangegroup(cg, 'pull', remote.url()) |
|
1466 | return self.addchangegroup(cg, 'pull', remote.url()) | |
1468 | finally: |
|
1467 | finally: | |
1469 | lock.release() |
|
1468 | lock.release() | |
1470 |
|
1469 | |||
1471 | def push(self, remote, force=False, revs=None): |
|
1470 | def push(self, remote, force=False, revs=None): | |
1472 | # there are two ways to push to remote repo: |
|
1471 | # there are two ways to push to remote repo: | |
1473 | # |
|
1472 | # | |
1474 | # addchangegroup assumes local user can lock remote |
|
1473 | # addchangegroup assumes local user can lock remote | |
1475 | # repo (local filesystem, old ssh servers). |
|
1474 | # repo (local filesystem, old ssh servers). | |
1476 | # |
|
1475 | # | |
1477 | # unbundle assumes local user cannot lock remote repo (new ssh |
|
1476 | # unbundle assumes local user cannot lock remote repo (new ssh | |
1478 | # servers, http servers). |
|
1477 | # servers, http servers). | |
1479 |
|
1478 | |||
1480 | if remote.capable('unbundle'): |
|
1479 | if remote.capable('unbundle'): | |
1481 | return self.push_unbundle(remote, force, revs) |
|
1480 | return self.push_unbundle(remote, force, revs) | |
1482 | return self.push_addchangegroup(remote, force, revs) |
|
1481 | return self.push_addchangegroup(remote, force, revs) | |
1483 |
|
1482 | |||
1484 | def prepush(self, remote, force, revs): |
|
1483 | def prepush(self, remote, force, revs): | |
1485 | common = {} |
|
1484 | common = {} | |
1486 | remote_heads = remote.heads() |
|
1485 | remote_heads = remote.heads() | |
1487 | inc = self.findincoming(remote, common, remote_heads, force=force) |
|
1486 | inc = self.findincoming(remote, common, remote_heads, force=force) | |
1488 |
|
1487 | |||
1489 | update, updated_heads = self.findoutgoing(remote, common, remote_heads) |
|
1488 | update, updated_heads = self.findoutgoing(remote, common, remote_heads) | |
1490 | if revs is not None: |
|
1489 | if revs is not None: | |
1491 | msng_cl, bases, heads = self.changelog.nodesbetween(update, revs) |
|
1490 | msng_cl, bases, heads = self.changelog.nodesbetween(update, revs) | |
1492 | else: |
|
1491 | else: | |
1493 | bases, heads = update, self.changelog.heads() |
|
1492 | bases, heads = update, self.changelog.heads() | |
1494 |
|
1493 | |||
1495 | def checkbranch(lheads, rheads, updatelh): |
|
1494 | def checkbranch(lheads, rheads, updatelh): | |
1496 | ''' |
|
1495 | ''' | |
1497 | check whether there are more local heads than remote heads on |
|
1496 | check whether there are more local heads than remote heads on | |
1498 | a specific branch. |
|
1497 | a specific branch. | |
1499 |
|
1498 | |||
1500 | lheads: local branch heads |
|
1499 | lheads: local branch heads | |
1501 | rheads: remote branch heads |
|
1500 | rheads: remote branch heads | |
1502 | updatelh: outgoing local branch heads |
|
1501 | updatelh: outgoing local branch heads | |
1503 | ''' |
|
1502 | ''' | |
1504 |
|
1503 | |||
1505 | warn = 0 |
|
1504 | warn = 0 | |
1506 |
|
1505 | |||
1507 | if not revs and len(lheads) > len(rheads): |
|
1506 | if not revs and len(lheads) > len(rheads): | |
1508 | warn = 1 |
|
1507 | warn = 1 | |
1509 | else: |
|
1508 | else: | |
1510 | updatelheads = [self.changelog.heads(x, lheads) |
|
1509 | updatelheads = [self.changelog.heads(x, lheads) | |
1511 | for x in updatelh] |
|
1510 | for x in updatelh] | |
1512 | newheads = set(sum(updatelheads, [])) & set(lheads) |
|
1511 | newheads = set(sum(updatelheads, [])) & set(lheads) | |
1513 |
|
1512 | |||
1514 | if not newheads: |
|
1513 | if not newheads: | |
1515 | return True |
|
1514 | return True | |
1516 |
|
1515 | |||
1517 | for r in rheads: |
|
1516 | for r in rheads: | |
1518 | if r in self.changelog.nodemap: |
|
1517 | if r in self.changelog.nodemap: | |
1519 | desc = self.changelog.heads(r, heads) |
|
1518 | desc = self.changelog.heads(r, heads) | |
1520 | l = [h for h in heads if h in desc] |
|
1519 | l = [h for h in heads if h in desc] | |
1521 | if not l: |
|
1520 | if not l: | |
1522 | newheads.add(r) |
|
1521 | newheads.add(r) | |
1523 | else: |
|
1522 | else: | |
1524 | newheads.add(r) |
|
1523 | newheads.add(r) | |
1525 | if len(newheads) > len(rheads): |
|
1524 | if len(newheads) > len(rheads): | |
1526 | warn = 1 |
|
1525 | warn = 1 | |
1527 |
|
1526 | |||
1528 | if warn: |
|
1527 | if warn: | |
1529 | if not rheads: # new branch requires --force |
|
1528 | if not rheads: # new branch requires --force | |
1530 | self.ui.warn(_("abort: push creates new" |
|
1529 | self.ui.warn(_("abort: push creates new" | |
1531 | " remote branch '%s'!\n") % |
|
1530 | " remote branch '%s'!\n") % | |
1532 | self[updatelh[0]].branch()) |
|
1531 | self[updatelh[0]].branch()) | |
1533 | else: |
|
1532 | else: | |
1534 | self.ui.warn(_("abort: push creates new remote heads!\n")) |
|
1533 | self.ui.warn(_("abort: push creates new remote heads!\n")) | |
1535 |
|
1534 | |||
1536 | self.ui.status(_("(did you forget to merge?" |
|
1535 | self.ui.status(_("(did you forget to merge?" | |
1537 | " use push -f to force)\n")) |
|
1536 | " use push -f to force)\n")) | |
1538 | return False |
|
1537 | return False | |
1539 | return True |
|
1538 | return True | |
1540 |
|
1539 | |||
1541 | if not bases: |
|
1540 | if not bases: | |
1542 | self.ui.status(_("no changes found\n")) |
|
1541 | self.ui.status(_("no changes found\n")) | |
1543 | return None, 1 |
|
1542 | return None, 1 | |
1544 | elif not force: |
|
1543 | elif not force: | |
1545 | # Check for each named branch if we're creating new remote heads. |
|
1544 | # Check for each named branch if we're creating new remote heads. | |
1546 | # To be a remote head after push, node must be either: |
|
1545 | # To be a remote head after push, node must be either: | |
1547 | # - unknown locally |
|
1546 | # - unknown locally | |
1548 | # - a local outgoing head descended from update |
|
1547 | # - a local outgoing head descended from update | |
1549 | # - a remote head that's known locally and not |
|
1548 | # - a remote head that's known locally and not | |
1550 | # ancestral to an outgoing head |
|
1549 | # ancestral to an outgoing head | |
1551 | # |
|
1550 | # | |
1552 | # New named branches cannot be created without --force. |
|
1551 | # New named branches cannot be created without --force. | |
1553 |
|
1552 | |||
1554 | if remote_heads != [nullid]: |
|
1553 | if remote_heads != [nullid]: | |
1555 | if remote.capable('branchmap'): |
|
1554 | if remote.capable('branchmap'): | |
1556 | localhds = {} |
|
1555 | localhds = {} | |
1557 | if not revs: |
|
1556 | if not revs: | |
1558 | localhds = self.branchmap() |
|
1557 | localhds = self.branchmap() | |
1559 | else: |
|
1558 | else: | |
1560 | for n in heads: |
|
1559 | for n in heads: | |
1561 | branch = self[n].branch() |
|
1560 | branch = self[n].branch() | |
1562 | if branch in localhds: |
|
1561 | if branch in localhds: | |
1563 | localhds[branch].append(n) |
|
1562 | localhds[branch].append(n) | |
1564 | else: |
|
1563 | else: | |
1565 | localhds[branch] = [n] |
|
1564 | localhds[branch] = [n] | |
1566 |
|
1565 | |||
1567 | remotehds = remote.branchmap() |
|
1566 | remotehds = remote.branchmap() | |
1568 |
|
1567 | |||
1569 | for lh in localhds: |
|
1568 | for lh in localhds: | |
1570 | if lh in remotehds: |
|
1569 | if lh in remotehds: | |
1571 | rheads = remotehds[lh] |
|
1570 | rheads = remotehds[lh] | |
1572 | else: |
|
1571 | else: | |
1573 | rheads = [] |
|
1572 | rheads = [] | |
1574 | lheads = localhds[lh] |
|
1573 | lheads = localhds[lh] | |
1575 | updatelh = [upd for upd in update |
|
1574 | updatelh = [upd for upd in update | |
1576 | if self[upd].branch() == lh] |
|
1575 | if self[upd].branch() == lh] | |
1577 | if not updatelh: |
|
1576 | if not updatelh: | |
1578 | continue |
|
1577 | continue | |
1579 | if not checkbranch(lheads, rheads, updatelh): |
|
1578 | if not checkbranch(lheads, rheads, updatelh): | |
1580 | return None, 0 |
|
1579 | return None, 0 | |
1581 | else: |
|
1580 | else: | |
1582 | if not checkbranch(heads, remote_heads, update): |
|
1581 | if not checkbranch(heads, remote_heads, update): | |
1583 | return None, 0 |
|
1582 | return None, 0 | |
1584 |
|
1583 | |||
1585 | if inc: |
|
1584 | if inc: | |
1586 | self.ui.warn(_("note: unsynced remote changes!\n")) |
|
1585 | self.ui.warn(_("note: unsynced remote changes!\n")) | |
1587 |
|
1586 | |||
1588 |
|
1587 | |||
1589 | if revs is None: |
|
1588 | if revs is None: | |
1590 | # use the fast path, no race possible on push |
|
1589 | # use the fast path, no race possible on push | |
1591 | cg = self._changegroup(common.keys(), 'push') |
|
1590 | cg = self._changegroup(common.keys(), 'push') | |
1592 | else: |
|
1591 | else: | |
1593 | cg = self.changegroupsubset(update, revs, 'push') |
|
1592 | cg = self.changegroupsubset(update, revs, 'push') | |
1594 | return cg, remote_heads |
|
1593 | return cg, remote_heads | |
1595 |
|
1594 | |||
1596 | def push_addchangegroup(self, remote, force, revs): |
|
1595 | def push_addchangegroup(self, remote, force, revs): | |
1597 | lock = remote.lock() |
|
1596 | lock = remote.lock() | |
1598 | try: |
|
1597 | try: | |
1599 | ret = self.prepush(remote, force, revs) |
|
1598 | ret = self.prepush(remote, force, revs) | |
1600 | if ret[0] is not None: |
|
1599 | if ret[0] is not None: | |
1601 | cg, remote_heads = ret |
|
1600 | cg, remote_heads = ret | |
1602 | return remote.addchangegroup(cg, 'push', self.url()) |
|
1601 | return remote.addchangegroup(cg, 'push', self.url()) | |
1603 | return ret[1] |
|
1602 | return ret[1] | |
1604 | finally: |
|
1603 | finally: | |
1605 | lock.release() |
|
1604 | lock.release() | |
1606 |
|
1605 | |||
1607 | def push_unbundle(self, remote, force, revs): |
|
1606 | def push_unbundle(self, remote, force, revs): | |
1608 | # local repo finds heads on server, finds out what revs it |
|
1607 | # local repo finds heads on server, finds out what revs it | |
1609 | # must push. once revs transferred, if server finds it has |
|
1608 | # must push. once revs transferred, if server finds it has | |
1610 | # different heads (someone else won commit/push race), server |
|
1609 | # different heads (someone else won commit/push race), server | |
1611 | # aborts. |
|
1610 | # aborts. | |
1612 |
|
1611 | |||
1613 | ret = self.prepush(remote, force, revs) |
|
1612 | ret = self.prepush(remote, force, revs) | |
1614 | if ret[0] is not None: |
|
1613 | if ret[0] is not None: | |
1615 | cg, remote_heads = ret |
|
1614 | cg, remote_heads = ret | |
1616 | if force: remote_heads = ['force'] |
|
1615 | if force: remote_heads = ['force'] | |
1617 | return remote.unbundle(cg, remote_heads, 'push') |
|
1616 | return remote.unbundle(cg, remote_heads, 'push') | |
1618 | return ret[1] |
|
1617 | return ret[1] | |
1619 |
|
1618 | |||
1620 | def changegroupinfo(self, nodes, source): |
|
1619 | def changegroupinfo(self, nodes, source): | |
1621 | if self.ui.verbose or source == 'bundle': |
|
1620 | if self.ui.verbose or source == 'bundle': | |
1622 | self.ui.status(_("%d changesets found\n") % len(nodes)) |
|
1621 | self.ui.status(_("%d changesets found\n") % len(nodes)) | |
1623 | if self.ui.debugflag: |
|
1622 | if self.ui.debugflag: | |
1624 | self.ui.debug(_("list of changesets:\n")) |
|
1623 | self.ui.debug(_("list of changesets:\n")) | |
1625 | for node in nodes: |
|
1624 | for node in nodes: | |
1626 | self.ui.debug("%s\n" % hex(node)) |
|
1625 | self.ui.debug("%s\n" % hex(node)) | |
1627 |
|
1626 | |||
1628 | def changegroupsubset(self, bases, heads, source, extranodes=None): |
|
1627 | def changegroupsubset(self, bases, heads, source, extranodes=None): | |
1629 | """This function generates a changegroup consisting of all the nodes |
|
1628 | """This function generates a changegroup consisting of all the nodes | |
1630 | that are descendents of any of the bases, and ancestors of any of |
|
1629 | that are descendents of any of the bases, and ancestors of any of | |
1631 | the heads. |
|
1630 | the heads. | |
1632 |
|
1631 | |||
1633 | It is fairly complex as determining which filenodes and which |
|
1632 | It is fairly complex as determining which filenodes and which | |
1634 | manifest nodes need to be included for the changeset to be complete |
|
1633 | manifest nodes need to be included for the changeset to be complete | |
1635 | is non-trivial. |
|
1634 | is non-trivial. | |
1636 |
|
1635 | |||
1637 | Another wrinkle is doing the reverse, figuring out which changeset in |
|
1636 | Another wrinkle is doing the reverse, figuring out which changeset in | |
1638 | the changegroup a particular filenode or manifestnode belongs to. |
|
1637 | the changegroup a particular filenode or manifestnode belongs to. | |
1639 |
|
1638 | |||
1640 | The caller can specify some nodes that must be included in the |
|
1639 | The caller can specify some nodes that must be included in the | |
1641 | changegroup using the extranodes argument. It should be a dict |
|
1640 | changegroup using the extranodes argument. It should be a dict | |
1642 | where the keys are the filenames (or 1 for the manifest), and the |
|
1641 | where the keys are the filenames (or 1 for the manifest), and the | |
1643 | values are lists of (node, linknode) tuples, where node is a wanted |
|
1642 | values are lists of (node, linknode) tuples, where node is a wanted | |
1644 | node and linknode is the changelog node that should be transmitted as |
|
1643 | node and linknode is the changelog node that should be transmitted as | |
1645 | the linkrev. |
|
1644 | the linkrev. | |
1646 | """ |
|
1645 | """ | |
1647 |
|
1646 | |||
1648 | if extranodes is None: |
|
1647 | if extranodes is None: | |
1649 | # can we go through the fast path ? |
|
1648 | # can we go through the fast path ? | |
1650 | heads.sort() |
|
1649 | heads.sort() | |
1651 | allheads = self.heads() |
|
1650 | allheads = self.heads() | |
1652 | allheads.sort() |
|
1651 | allheads.sort() | |
1653 | if heads == allheads: |
|
1652 | if heads == allheads: | |
1654 | common = [] |
|
1653 | common = [] | |
1655 | # parents of bases are known from both sides |
|
1654 | # parents of bases are known from both sides | |
1656 | for n in bases: |
|
1655 | for n in bases: | |
1657 | for p in self.changelog.parents(n): |
|
1656 | for p in self.changelog.parents(n): | |
1658 | if p != nullid: |
|
1657 | if p != nullid: | |
1659 | common.append(p) |
|
1658 | common.append(p) | |
1660 | return self._changegroup(common, source) |
|
1659 | return self._changegroup(common, source) | |
1661 |
|
1660 | |||
1662 | self.hook('preoutgoing', throw=True, source=source) |
|
1661 | self.hook('preoutgoing', throw=True, source=source) | |
1663 |
|
1662 | |||
1664 | # Set up some initial variables |
|
1663 | # Set up some initial variables | |
1665 | # Make it easy to refer to self.changelog |
|
1664 | # Make it easy to refer to self.changelog | |
1666 | cl = self.changelog |
|
1665 | cl = self.changelog | |
1667 | # msng is short for missing - compute the list of changesets in this |
|
1666 | # msng is short for missing - compute the list of changesets in this | |
1668 | # changegroup. |
|
1667 | # changegroup. | |
1669 | msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) |
|
1668 | msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads) | |
1670 | self.changegroupinfo(msng_cl_lst, source) |
|
1669 | self.changegroupinfo(msng_cl_lst, source) | |
1671 | # Some bases may turn out to be superfluous, and some heads may be |
|
1670 | # Some bases may turn out to be superfluous, and some heads may be | |
1672 | # too. nodesbetween will return the minimal set of bases and heads |
|
1671 | # too. nodesbetween will return the minimal set of bases and heads | |
1673 | # necessary to re-create the changegroup. |
|
1672 | # necessary to re-create the changegroup. | |
1674 |
|
1673 | |||
1675 | # Known heads are the list of heads that it is assumed the recipient |
|
1674 | # Known heads are the list of heads that it is assumed the recipient | |
1676 | # of this changegroup will know about. |
|
1675 | # of this changegroup will know about. | |
1677 | knownheads = set() |
|
1676 | knownheads = set() | |
1678 | # We assume that all parents of bases are known heads. |
|
1677 | # We assume that all parents of bases are known heads. | |
1679 | for n in bases: |
|
1678 | for n in bases: | |
1680 | knownheads.update(cl.parents(n)) |
|
1679 | knownheads.update(cl.parents(n)) | |
1681 | knownheads.discard(nullid) |
|
1680 | knownheads.discard(nullid) | |
1682 | knownheads = list(knownheads) |
|
1681 | knownheads = list(knownheads) | |
1683 | if knownheads: |
|
1682 | if knownheads: | |
1684 | # Now that we know what heads are known, we can compute which |
|
1683 | # Now that we know what heads are known, we can compute which | |
1685 | # changesets are known. The recipient must know about all |
|
1684 | # changesets are known. The recipient must know about all | |
1686 | # changesets required to reach the known heads from the null |
|
1685 | # changesets required to reach the known heads from the null | |
1687 | # changeset. |
|
1686 | # changeset. | |
1688 | has_cl_set, junk, junk = cl.nodesbetween(None, knownheads) |
|
1687 | has_cl_set, junk, junk = cl.nodesbetween(None, knownheads) | |
1689 | junk = None |
|
1688 | junk = None | |
1690 | # Transform the list into a set. |
|
1689 | # Transform the list into a set. | |
1691 | has_cl_set = set(has_cl_set) |
|
1690 | has_cl_set = set(has_cl_set) | |
1692 | else: |
|
1691 | else: | |
1693 | # If there were no known heads, the recipient cannot be assumed to |
|
1692 | # If there were no known heads, the recipient cannot be assumed to | |
1694 | # know about any changesets. |
|
1693 | # know about any changesets. | |
1695 | has_cl_set = set() |
|
1694 | has_cl_set = set() | |
1696 |
|
1695 | |||
1697 | # Make it easy to refer to self.manifest |
|
1696 | # Make it easy to refer to self.manifest | |
1698 | mnfst = self.manifest |
|
1697 | mnfst = self.manifest | |
1699 | # We don't know which manifests are missing yet |
|
1698 | # We don't know which manifests are missing yet | |
1700 | msng_mnfst_set = {} |
|
1699 | msng_mnfst_set = {} | |
1701 | # Nor do we know which filenodes are missing. |
|
1700 | # Nor do we know which filenodes are missing. | |
1702 | msng_filenode_set = {} |
|
1701 | msng_filenode_set = {} | |
1703 |
|
1702 | |||
1704 | junk = mnfst.index[len(mnfst) - 1] # Get around a bug in lazyindex |
|
1703 | junk = mnfst.index[len(mnfst) - 1] # Get around a bug in lazyindex | |
1705 | junk = None |
|
1704 | junk = None | |
1706 |
|
1705 | |||
1707 | # A changeset always belongs to itself, so the changenode lookup |
|
1706 | # A changeset always belongs to itself, so the changenode lookup | |
1708 | # function for a changenode is identity. |
|
1707 | # function for a changenode is identity. | |
1709 | def identity(x): |
|
1708 | def identity(x): | |
1710 | return x |
|
1709 | return x | |
1711 |
|
1710 | |||
1712 | # A function generating function. Sets up an environment for the |
|
1711 | # A function generating function. Sets up an environment for the | |
1713 | # inner function. |
|
1712 | # inner function. | |
1714 | def cmp_by_rev_func(revlog): |
|
1713 | def cmp_by_rev_func(revlog): | |
1715 | # Compare two nodes by their revision number in the environment's |
|
1714 | # Compare two nodes by their revision number in the environment's | |
1716 | # revision history. Since the revision number both represents the |
|
1715 | # revision history. Since the revision number both represents the | |
1717 | # most efficient order to read the nodes in, and represents a |
|
1716 | # most efficient order to read the nodes in, and represents a | |
1718 | # topological sorting of the nodes, this function is often useful. |
|
1717 | # topological sorting of the nodes, this function is often useful. | |
1719 | def cmp_by_rev(a, b): |
|
1718 | def cmp_by_rev(a, b): | |
1720 | return cmp(revlog.rev(a), revlog.rev(b)) |
|
1719 | return cmp(revlog.rev(a), revlog.rev(b)) | |
1721 | return cmp_by_rev |
|
1720 | return cmp_by_rev | |
1722 |
|
1721 | |||
1723 | # If we determine that a particular file or manifest node must be a |
|
1722 | # If we determine that a particular file or manifest node must be a | |
1724 | # node that the recipient of the changegroup will already have, we can |
|
1723 | # node that the recipient of the changegroup will already have, we can | |
1725 | # also assume the recipient will have all the parents. This function |
|
1724 | # also assume the recipient will have all the parents. This function | |
1726 | # prunes them from the set of missing nodes. |
|
1725 | # prunes them from the set of missing nodes. | |
1727 | def prune_parents(revlog, hasset, msngset): |
|
1726 | def prune_parents(revlog, hasset, msngset): | |
1728 | haslst = list(hasset) |
|
1727 | haslst = list(hasset) | |
1729 | haslst.sort(cmp_by_rev_func(revlog)) |
|
1728 | haslst.sort(cmp_by_rev_func(revlog)) | |
1730 | for node in haslst: |
|
1729 | for node in haslst: | |
1731 | parentlst = [p for p in revlog.parents(node) if p != nullid] |
|
1730 | parentlst = [p for p in revlog.parents(node) if p != nullid] | |
1732 | while parentlst: |
|
1731 | while parentlst: | |
1733 | n = parentlst.pop() |
|
1732 | n = parentlst.pop() | |
1734 | if n not in hasset: |
|
1733 | if n not in hasset: | |
1735 | hasset.add(n) |
|
1734 | hasset.add(n) | |
1736 | p = [p for p in revlog.parents(n) if p != nullid] |
|
1735 | p = [p for p in revlog.parents(n) if p != nullid] | |
1737 | parentlst.extend(p) |
|
1736 | parentlst.extend(p) | |
1738 | for n in hasset: |
|
1737 | for n in hasset: | |
1739 | msngset.pop(n, None) |
|
1738 | msngset.pop(n, None) | |
1740 |
|
1739 | |||
1741 | # This is a function generating function used to set up an environment |
|
1740 | # This is a function generating function used to set up an environment | |
1742 | # for the inner function to execute in. |
|
1741 | # for the inner function to execute in. | |
1743 | def manifest_and_file_collector(changedfileset): |
|
1742 | def manifest_and_file_collector(changedfileset): | |
1744 | # This is an information gathering function that gathers |
|
1743 | # This is an information gathering function that gathers | |
1745 | # information from each changeset node that goes out as part of |
|
1744 | # information from each changeset node that goes out as part of | |
1746 | # the changegroup. The information gathered is a list of which |
|
1745 | # the changegroup. The information gathered is a list of which | |
1747 | # manifest nodes are potentially required (the recipient may |
|
1746 | # manifest nodes are potentially required (the recipient may | |
1748 | # already have them) and total list of all files which were |
|
1747 | # already have them) and total list of all files which were | |
1749 | # changed in any changeset in the changegroup. |
|
1748 | # changed in any changeset in the changegroup. | |
1750 | # |
|
1749 | # | |
1751 | # We also remember the first changenode we saw any manifest |
|
1750 | # We also remember the first changenode we saw any manifest | |
1752 | # referenced by so we can later determine which changenode 'owns' |
|
1751 | # referenced by so we can later determine which changenode 'owns' | |
1753 | # the manifest. |
|
1752 | # the manifest. | |
1754 | def collect_manifests_and_files(clnode): |
|
1753 | def collect_manifests_and_files(clnode): | |
1755 | c = cl.read(clnode) |
|
1754 | c = cl.read(clnode) | |
1756 | for f in c[3]: |
|
1755 | for f in c[3]: | |
1757 | # This is to make sure we only have one instance of each |
|
1756 | # This is to make sure we only have one instance of each | |
1758 | # filename string for each filename. |
|
1757 | # filename string for each filename. | |
1759 | changedfileset.setdefault(f, f) |
|
1758 | changedfileset.setdefault(f, f) | |
1760 | msng_mnfst_set.setdefault(c[0], clnode) |
|
1759 | msng_mnfst_set.setdefault(c[0], clnode) | |
1761 | return collect_manifests_and_files |
|
1760 | return collect_manifests_and_files | |
1762 |
|
1761 | |||
1763 | # Figure out which manifest nodes (of the ones we think might be part |
|
1762 | # Figure out which manifest nodes (of the ones we think might be part | |
1764 | # of the changegroup) the recipient must know about and remove them |
|
1763 | # of the changegroup) the recipient must know about and remove them | |
1765 | # from the changegroup. |
|
1764 | # from the changegroup. | |
1766 | def prune_manifests(): |
|
1765 | def prune_manifests(): | |
1767 | has_mnfst_set = set() |
|
1766 | has_mnfst_set = set() | |
1768 | for n in msng_mnfst_set: |
|
1767 | for n in msng_mnfst_set: | |
1769 | # If a 'missing' manifest thinks it belongs to a changenode |
|
1768 | # If a 'missing' manifest thinks it belongs to a changenode | |
1770 | # the recipient is assumed to have, obviously the recipient |
|
1769 | # the recipient is assumed to have, obviously the recipient | |
1771 | # must have that manifest. |
|
1770 | # must have that manifest. | |
1772 | linknode = cl.node(mnfst.linkrev(mnfst.rev(n))) |
|
1771 | linknode = cl.node(mnfst.linkrev(mnfst.rev(n))) | |
1773 | if linknode in has_cl_set: |
|
1772 | if linknode in has_cl_set: | |
1774 | has_mnfst_set.add(n) |
|
1773 | has_mnfst_set.add(n) | |
1775 | prune_parents(mnfst, has_mnfst_set, msng_mnfst_set) |
|
1774 | prune_parents(mnfst, has_mnfst_set, msng_mnfst_set) | |
1776 |
|
1775 | |||
1777 | # Use the information collected in collect_manifests_and_files to say |
|
1776 | # Use the information collected in collect_manifests_and_files to say | |
1778 | # which changenode any manifestnode belongs to. |
|
1777 | # which changenode any manifestnode belongs to. | |
1779 | def lookup_manifest_link(mnfstnode): |
|
1778 | def lookup_manifest_link(mnfstnode): | |
1780 | return msng_mnfst_set[mnfstnode] |
|
1779 | return msng_mnfst_set[mnfstnode] | |
1781 |
|
1780 | |||
1782 | # A function generating function that sets up the initial environment |
|
1781 | # A function generating function that sets up the initial environment | |
1783 | # the inner function. |
|
1782 | # the inner function. | |
1784 | def filenode_collector(changedfiles): |
|
1783 | def filenode_collector(changedfiles): | |
1785 | next_rev = [0] |
|
1784 | next_rev = [0] | |
1786 | # This gathers information from each manifestnode included in the |
|
1785 | # This gathers information from each manifestnode included in the | |
1787 | # changegroup about which filenodes the manifest node references |
|
1786 | # changegroup about which filenodes the manifest node references | |
1788 | # so we can include those in the changegroup too. |
|
1787 | # so we can include those in the changegroup too. | |
1789 | # |
|
1788 | # | |
1790 | # It also remembers which changenode each filenode belongs to. It |
|
1789 | # It also remembers which changenode each filenode belongs to. It | |
1791 | # does this by assuming the a filenode belongs to the changenode |
|
1790 | # does this by assuming the a filenode belongs to the changenode | |
1792 | # the first manifest that references it belongs to. |
|
1791 | # the first manifest that references it belongs to. | |
1793 | def collect_msng_filenodes(mnfstnode): |
|
1792 | def collect_msng_filenodes(mnfstnode): | |
1794 | r = mnfst.rev(mnfstnode) |
|
1793 | r = mnfst.rev(mnfstnode) | |
1795 | if r == next_rev[0]: |
|
1794 | if r == next_rev[0]: | |
1796 | # If the last rev we looked at was the one just previous, |
|
1795 | # If the last rev we looked at was the one just previous, | |
1797 | # we only need to see a diff. |
|
1796 | # we only need to see a diff. | |
1798 | deltamf = mnfst.readdelta(mnfstnode) |
|
1797 | deltamf = mnfst.readdelta(mnfstnode) | |
1799 | # For each line in the delta |
|
1798 | # For each line in the delta | |
1800 | for f, fnode in deltamf.iteritems(): |
|
1799 | for f, fnode in deltamf.iteritems(): | |
1801 | f = changedfiles.get(f, None) |
|
1800 | f = changedfiles.get(f, None) | |
1802 | # And if the file is in the list of files we care |
|
1801 | # And if the file is in the list of files we care | |
1803 | # about. |
|
1802 | # about. | |
1804 | if f is not None: |
|
1803 | if f is not None: | |
1805 | # Get the changenode this manifest belongs to |
|
1804 | # Get the changenode this manifest belongs to | |
1806 | clnode = msng_mnfst_set[mnfstnode] |
|
1805 | clnode = msng_mnfst_set[mnfstnode] | |
1807 | # Create the set of filenodes for the file if |
|
1806 | # Create the set of filenodes for the file if | |
1808 | # there isn't one already. |
|
1807 | # there isn't one already. | |
1809 | ndset = msng_filenode_set.setdefault(f, {}) |
|
1808 | ndset = msng_filenode_set.setdefault(f, {}) | |
1810 | # And set the filenode's changelog node to the |
|
1809 | # And set the filenode's changelog node to the | |
1811 | # manifest's if it hasn't been set already. |
|
1810 | # manifest's if it hasn't been set already. | |
1812 | ndset.setdefault(fnode, clnode) |
|
1811 | ndset.setdefault(fnode, clnode) | |
1813 | else: |
|
1812 | else: | |
1814 | # Otherwise we need a full manifest. |
|
1813 | # Otherwise we need a full manifest. | |
1815 | m = mnfst.read(mnfstnode) |
|
1814 | m = mnfst.read(mnfstnode) | |
1816 | # For every file in we care about. |
|
1815 | # For every file in we care about. | |
1817 | for f in changedfiles: |
|
1816 | for f in changedfiles: | |
1818 | fnode = m.get(f, None) |
|
1817 | fnode = m.get(f, None) | |
1819 | # If it's in the manifest |
|
1818 | # If it's in the manifest | |
1820 | if fnode is not None: |
|
1819 | if fnode is not None: | |
1821 | # See comments above. |
|
1820 | # See comments above. | |
1822 | clnode = msng_mnfst_set[mnfstnode] |
|
1821 | clnode = msng_mnfst_set[mnfstnode] | |
1823 | ndset = msng_filenode_set.setdefault(f, {}) |
|
1822 | ndset = msng_filenode_set.setdefault(f, {}) | |
1824 | ndset.setdefault(fnode, clnode) |
|
1823 | ndset.setdefault(fnode, clnode) | |
1825 | # Remember the revision we hope to see next. |
|
1824 | # Remember the revision we hope to see next. | |
1826 | next_rev[0] = r + 1 |
|
1825 | next_rev[0] = r + 1 | |
1827 | return collect_msng_filenodes |
|
1826 | return collect_msng_filenodes | |
1828 |
|
1827 | |||
1829 | # We have a list of filenodes we think we need for a file, lets remove |
|
1828 | # We have a list of filenodes we think we need for a file, lets remove | |
1830 | # all those we know the recipient must have. |
|
1829 | # all those we know the recipient must have. | |
1831 | def prune_filenodes(f, filerevlog): |
|
1830 | def prune_filenodes(f, filerevlog): | |
1832 | msngset = msng_filenode_set[f] |
|
1831 | msngset = msng_filenode_set[f] | |
1833 | hasset = set() |
|
1832 | hasset = set() | |
1834 | # If a 'missing' filenode thinks it belongs to a changenode we |
|
1833 | # If a 'missing' filenode thinks it belongs to a changenode we | |
1835 | # assume the recipient must have, then the recipient must have |
|
1834 | # assume the recipient must have, then the recipient must have | |
1836 | # that filenode. |
|
1835 | # that filenode. | |
1837 | for n in msngset: |
|
1836 | for n in msngset: | |
1838 | clnode = cl.node(filerevlog.linkrev(filerevlog.rev(n))) |
|
1837 | clnode = cl.node(filerevlog.linkrev(filerevlog.rev(n))) | |
1839 | if clnode in has_cl_set: |
|
1838 | if clnode in has_cl_set: | |
1840 | hasset.add(n) |
|
1839 | hasset.add(n) | |
1841 | prune_parents(filerevlog, hasset, msngset) |
|
1840 | prune_parents(filerevlog, hasset, msngset) | |
1842 |
|
1841 | |||
1843 | # A function generator function that sets up the a context for the |
|
1842 | # A function generator function that sets up the a context for the | |
1844 | # inner function. |
|
1843 | # inner function. | |
1845 | def lookup_filenode_link_func(fname): |
|
1844 | def lookup_filenode_link_func(fname): | |
1846 | msngset = msng_filenode_set[fname] |
|
1845 | msngset = msng_filenode_set[fname] | |
1847 | # Lookup the changenode the filenode belongs to. |
|
1846 | # Lookup the changenode the filenode belongs to. | |
1848 | def lookup_filenode_link(fnode): |
|
1847 | def lookup_filenode_link(fnode): | |
1849 | return msngset[fnode] |
|
1848 | return msngset[fnode] | |
1850 | return lookup_filenode_link |
|
1849 | return lookup_filenode_link | |
1851 |
|
1850 | |||
1852 | # Add the nodes that were explicitly requested. |
|
1851 | # Add the nodes that were explicitly requested. | |
1853 | def add_extra_nodes(name, nodes): |
|
1852 | def add_extra_nodes(name, nodes): | |
1854 | if not extranodes or name not in extranodes: |
|
1853 | if not extranodes or name not in extranodes: | |
1855 | return |
|
1854 | return | |
1856 |
|
1855 | |||
1857 | for node, linknode in extranodes[name]: |
|
1856 | for node, linknode in extranodes[name]: | |
1858 | if node not in nodes: |
|
1857 | if node not in nodes: | |
1859 | nodes[node] = linknode |
|
1858 | nodes[node] = linknode | |
1860 |
|
1859 | |||
1861 | # Now that we have all theses utility functions to help out and |
|
1860 | # Now that we have all theses utility functions to help out and | |
1862 | # logically divide up the task, generate the group. |
|
1861 | # logically divide up the task, generate the group. | |
1863 | def gengroup(): |
|
1862 | def gengroup(): | |
1864 | # The set of changed files starts empty. |
|
1863 | # The set of changed files starts empty. | |
1865 | changedfiles = {} |
|
1864 | changedfiles = {} | |
1866 | # Create a changenode group generator that will call our functions |
|
1865 | # Create a changenode group generator that will call our functions | |
1867 | # back to lookup the owning changenode and collect information. |
|
1866 | # back to lookup the owning changenode and collect information. | |
1868 | group = cl.group(msng_cl_lst, identity, |
|
1867 | group = cl.group(msng_cl_lst, identity, | |
1869 | manifest_and_file_collector(changedfiles)) |
|
1868 | manifest_and_file_collector(changedfiles)) | |
1870 | for chnk in group: |
|
1869 | for chnk in group: | |
1871 | yield chnk |
|
1870 | yield chnk | |
1872 |
|
1871 | |||
1873 | # The list of manifests has been collected by the generator |
|
1872 | # The list of manifests has been collected by the generator | |
1874 | # calling our functions back. |
|
1873 | # calling our functions back. | |
1875 | prune_manifests() |
|
1874 | prune_manifests() | |
1876 | add_extra_nodes(1, msng_mnfst_set) |
|
1875 | add_extra_nodes(1, msng_mnfst_set) | |
1877 | msng_mnfst_lst = msng_mnfst_set.keys() |
|
1876 | msng_mnfst_lst = msng_mnfst_set.keys() | |
1878 | # Sort the manifestnodes by revision number. |
|
1877 | # Sort the manifestnodes by revision number. | |
1879 | msng_mnfst_lst.sort(cmp_by_rev_func(mnfst)) |
|
1878 | msng_mnfst_lst.sort(cmp_by_rev_func(mnfst)) | |
1880 | # Create a generator for the manifestnodes that calls our lookup |
|
1879 | # Create a generator for the manifestnodes that calls our lookup | |
1881 | # and data collection functions back. |
|
1880 | # and data collection functions back. | |
1882 | group = mnfst.group(msng_mnfst_lst, lookup_manifest_link, |
|
1881 | group = mnfst.group(msng_mnfst_lst, lookup_manifest_link, | |
1883 | filenode_collector(changedfiles)) |
|
1882 | filenode_collector(changedfiles)) | |
1884 | for chnk in group: |
|
1883 | for chnk in group: | |
1885 | yield chnk |
|
1884 | yield chnk | |
1886 |
|
1885 | |||
1887 | # These are no longer needed, dereference and toss the memory for |
|
1886 | # These are no longer needed, dereference and toss the memory for | |
1888 | # them. |
|
1887 | # them. | |
1889 | msng_mnfst_lst = None |
|
1888 | msng_mnfst_lst = None | |
1890 | msng_mnfst_set.clear() |
|
1889 | msng_mnfst_set.clear() | |
1891 |
|
1890 | |||
1892 | if extranodes: |
|
1891 | if extranodes: | |
1893 | for fname in extranodes: |
|
1892 | for fname in extranodes: | |
1894 | if isinstance(fname, int): |
|
1893 | if isinstance(fname, int): | |
1895 | continue |
|
1894 | continue | |
1896 | msng_filenode_set.setdefault(fname, {}) |
|
1895 | msng_filenode_set.setdefault(fname, {}) | |
1897 | changedfiles[fname] = 1 |
|
1896 | changedfiles[fname] = 1 | |
1898 | # Go through all our files in order sorted by name. |
|
1897 | # Go through all our files in order sorted by name. | |
1899 | for fname in sorted(changedfiles): |
|
1898 | for fname in sorted(changedfiles): | |
1900 | filerevlog = self.file(fname) |
|
1899 | filerevlog = self.file(fname) | |
1901 | if not len(filerevlog): |
|
1900 | if not len(filerevlog): | |
1902 | raise util.Abort(_("empty or missing revlog for %s") % fname) |
|
1901 | raise util.Abort(_("empty or missing revlog for %s") % fname) | |
1903 | # Toss out the filenodes that the recipient isn't really |
|
1902 | # Toss out the filenodes that the recipient isn't really | |
1904 | # missing. |
|
1903 | # missing. | |
1905 | if fname in msng_filenode_set: |
|
1904 | if fname in msng_filenode_set: | |
1906 | prune_filenodes(fname, filerevlog) |
|
1905 | prune_filenodes(fname, filerevlog) | |
1907 | add_extra_nodes(fname, msng_filenode_set[fname]) |
|
1906 | add_extra_nodes(fname, msng_filenode_set[fname]) | |
1908 | msng_filenode_lst = msng_filenode_set[fname].keys() |
|
1907 | msng_filenode_lst = msng_filenode_set[fname].keys() | |
1909 | else: |
|
1908 | else: | |
1910 | msng_filenode_lst = [] |
|
1909 | msng_filenode_lst = [] | |
1911 | # If any filenodes are left, generate the group for them, |
|
1910 | # If any filenodes are left, generate the group for them, | |
1912 | # otherwise don't bother. |
|
1911 | # otherwise don't bother. | |
1913 | if len(msng_filenode_lst) > 0: |
|
1912 | if len(msng_filenode_lst) > 0: | |
1914 | yield changegroup.chunkheader(len(fname)) |
|
1913 | yield changegroup.chunkheader(len(fname)) | |
1915 | yield fname |
|
1914 | yield fname | |
1916 | # Sort the filenodes by their revision # |
|
1915 | # Sort the filenodes by their revision # | |
1917 | msng_filenode_lst.sort(cmp_by_rev_func(filerevlog)) |
|
1916 | msng_filenode_lst.sort(cmp_by_rev_func(filerevlog)) | |
1918 | # Create a group generator and only pass in a changenode |
|
1917 | # Create a group generator and only pass in a changenode | |
1919 | # lookup function as we need to collect no information |
|
1918 | # lookup function as we need to collect no information | |
1920 | # from filenodes. |
|
1919 | # from filenodes. | |
1921 | group = filerevlog.group(msng_filenode_lst, |
|
1920 | group = filerevlog.group(msng_filenode_lst, | |
1922 | lookup_filenode_link_func(fname)) |
|
1921 | lookup_filenode_link_func(fname)) | |
1923 | for chnk in group: |
|
1922 | for chnk in group: | |
1924 | yield chnk |
|
1923 | yield chnk | |
1925 | if fname in msng_filenode_set: |
|
1924 | if fname in msng_filenode_set: | |
1926 | # Don't need this anymore, toss it to free memory. |
|
1925 | # Don't need this anymore, toss it to free memory. | |
1927 | del msng_filenode_set[fname] |
|
1926 | del msng_filenode_set[fname] | |
1928 | # Signal that no more groups are left. |
|
1927 | # Signal that no more groups are left. | |
1929 | yield changegroup.closechunk() |
|
1928 | yield changegroup.closechunk() | |
1930 |
|
1929 | |||
1931 | if msng_cl_lst: |
|
1930 | if msng_cl_lst: | |
1932 | self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source) |
|
1931 | self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source) | |
1933 |
|
1932 | |||
1934 | return util.chunkbuffer(gengroup()) |
|
1933 | return util.chunkbuffer(gengroup()) | |
1935 |
|
1934 | |||
1936 | def changegroup(self, basenodes, source): |
|
1935 | def changegroup(self, basenodes, source): | |
1937 | # to avoid a race we use changegroupsubset() (issue1320) |
|
1936 | # to avoid a race we use changegroupsubset() (issue1320) | |
1938 | return self.changegroupsubset(basenodes, self.heads(), source) |
|
1937 | return self.changegroupsubset(basenodes, self.heads(), source) | |
1939 |
|
1938 | |||
1940 | def _changegroup(self, common, source): |
|
1939 | def _changegroup(self, common, source): | |
1941 | """Generate a changegroup of all nodes that we have that a recipient |
|
1940 | """Generate a changegroup of all nodes that we have that a recipient | |
1942 | doesn't. |
|
1941 | doesn't. | |
1943 |
|
1942 | |||
1944 | This is much easier than the previous function as we can assume that |
|
1943 | This is much easier than the previous function as we can assume that | |
1945 | the recipient has any changenode we aren't sending them. |
|
1944 | the recipient has any changenode we aren't sending them. | |
1946 |
|
1945 | |||
1947 | common is the set of common nodes between remote and self""" |
|
1946 | common is the set of common nodes between remote and self""" | |
1948 |
|
1947 | |||
1949 | self.hook('preoutgoing', throw=True, source=source) |
|
1948 | self.hook('preoutgoing', throw=True, source=source) | |
1950 |
|
1949 | |||
1951 | cl = self.changelog |
|
1950 | cl = self.changelog | |
1952 | nodes = cl.findmissing(common) |
|
1951 | nodes = cl.findmissing(common) | |
1953 | revset = set([cl.rev(n) for n in nodes]) |
|
1952 | revset = set([cl.rev(n) for n in nodes]) | |
1954 | self.changegroupinfo(nodes, source) |
|
1953 | self.changegroupinfo(nodes, source) | |
1955 |
|
1954 | |||
1956 | def identity(x): |
|
1955 | def identity(x): | |
1957 | return x |
|
1956 | return x | |
1958 |
|
1957 | |||
1959 | def gennodelst(log): |
|
1958 | def gennodelst(log): | |
1960 | for r in log: |
|
1959 | for r in log: | |
1961 | if log.linkrev(r) in revset: |
|
1960 | if log.linkrev(r) in revset: | |
1962 | yield log.node(r) |
|
1961 | yield log.node(r) | |
1963 |
|
1962 | |||
1964 | def changed_file_collector(changedfileset): |
|
1963 | def changed_file_collector(changedfileset): | |
1965 | def collect_changed_files(clnode): |
|
1964 | def collect_changed_files(clnode): | |
1966 | c = cl.read(clnode) |
|
1965 | c = cl.read(clnode) | |
1967 | changedfileset.update(c[3]) |
|
1966 | changedfileset.update(c[3]) | |
1968 | return collect_changed_files |
|
1967 | return collect_changed_files | |
1969 |
|
1968 | |||
1970 | def lookuprevlink_func(revlog): |
|
1969 | def lookuprevlink_func(revlog): | |
1971 | def lookuprevlink(n): |
|
1970 | def lookuprevlink(n): | |
1972 | return cl.node(revlog.linkrev(revlog.rev(n))) |
|
1971 | return cl.node(revlog.linkrev(revlog.rev(n))) | |
1973 | return lookuprevlink |
|
1972 | return lookuprevlink | |
1974 |
|
1973 | |||
1975 | def gengroup(): |
|
1974 | def gengroup(): | |
1976 | # construct a list of all changed files |
|
1975 | # construct a list of all changed files | |
1977 | changedfiles = set() |
|
1976 | changedfiles = set() | |
1978 |
|
1977 | |||
1979 | for chnk in cl.group(nodes, identity, |
|
1978 | for chnk in cl.group(nodes, identity, | |
1980 | changed_file_collector(changedfiles)): |
|
1979 | changed_file_collector(changedfiles)): | |
1981 | yield chnk |
|
1980 | yield chnk | |
1982 |
|
1981 | |||
1983 | mnfst = self.manifest |
|
1982 | mnfst = self.manifest | |
1984 | nodeiter = gennodelst(mnfst) |
|
1983 | nodeiter = gennodelst(mnfst) | |
1985 | for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)): |
|
1984 | for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)): | |
1986 | yield chnk |
|
1985 | yield chnk | |
1987 |
|
1986 | |||
1988 | for fname in sorted(changedfiles): |
|
1987 | for fname in sorted(changedfiles): | |
1989 | filerevlog = self.file(fname) |
|
1988 | filerevlog = self.file(fname) | |
1990 | if not len(filerevlog): |
|
1989 | if not len(filerevlog): | |
1991 | raise util.Abort(_("empty or missing revlog for %s") % fname) |
|
1990 | raise util.Abort(_("empty or missing revlog for %s") % fname) | |
1992 | nodeiter = gennodelst(filerevlog) |
|
1991 | nodeiter = gennodelst(filerevlog) | |
1993 | nodeiter = list(nodeiter) |
|
1992 | nodeiter = list(nodeiter) | |
1994 | if nodeiter: |
|
1993 | if nodeiter: | |
1995 | yield changegroup.chunkheader(len(fname)) |
|
1994 | yield changegroup.chunkheader(len(fname)) | |
1996 | yield fname |
|
1995 | yield fname | |
1997 | lookup = lookuprevlink_func(filerevlog) |
|
1996 | lookup = lookuprevlink_func(filerevlog) | |
1998 | for chnk in filerevlog.group(nodeiter, lookup): |
|
1997 | for chnk in filerevlog.group(nodeiter, lookup): | |
1999 | yield chnk |
|
1998 | yield chnk | |
2000 |
|
1999 | |||
2001 | yield changegroup.closechunk() |
|
2000 | yield changegroup.closechunk() | |
2002 |
|
2001 | |||
2003 | if nodes: |
|
2002 | if nodes: | |
2004 | self.hook('outgoing', node=hex(nodes[0]), source=source) |
|
2003 | self.hook('outgoing', node=hex(nodes[0]), source=source) | |
2005 |
|
2004 | |||
2006 | return util.chunkbuffer(gengroup()) |
|
2005 | return util.chunkbuffer(gengroup()) | |
2007 |
|
2006 | |||
2008 | def addchangegroup(self, source, srctype, url, emptyok=False): |
|
2007 | def addchangegroup(self, source, srctype, url, emptyok=False): | |
2009 | """add changegroup to repo. |
|
2008 | """add changegroup to repo. | |
2010 |
|
2009 | |||
2011 | return values: |
|
2010 | return values: | |
2012 | - nothing changed or no source: 0 |
|
2011 | - nothing changed or no source: 0 | |
2013 | - more heads than before: 1+added heads (2..n) |
|
2012 | - more heads than before: 1+added heads (2..n) | |
2014 | - less heads than before: -1-removed heads (-2..-n) |
|
2013 | - less heads than before: -1-removed heads (-2..-n) | |
2015 | - number of heads stays the same: 1 |
|
2014 | - number of heads stays the same: 1 | |
2016 | """ |
|
2015 | """ | |
2017 | def csmap(x): |
|
2016 | def csmap(x): | |
2018 | self.ui.debug(_("add changeset %s\n") % short(x)) |
|
2017 | self.ui.debug(_("add changeset %s\n") % short(x)) | |
2019 | return len(cl) |
|
2018 | return len(cl) | |
2020 |
|
2019 | |||
2021 | def revmap(x): |
|
2020 | def revmap(x): | |
2022 | return cl.rev(x) |
|
2021 | return cl.rev(x) | |
2023 |
|
2022 | |||
2024 | if not source: |
|
2023 | if not source: | |
2025 | return 0 |
|
2024 | return 0 | |
2026 |
|
2025 | |||
2027 | self.hook('prechangegroup', throw=True, source=srctype, url=url) |
|
2026 | self.hook('prechangegroup', throw=True, source=srctype, url=url) | |
2028 |
|
2027 | |||
2029 | changesets = files = revisions = 0 |
|
2028 | changesets = files = revisions = 0 | |
2030 |
|
2029 | |||
2031 | # write changelog data to temp files so concurrent readers will not see |
|
2030 | # write changelog data to temp files so concurrent readers will not see | |
2032 | # inconsistent view |
|
2031 | # inconsistent view | |
2033 | cl = self.changelog |
|
2032 | cl = self.changelog | |
2034 | cl.delayupdate() |
|
2033 | cl.delayupdate() | |
2035 | oldheads = len(cl.heads()) |
|
2034 | oldheads = len(cl.heads()) | |
2036 |
|
2035 | |||
2037 | tr = self.transaction() |
|
2036 | tr = self.transaction() | |
2038 | try: |
|
2037 | try: | |
2039 | trp = weakref.proxy(tr) |
|
2038 | trp = weakref.proxy(tr) | |
2040 | # pull off the changeset group |
|
2039 | # pull off the changeset group | |
2041 | self.ui.status(_("adding changesets\n")) |
|
2040 | self.ui.status(_("adding changesets\n")) | |
2042 | clstart = len(cl) |
|
2041 | clstart = len(cl) | |
2043 | chunkiter = changegroup.chunkiter(source) |
|
2042 | chunkiter = changegroup.chunkiter(source) | |
2044 | if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok: |
|
2043 | if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok: | |
2045 | raise util.Abort(_("received changelog group is empty")) |
|
2044 | raise util.Abort(_("received changelog group is empty")) | |
2046 | clend = len(cl) |
|
2045 | clend = len(cl) | |
2047 | changesets = clend - clstart |
|
2046 | changesets = clend - clstart | |
2048 |
|
2047 | |||
2049 | # pull off the manifest group |
|
2048 | # pull off the manifest group | |
2050 | self.ui.status(_("adding manifests\n")) |
|
2049 | self.ui.status(_("adding manifests\n")) | |
2051 | chunkiter = changegroup.chunkiter(source) |
|
2050 | chunkiter = changegroup.chunkiter(source) | |
2052 | # no need to check for empty manifest group here: |
|
2051 | # no need to check for empty manifest group here: | |
2053 | # if the result of the merge of 1 and 2 is the same in 3 and 4, |
|
2052 | # if the result of the merge of 1 and 2 is the same in 3 and 4, | |
2054 | # no new manifest will be created and the manifest group will |
|
2053 | # no new manifest will be created and the manifest group will | |
2055 | # be empty during the pull |
|
2054 | # be empty during the pull | |
2056 | self.manifest.addgroup(chunkiter, revmap, trp) |
|
2055 | self.manifest.addgroup(chunkiter, revmap, trp) | |
2057 |
|
2056 | |||
2058 | # process the files |
|
2057 | # process the files | |
2059 | self.ui.status(_("adding file changes\n")) |
|
2058 | self.ui.status(_("adding file changes\n")) | |
2060 | while 1: |
|
2059 | while 1: | |
2061 | f = changegroup.getchunk(source) |
|
2060 | f = changegroup.getchunk(source) | |
2062 | if not f: |
|
2061 | if not f: | |
2063 | break |
|
2062 | break | |
2064 | self.ui.debug(_("adding %s revisions\n") % f) |
|
2063 | self.ui.debug(_("adding %s revisions\n") % f) | |
2065 | fl = self.file(f) |
|
2064 | fl = self.file(f) | |
2066 | o = len(fl) |
|
2065 | o = len(fl) | |
2067 | chunkiter = changegroup.chunkiter(source) |
|
2066 | chunkiter = changegroup.chunkiter(source) | |
2068 | if fl.addgroup(chunkiter, revmap, trp) is None: |
|
2067 | if fl.addgroup(chunkiter, revmap, trp) is None: | |
2069 | raise util.Abort(_("received file revlog group is empty")) |
|
2068 | raise util.Abort(_("received file revlog group is empty")) | |
2070 | revisions += len(fl) - o |
|
2069 | revisions += len(fl) - o | |
2071 | files += 1 |
|
2070 | files += 1 | |
2072 |
|
2071 | |||
2073 | newheads = len(cl.heads()) |
|
2072 | newheads = len(cl.heads()) | |
2074 | heads = "" |
|
2073 | heads = "" | |
2075 | if oldheads and newheads != oldheads: |
|
2074 | if oldheads and newheads != oldheads: | |
2076 | heads = _(" (%+d heads)") % (newheads - oldheads) |
|
2075 | heads = _(" (%+d heads)") % (newheads - oldheads) | |
2077 |
|
2076 | |||
2078 | self.ui.status(_("added %d changesets" |
|
2077 | self.ui.status(_("added %d changesets" | |
2079 | " with %d changes to %d files%s\n") |
|
2078 | " with %d changes to %d files%s\n") | |
2080 | % (changesets, revisions, files, heads)) |
|
2079 | % (changesets, revisions, files, heads)) | |
2081 |
|
2080 | |||
2082 | if changesets > 0: |
|
2081 | if changesets > 0: | |
2083 | p = lambda: cl.writepending() and self.root or "" |
|
2082 | p = lambda: cl.writepending() and self.root or "" | |
2084 | self.hook('pretxnchangegroup', throw=True, |
|
2083 | self.hook('pretxnchangegroup', throw=True, | |
2085 | node=hex(cl.node(clstart)), source=srctype, |
|
2084 | node=hex(cl.node(clstart)), source=srctype, | |
2086 | url=url, pending=p) |
|
2085 | url=url, pending=p) | |
2087 |
|
2086 | |||
2088 | # make changelog see real files again |
|
2087 | # make changelog see real files again | |
2089 | cl.finalize(trp) |
|
2088 | cl.finalize(trp) | |
2090 |
|
2089 | |||
2091 | tr.close() |
|
2090 | tr.close() | |
2092 | finally: |
|
2091 | finally: | |
2093 | del tr |
|
2092 | del tr | |
2094 |
|
2093 | |||
2095 | if changesets > 0: |
|
2094 | if changesets > 0: | |
2096 | # forcefully update the on-disk branch cache |
|
2095 | # forcefully update the on-disk branch cache | |
2097 | self.ui.debug(_("updating the branch cache\n")) |
|
2096 | self.ui.debug(_("updating the branch cache\n")) | |
2098 | self.branchtags() |
|
2097 | self.branchtags() | |
2099 | self.hook("changegroup", node=hex(cl.node(clstart)), |
|
2098 | self.hook("changegroup", node=hex(cl.node(clstart)), | |
2100 | source=srctype, url=url) |
|
2099 | source=srctype, url=url) | |
2101 |
|
2100 | |||
2102 | for i in xrange(clstart, clend): |
|
2101 | for i in xrange(clstart, clend): | |
2103 | self.hook("incoming", node=hex(cl.node(i)), |
|
2102 | self.hook("incoming", node=hex(cl.node(i)), | |
2104 | source=srctype, url=url) |
|
2103 | source=srctype, url=url) | |
2105 |
|
2104 | |||
2106 | # never return 0 here: |
|
2105 | # never return 0 here: | |
2107 | if newheads < oldheads: |
|
2106 | if newheads < oldheads: | |
2108 | return newheads - oldheads - 1 |
|
2107 | return newheads - oldheads - 1 | |
2109 | else: |
|
2108 | else: | |
2110 | return newheads - oldheads + 1 |
|
2109 | return newheads - oldheads + 1 | |
2111 |
|
2110 | |||
2112 |
|
2111 | |||
2113 | def stream_in(self, remote): |
|
2112 | def stream_in(self, remote): | |
2114 | fp = remote.stream_out() |
|
2113 | fp = remote.stream_out() | |
2115 | l = fp.readline() |
|
2114 | l = fp.readline() | |
2116 | try: |
|
2115 | try: | |
2117 | resp = int(l) |
|
2116 | resp = int(l) | |
2118 | except ValueError: |
|
2117 | except ValueError: | |
2119 | raise error.ResponseError( |
|
2118 | raise error.ResponseError( | |
2120 | _('Unexpected response from remote server:'), l) |
|
2119 | _('Unexpected response from remote server:'), l) | |
2121 | if resp == 1: |
|
2120 | if resp == 1: | |
2122 | raise util.Abort(_('operation forbidden by server')) |
|
2121 | raise util.Abort(_('operation forbidden by server')) | |
2123 | elif resp == 2: |
|
2122 | elif resp == 2: | |
2124 | raise util.Abort(_('locking the remote repository failed')) |
|
2123 | raise util.Abort(_('locking the remote repository failed')) | |
2125 | elif resp != 0: |
|
2124 | elif resp != 0: | |
2126 | raise util.Abort(_('the server sent an unknown error code')) |
|
2125 | raise util.Abort(_('the server sent an unknown error code')) | |
2127 | self.ui.status(_('streaming all changes\n')) |
|
2126 | self.ui.status(_('streaming all changes\n')) | |
2128 | l = fp.readline() |
|
2127 | l = fp.readline() | |
2129 | try: |
|
2128 | try: | |
2130 | total_files, total_bytes = map(int, l.split(' ', 1)) |
|
2129 | total_files, total_bytes = map(int, l.split(' ', 1)) | |
2131 | except (ValueError, TypeError): |
|
2130 | except (ValueError, TypeError): | |
2132 | raise error.ResponseError( |
|
2131 | raise error.ResponseError( | |
2133 | _('Unexpected response from remote server:'), l) |
|
2132 | _('Unexpected response from remote server:'), l) | |
2134 | self.ui.status(_('%d files to transfer, %s of data\n') % |
|
2133 | self.ui.status(_('%d files to transfer, %s of data\n') % | |
2135 | (total_files, util.bytecount(total_bytes))) |
|
2134 | (total_files, util.bytecount(total_bytes))) | |
2136 | start = time.time() |
|
2135 | start = time.time() | |
2137 | for i in xrange(total_files): |
|
2136 | for i in xrange(total_files): | |
2138 | # XXX doesn't support '\n' or '\r' in filenames |
|
2137 | # XXX doesn't support '\n' or '\r' in filenames | |
2139 | l = fp.readline() |
|
2138 | l = fp.readline() | |
2140 | try: |
|
2139 | try: | |
2141 | name, size = l.split('\0', 1) |
|
2140 | name, size = l.split('\0', 1) | |
2142 | size = int(size) |
|
2141 | size = int(size) | |
2143 | except (ValueError, TypeError): |
|
2142 | except (ValueError, TypeError): | |
2144 | raise error.ResponseError( |
|
2143 | raise error.ResponseError( | |
2145 | _('Unexpected response from remote server:'), l) |
|
2144 | _('Unexpected response from remote server:'), l) | |
2146 | self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size))) |
|
2145 | self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size))) | |
2147 | # for backwards compat, name was partially encoded |
|
2146 | # for backwards compat, name was partially encoded | |
2148 | ofp = self.sopener(store.decodedir(name), 'w') |
|
2147 | ofp = self.sopener(store.decodedir(name), 'w') | |
2149 | for chunk in util.filechunkiter(fp, limit=size): |
|
2148 | for chunk in util.filechunkiter(fp, limit=size): | |
2150 | ofp.write(chunk) |
|
2149 | ofp.write(chunk) | |
2151 | ofp.close() |
|
2150 | ofp.close() | |
2152 | elapsed = time.time() - start |
|
2151 | elapsed = time.time() - start | |
2153 | if elapsed <= 0: |
|
2152 | if elapsed <= 0: | |
2154 | elapsed = 0.001 |
|
2153 | elapsed = 0.001 | |
2155 | self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % |
|
2154 | self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % | |
2156 | (util.bytecount(total_bytes), elapsed, |
|
2155 | (util.bytecount(total_bytes), elapsed, | |
2157 | util.bytecount(total_bytes / elapsed))) |
|
2156 | util.bytecount(total_bytes / elapsed))) | |
2158 | self.invalidate() |
|
2157 | self.invalidate() | |
2159 | return len(self.heads()) + 1 |
|
2158 | return len(self.heads()) + 1 | |
2160 |
|
2159 | |||
2161 | def clone(self, remote, heads=[], stream=False): |
|
2160 | def clone(self, remote, heads=[], stream=False): | |
2162 | '''clone remote repository. |
|
2161 | '''clone remote repository. | |
2163 |
|
2162 | |||
2164 | keyword arguments: |
|
2163 | keyword arguments: | |
2165 | heads: list of revs to clone (forces use of pull) |
|
2164 | heads: list of revs to clone (forces use of pull) | |
2166 | stream: use streaming clone if possible''' |
|
2165 | stream: use streaming clone if possible''' | |
2167 |
|
2166 | |||
2168 | # now, all clients that can request uncompressed clones can |
|
2167 | # now, all clients that can request uncompressed clones can | |
2169 | # read repo formats supported by all servers that can serve |
|
2168 | # read repo formats supported by all servers that can serve | |
2170 | # them. |
|
2169 | # them. | |
2171 |
|
2170 | |||
2172 | # if revlog format changes, client will have to check version |
|
2171 | # if revlog format changes, client will have to check version | |
2173 | # and format flags on "stream" capability, and use |
|
2172 | # and format flags on "stream" capability, and use | |
2174 | # uncompressed only if compatible. |
|
2173 | # uncompressed only if compatible. | |
2175 |
|
2174 | |||
2176 | if stream and not heads and remote.capable('stream'): |
|
2175 | if stream and not heads and remote.capable('stream'): | |
2177 | return self.stream_in(remote) |
|
2176 | return self.stream_in(remote) | |
2178 | return self.pull(remote, heads) |
|
2177 | return self.pull(remote, heads) | |
2179 |
|
2178 | |||
2180 | # used to avoid circular references so destructors work |
|
2179 | # used to avoid circular references so destructors work | |
2181 | def aftertrans(files): |
|
2180 | def aftertrans(files): | |
2182 | renamefiles = [tuple(t) for t in files] |
|
2181 | renamefiles = [tuple(t) for t in files] | |
2183 | def a(): |
|
2182 | def a(): | |
2184 | for src, dest in renamefiles: |
|
2183 | for src, dest in renamefiles: | |
2185 | util.rename(src, dest) |
|
2184 | util.rename(src, dest) | |
2186 | return a |
|
2185 | return a | |
2187 |
|
2186 | |||
2188 | def instance(ui, path, create): |
|
2187 | def instance(ui, path, create): | |
2189 | return localrepository(ui, util.drop_scheme('file', path), create) |
|
2188 | return localrepository(ui, util.drop_scheme('file', path), create) | |
2190 |
|
2189 | |||
2191 | def islocal(path): |
|
2190 | def islocal(path): | |
2192 | return True |
|
2191 | return True |
General Comments 0
You need to be logged in to leave comments.
Login now