Show More
@@ -1,1622 +1,1644 b'' | |||||
1 | # context.py - changeset and file context objects for mercurial |
|
1 | # context.py - changeset and file context objects for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2006, 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 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from node import nullid, nullrev, short, hex, bin |
|
8 | from node import nullid, nullrev, short, hex, bin | |
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | import mdiff, error, util, scmutil, subrepo, patch, encoding, phases |
|
10 | import mdiff, error, util, scmutil, subrepo, patch, encoding, phases | |
11 | import match as matchmod |
|
11 | import match as matchmod | |
12 | import os, errno, stat |
|
12 | import os, errno, stat | |
13 | import obsolete as obsmod |
|
13 | import obsolete as obsmod | |
14 | import repoview |
|
14 | import repoview | |
15 | import fileset |
|
15 | import fileset | |
|
16 | import revlog | |||
16 |
|
17 | |||
17 | propertycache = util.propertycache |
|
18 | propertycache = util.propertycache | |
18 |
|
19 | |||
19 | class basectx(object): |
|
20 | class basectx(object): | |
20 | """A basectx object represents the common logic for its children: |
|
21 | """A basectx object represents the common logic for its children: | |
21 | changectx: read-only context that is already present in the repo, |
|
22 | changectx: read-only context that is already present in the repo, | |
22 | workingctx: a context that represents the working directory and can |
|
23 | workingctx: a context that represents the working directory and can | |
23 | be committed, |
|
24 | be committed, | |
24 | memctx: a context that represents changes in-memory and can also |
|
25 | memctx: a context that represents changes in-memory and can also | |
25 | be committed.""" |
|
26 | be committed.""" | |
26 | def __new__(cls, repo, changeid='', *args, **kwargs): |
|
27 | def __new__(cls, repo, changeid='', *args, **kwargs): | |
27 | if isinstance(changeid, basectx): |
|
28 | if isinstance(changeid, basectx): | |
28 | return changeid |
|
29 | return changeid | |
29 |
|
30 | |||
30 | o = super(basectx, cls).__new__(cls) |
|
31 | o = super(basectx, cls).__new__(cls) | |
31 |
|
32 | |||
32 | o._repo = repo |
|
33 | o._repo = repo | |
33 | o._rev = nullrev |
|
34 | o._rev = nullrev | |
34 | o._node = nullid |
|
35 | o._node = nullid | |
35 |
|
36 | |||
36 | return o |
|
37 | return o | |
37 |
|
38 | |||
38 | def __str__(self): |
|
39 | def __str__(self): | |
39 | return short(self.node()) |
|
40 | return short(self.node()) | |
40 |
|
41 | |||
41 | def __int__(self): |
|
42 | def __int__(self): | |
42 | return self.rev() |
|
43 | return self.rev() | |
43 |
|
44 | |||
44 | def __repr__(self): |
|
45 | def __repr__(self): | |
45 | return "<%s %s>" % (type(self).__name__, str(self)) |
|
46 | return "<%s %s>" % (type(self).__name__, str(self)) | |
46 |
|
47 | |||
47 | def __eq__(self, other): |
|
48 | def __eq__(self, other): | |
48 | try: |
|
49 | try: | |
49 | return type(self) == type(other) and self._rev == other._rev |
|
50 | return type(self) == type(other) and self._rev == other._rev | |
50 | except AttributeError: |
|
51 | except AttributeError: | |
51 | return False |
|
52 | return False | |
52 |
|
53 | |||
53 | def __ne__(self, other): |
|
54 | def __ne__(self, other): | |
54 | return not (self == other) |
|
55 | return not (self == other) | |
55 |
|
56 | |||
56 | def __contains__(self, key): |
|
57 | def __contains__(self, key): | |
57 | return key in self._manifest |
|
58 | return key in self._manifest | |
58 |
|
59 | |||
59 | def __getitem__(self, key): |
|
60 | def __getitem__(self, key): | |
60 | return self.filectx(key) |
|
61 | return self.filectx(key) | |
61 |
|
62 | |||
62 | def __iter__(self): |
|
63 | def __iter__(self): | |
63 | for f in sorted(self._manifest): |
|
64 | for f in sorted(self._manifest): | |
64 | yield f |
|
65 | yield f | |
65 |
|
66 | |||
66 | def _manifestmatches(self, match, s): |
|
67 | def _manifestmatches(self, match, s): | |
67 | """generate a new manifest filtered by the match argument |
|
68 | """generate a new manifest filtered by the match argument | |
68 |
|
69 | |||
69 | This method is for internal use only and mainly exists to provide an |
|
70 | This method is for internal use only and mainly exists to provide an | |
70 | object oriented way for other contexts to customize the manifest |
|
71 | object oriented way for other contexts to customize the manifest | |
71 | generation. |
|
72 | generation. | |
72 | """ |
|
73 | """ | |
73 | mf = self.manifest().copy() |
|
74 | mf = self.manifest().copy() | |
74 | if match.always(): |
|
75 | if match.always(): | |
75 | return mf |
|
76 | return mf | |
76 | for fn in mf.keys(): |
|
77 | for fn in mf.keys(): | |
77 | if not match(fn): |
|
78 | if not match(fn): | |
78 | del mf[fn] |
|
79 | del mf[fn] | |
79 | return mf |
|
80 | return mf | |
80 |
|
81 | |||
81 | def _matchstatus(self, other, s, match, listignored, listclean, |
|
82 | def _matchstatus(self, other, s, match, listignored, listclean, | |
82 | listunknown): |
|
83 | listunknown): | |
83 | """return match.always if match is none |
|
84 | """return match.always if match is none | |
84 |
|
85 | |||
85 | This internal method provides a way for child objects to override the |
|
86 | This internal method provides a way for child objects to override the | |
86 | match operator. |
|
87 | match operator. | |
87 | """ |
|
88 | """ | |
88 | return match or matchmod.always(self._repo.root, self._repo.getcwd()) |
|
89 | return match or matchmod.always(self._repo.root, self._repo.getcwd()) | |
89 |
|
90 | |||
90 | def _prestatus(self, other, s, match, listignored, listclean, listunknown): |
|
91 | def _prestatus(self, other, s, match, listignored, listclean, listunknown): | |
91 | """provide a hook to allow child objects to preprocess status results |
|
92 | """provide a hook to allow child objects to preprocess status results | |
92 |
|
93 | |||
93 | For example, this allows other contexts, such as workingctx, to query |
|
94 | For example, this allows other contexts, such as workingctx, to query | |
94 | the dirstate before comparing the manifests. |
|
95 | the dirstate before comparing the manifests. | |
95 | """ |
|
96 | """ | |
96 | # load earliest manifest first for caching reasons |
|
97 | # load earliest manifest first for caching reasons | |
97 | if self.rev() < other.rev(): |
|
98 | if self.rev() < other.rev(): | |
98 | self.manifest() |
|
99 | self.manifest() | |
99 | return s |
|
100 | return s | |
100 |
|
101 | |||
101 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): |
|
102 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): | |
102 | """provide a hook to allow child objects to postprocess status results |
|
103 | """provide a hook to allow child objects to postprocess status results | |
103 |
|
104 | |||
104 | For example, this allows other contexts, such as workingctx, to filter |
|
105 | For example, this allows other contexts, such as workingctx, to filter | |
105 | suspect symlinks in the case of FAT32 and NTFS filesytems. |
|
106 | suspect symlinks in the case of FAT32 and NTFS filesytems. | |
106 | """ |
|
107 | """ | |
107 | return s |
|
108 | return s | |
108 |
|
109 | |||
109 | def _buildstatus(self, other, s, match, listignored, listclean, |
|
110 | def _buildstatus(self, other, s, match, listignored, listclean, | |
110 | listunknown): |
|
111 | listunknown): | |
111 | """build a status with respect to another context""" |
|
112 | """build a status with respect to another context""" | |
112 | mf1 = other._manifestmatches(match, s) |
|
113 | mf1 = other._manifestmatches(match, s) | |
113 | mf2 = self._manifestmatches(match, s) |
|
114 | mf2 = self._manifestmatches(match, s) | |
114 |
|
115 | |||
115 | modified, added, clean = [], [], [] |
|
116 | modified, added, clean = [], [], [] | |
116 | deleted, unknown, ignored = s[3], [], [] |
|
117 | deleted, unknown, ignored = s[3], [], [] | |
117 | withflags = mf1.withflags() | mf2.withflags() |
|
118 | withflags = mf1.withflags() | mf2.withflags() | |
118 | for fn, mf2node in mf2.iteritems(): |
|
119 | for fn, mf2node in mf2.iteritems(): | |
119 | if fn in mf1: |
|
120 | if fn in mf1: | |
120 | if (fn not in deleted and |
|
121 | if (fn not in deleted and | |
121 | ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or |
|
122 | ((fn in withflags and mf1.flags(fn) != mf2.flags(fn)) or | |
122 | (mf1[fn] != mf2node and |
|
123 | (mf1[fn] != mf2node and | |
123 | (mf2node or self[fn].cmp(other[fn]))))): |
|
124 | (mf2node or self[fn].cmp(other[fn]))))): | |
124 | modified.append(fn) |
|
125 | modified.append(fn) | |
125 | elif listclean: |
|
126 | elif listclean: | |
126 | clean.append(fn) |
|
127 | clean.append(fn) | |
127 | del mf1[fn] |
|
128 | del mf1[fn] | |
128 | elif fn not in deleted: |
|
129 | elif fn not in deleted: | |
129 | added.append(fn) |
|
130 | added.append(fn) | |
130 | removed = mf1.keys() |
|
131 | removed = mf1.keys() | |
131 |
|
132 | |||
132 | return [modified, added, removed, deleted, unknown, ignored, clean] |
|
133 | return [modified, added, removed, deleted, unknown, ignored, clean] | |
133 |
|
134 | |||
134 | @propertycache |
|
135 | @propertycache | |
135 | def substate(self): |
|
136 | def substate(self): | |
136 | return subrepo.state(self, self._repo.ui) |
|
137 | return subrepo.state(self, self._repo.ui) | |
137 |
|
138 | |||
138 | def subrev(self, subpath): |
|
139 | def subrev(self, subpath): | |
139 | return self.substate[subpath][1] |
|
140 | return self.substate[subpath][1] | |
140 |
|
141 | |||
141 | def rev(self): |
|
142 | def rev(self): | |
142 | return self._rev |
|
143 | return self._rev | |
143 | def node(self): |
|
144 | def node(self): | |
144 | return self._node |
|
145 | return self._node | |
145 | def hex(self): |
|
146 | def hex(self): | |
146 | return hex(self.node()) |
|
147 | return hex(self.node()) | |
147 | def manifest(self): |
|
148 | def manifest(self): | |
148 | return self._manifest |
|
149 | return self._manifest | |
149 | def phasestr(self): |
|
150 | def phasestr(self): | |
150 | return phases.phasenames[self.phase()] |
|
151 | return phases.phasenames[self.phase()] | |
151 | def mutable(self): |
|
152 | def mutable(self): | |
152 | return self.phase() > phases.public |
|
153 | return self.phase() > phases.public | |
153 |
|
154 | |||
154 | def getfileset(self, expr): |
|
155 | def getfileset(self, expr): | |
155 | return fileset.getfileset(self, expr) |
|
156 | return fileset.getfileset(self, expr) | |
156 |
|
157 | |||
157 | def obsolete(self): |
|
158 | def obsolete(self): | |
158 | """True if the changeset is obsolete""" |
|
159 | """True if the changeset is obsolete""" | |
159 | return self.rev() in obsmod.getrevs(self._repo, 'obsolete') |
|
160 | return self.rev() in obsmod.getrevs(self._repo, 'obsolete') | |
160 |
|
161 | |||
161 | def extinct(self): |
|
162 | def extinct(self): | |
162 | """True if the changeset is extinct""" |
|
163 | """True if the changeset is extinct""" | |
163 | return self.rev() in obsmod.getrevs(self._repo, 'extinct') |
|
164 | return self.rev() in obsmod.getrevs(self._repo, 'extinct') | |
164 |
|
165 | |||
165 | def unstable(self): |
|
166 | def unstable(self): | |
166 | """True if the changeset is not obsolete but it's ancestor are""" |
|
167 | """True if the changeset is not obsolete but it's ancestor are""" | |
167 | return self.rev() in obsmod.getrevs(self._repo, 'unstable') |
|
168 | return self.rev() in obsmod.getrevs(self._repo, 'unstable') | |
168 |
|
169 | |||
169 | def bumped(self): |
|
170 | def bumped(self): | |
170 | """True if the changeset try to be a successor of a public changeset |
|
171 | """True if the changeset try to be a successor of a public changeset | |
171 |
|
172 | |||
172 | Only non-public and non-obsolete changesets may be bumped. |
|
173 | Only non-public and non-obsolete changesets may be bumped. | |
173 | """ |
|
174 | """ | |
174 | return self.rev() in obsmod.getrevs(self._repo, 'bumped') |
|
175 | return self.rev() in obsmod.getrevs(self._repo, 'bumped') | |
175 |
|
176 | |||
176 | def divergent(self): |
|
177 | def divergent(self): | |
177 | """Is a successors of a changeset with multiple possible successors set |
|
178 | """Is a successors of a changeset with multiple possible successors set | |
178 |
|
179 | |||
179 | Only non-public and non-obsolete changesets may be divergent. |
|
180 | Only non-public and non-obsolete changesets may be divergent. | |
180 | """ |
|
181 | """ | |
181 | return self.rev() in obsmod.getrevs(self._repo, 'divergent') |
|
182 | return self.rev() in obsmod.getrevs(self._repo, 'divergent') | |
182 |
|
183 | |||
183 | def troubled(self): |
|
184 | def troubled(self): | |
184 | """True if the changeset is either unstable, bumped or divergent""" |
|
185 | """True if the changeset is either unstable, bumped or divergent""" | |
185 | return self.unstable() or self.bumped() or self.divergent() |
|
186 | return self.unstable() or self.bumped() or self.divergent() | |
186 |
|
187 | |||
187 | def troubles(self): |
|
188 | def troubles(self): | |
188 | """return the list of troubles affecting this changesets. |
|
189 | """return the list of troubles affecting this changesets. | |
189 |
|
190 | |||
190 | Troubles are returned as strings. possible values are: |
|
191 | Troubles are returned as strings. possible values are: | |
191 | - unstable, |
|
192 | - unstable, | |
192 | - bumped, |
|
193 | - bumped, | |
193 | - divergent. |
|
194 | - divergent. | |
194 | """ |
|
195 | """ | |
195 | troubles = [] |
|
196 | troubles = [] | |
196 | if self.unstable(): |
|
197 | if self.unstable(): | |
197 | troubles.append('unstable') |
|
198 | troubles.append('unstable') | |
198 | if self.bumped(): |
|
199 | if self.bumped(): | |
199 | troubles.append('bumped') |
|
200 | troubles.append('bumped') | |
200 | if self.divergent(): |
|
201 | if self.divergent(): | |
201 | troubles.append('divergent') |
|
202 | troubles.append('divergent') | |
202 | return troubles |
|
203 | return troubles | |
203 |
|
204 | |||
204 | def parents(self): |
|
205 | def parents(self): | |
205 | """return contexts for each parent changeset""" |
|
206 | """return contexts for each parent changeset""" | |
206 | return self._parents |
|
207 | return self._parents | |
207 |
|
208 | |||
208 | def p1(self): |
|
209 | def p1(self): | |
209 | return self._parents[0] |
|
210 | return self._parents[0] | |
210 |
|
211 | |||
211 | def p2(self): |
|
212 | def p2(self): | |
212 | if len(self._parents) == 2: |
|
213 | if len(self._parents) == 2: | |
213 | return self._parents[1] |
|
214 | return self._parents[1] | |
214 | return changectx(self._repo, -1) |
|
215 | return changectx(self._repo, -1) | |
215 |
|
216 | |||
216 | def _fileinfo(self, path): |
|
217 | def _fileinfo(self, path): | |
217 | if '_manifest' in self.__dict__: |
|
218 | if '_manifest' in self.__dict__: | |
218 | try: |
|
219 | try: | |
219 | return self._manifest[path], self._manifest.flags(path) |
|
220 | return self._manifest[path], self._manifest.flags(path) | |
220 | except KeyError: |
|
221 | except KeyError: | |
221 | raise error.ManifestLookupError(self._node, path, |
|
222 | raise error.ManifestLookupError(self._node, path, | |
222 | _('not found in manifest')) |
|
223 | _('not found in manifest')) | |
223 | if '_manifestdelta' in self.__dict__ or path in self.files(): |
|
224 | if '_manifestdelta' in self.__dict__ or path in self.files(): | |
224 | if path in self._manifestdelta: |
|
225 | if path in self._manifestdelta: | |
225 | return (self._manifestdelta[path], |
|
226 | return (self._manifestdelta[path], | |
226 | self._manifestdelta.flags(path)) |
|
227 | self._manifestdelta.flags(path)) | |
227 | node, flag = self._repo.manifest.find(self._changeset[0], path) |
|
228 | node, flag = self._repo.manifest.find(self._changeset[0], path) | |
228 | if not node: |
|
229 | if not node: | |
229 | raise error.ManifestLookupError(self._node, path, |
|
230 | raise error.ManifestLookupError(self._node, path, | |
230 | _('not found in manifest')) |
|
231 | _('not found in manifest')) | |
231 |
|
232 | |||
232 | return node, flag |
|
233 | return node, flag | |
233 |
|
234 | |||
234 | def filenode(self, path): |
|
235 | def filenode(self, path): | |
235 | return self._fileinfo(path)[0] |
|
236 | return self._fileinfo(path)[0] | |
236 |
|
237 | |||
237 | def flags(self, path): |
|
238 | def flags(self, path): | |
238 | try: |
|
239 | try: | |
239 | return self._fileinfo(path)[1] |
|
240 | return self._fileinfo(path)[1] | |
240 | except error.LookupError: |
|
241 | except error.LookupError: | |
241 | return '' |
|
242 | return '' | |
242 |
|
243 | |||
243 | def sub(self, path): |
|
244 | def sub(self, path): | |
244 | return subrepo.subrepo(self, path) |
|
245 | return subrepo.subrepo(self, path) | |
245 |
|
246 | |||
246 | def match(self, pats=[], include=None, exclude=None, default='glob'): |
|
247 | def match(self, pats=[], include=None, exclude=None, default='glob'): | |
247 | r = self._repo |
|
248 | r = self._repo | |
248 | return matchmod.match(r.root, r.getcwd(), pats, |
|
249 | return matchmod.match(r.root, r.getcwd(), pats, | |
249 | include, exclude, default, |
|
250 | include, exclude, default, | |
250 | auditor=r.auditor, ctx=self) |
|
251 | auditor=r.auditor, ctx=self) | |
251 |
|
252 | |||
252 | def diff(self, ctx2=None, match=None, **opts): |
|
253 | def diff(self, ctx2=None, match=None, **opts): | |
253 | """Returns a diff generator for the given contexts and matcher""" |
|
254 | """Returns a diff generator for the given contexts and matcher""" | |
254 | if ctx2 is None: |
|
255 | if ctx2 is None: | |
255 | ctx2 = self.p1() |
|
256 | ctx2 = self.p1() | |
256 | if ctx2 is not None: |
|
257 | if ctx2 is not None: | |
257 | ctx2 = self._repo[ctx2] |
|
258 | ctx2 = self._repo[ctx2] | |
258 | diffopts = patch.diffopts(self._repo.ui, opts) |
|
259 | diffopts = patch.diffopts(self._repo.ui, opts) | |
259 | return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts) |
|
260 | return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts) | |
260 |
|
261 | |||
261 | @propertycache |
|
262 | @propertycache | |
262 | def _dirs(self): |
|
263 | def _dirs(self): | |
263 | return scmutil.dirs(self._manifest) |
|
264 | return scmutil.dirs(self._manifest) | |
264 |
|
265 | |||
265 | def dirs(self): |
|
266 | def dirs(self): | |
266 | return self._dirs |
|
267 | return self._dirs | |
267 |
|
268 | |||
268 | def dirty(self): |
|
269 | def dirty(self): | |
269 | return False |
|
270 | return False | |
270 |
|
271 | |||
271 | def status(self, other=None, match=None, listignored=False, |
|
272 | def status(self, other=None, match=None, listignored=False, | |
272 | listclean=False, listunknown=False, listsubrepos=False): |
|
273 | listclean=False, listunknown=False, listsubrepos=False): | |
273 | """return status of files between two nodes or node and working |
|
274 | """return status of files between two nodes or node and working | |
274 | directory. |
|
275 | directory. | |
275 |
|
276 | |||
276 | If other is None, compare this node with working directory. |
|
277 | If other is None, compare this node with working directory. | |
277 |
|
278 | |||
278 | returns (modified, added, removed, deleted, unknown, ignored, clean) |
|
279 | returns (modified, added, removed, deleted, unknown, ignored, clean) | |
279 | """ |
|
280 | """ | |
280 |
|
281 | |||
281 | ctx1 = self |
|
282 | ctx1 = self | |
282 | ctx2 = self._repo[other] |
|
283 | ctx2 = self._repo[other] | |
283 |
|
284 | |||
284 | # This next code block is, admittedly, fragile logic that tests for |
|
285 | # This next code block is, admittedly, fragile logic that tests for | |
285 | # reversing the contexts and wouldn't need to exist if it weren't for |
|
286 | # reversing the contexts and wouldn't need to exist if it weren't for | |
286 | # the fast (and common) code path of comparing the working directory |
|
287 | # the fast (and common) code path of comparing the working directory | |
287 | # with its first parent. |
|
288 | # with its first parent. | |
288 | # |
|
289 | # | |
289 | # What we're aiming for here is the ability to call: |
|
290 | # What we're aiming for here is the ability to call: | |
290 | # |
|
291 | # | |
291 | # workingctx.status(parentctx) |
|
292 | # workingctx.status(parentctx) | |
292 | # |
|
293 | # | |
293 | # If we always built the manifest for each context and compared those, |
|
294 | # If we always built the manifest for each context and compared those, | |
294 | # then we'd be done. But the special case of the above call means we |
|
295 | # then we'd be done. But the special case of the above call means we | |
295 | # just copy the manifest of the parent. |
|
296 | # just copy the manifest of the parent. | |
296 | reversed = False |
|
297 | reversed = False | |
297 | if (not isinstance(ctx1, changectx) |
|
298 | if (not isinstance(ctx1, changectx) | |
298 | and isinstance(ctx2, changectx)): |
|
299 | and isinstance(ctx2, changectx)): | |
299 | reversed = True |
|
300 | reversed = True | |
300 | ctx1, ctx2 = ctx2, ctx1 |
|
301 | ctx1, ctx2 = ctx2, ctx1 | |
301 |
|
302 | |||
302 | r = [[], [], [], [], [], [], []] |
|
303 | r = [[], [], [], [], [], [], []] | |
303 | match = ctx2._matchstatus(ctx1, r, match, listignored, listclean, |
|
304 | match = ctx2._matchstatus(ctx1, r, match, listignored, listclean, | |
304 | listunknown) |
|
305 | listunknown) | |
305 | r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown) |
|
306 | r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown) | |
306 | r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, |
|
307 | r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, | |
307 | listunknown) |
|
308 | listunknown) | |
308 | r = ctx2._poststatus(ctx1, r, match, listignored, listclean, |
|
309 | r = ctx2._poststatus(ctx1, r, match, listignored, listclean, | |
309 | listunknown) |
|
310 | listunknown) | |
310 |
|
311 | |||
311 | if reversed: |
|
312 | if reversed: | |
312 | r[1], r[2], r[3], r[4] = r[2], r[1], r[4], r[3] |
|
313 | r[1], r[2], r[3], r[4] = r[2], r[1], r[4], r[3] | |
313 |
|
314 | |||
314 | if listsubrepos: |
|
315 | if listsubrepos: | |
315 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
316 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | |
316 | rev2 = ctx2.subrev(subpath) |
|
317 | rev2 = ctx2.subrev(subpath) | |
317 | try: |
|
318 | try: | |
318 | submatch = matchmod.narrowmatcher(subpath, match) |
|
319 | submatch = matchmod.narrowmatcher(subpath, match) | |
319 | s = sub.status(rev2, match=submatch, ignored=listignored, |
|
320 | s = sub.status(rev2, match=submatch, ignored=listignored, | |
320 | clean=listclean, unknown=listunknown, |
|
321 | clean=listclean, unknown=listunknown, | |
321 | listsubrepos=True) |
|
322 | listsubrepos=True) | |
322 | for rfiles, sfiles in zip(r, s): |
|
323 | for rfiles, sfiles in zip(r, s): | |
323 | rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) |
|
324 | rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) | |
324 | except error.LookupError: |
|
325 | except error.LookupError: | |
325 | self._repo.ui.status(_("skipping missing " |
|
326 | self._repo.ui.status(_("skipping missing " | |
326 | "subrepository: %s\n") % subpath) |
|
327 | "subrepository: %s\n") % subpath) | |
327 |
|
328 | |||
328 | for l in r: |
|
329 | for l in r: | |
329 | l.sort() |
|
330 | l.sort() | |
330 |
|
331 | |||
331 | # we return a tuple to signify that this list isn't changing |
|
332 | # we return a tuple to signify that this list isn't changing | |
332 | return tuple(r) |
|
333 | return tuple(r) | |
333 |
|
334 | |||
334 |
|
335 | |||
335 | def makememctx(repo, parents, text, user, date, branch, files, store, |
|
336 | def makememctx(repo, parents, text, user, date, branch, files, store, | |
336 | editor=None): |
|
337 | editor=None): | |
337 | def getfilectx(repo, memctx, path): |
|
338 | def getfilectx(repo, memctx, path): | |
338 | data, (islink, isexec), copied = store.getfile(path) |
|
339 | data, (islink, isexec), copied = store.getfile(path) | |
339 | return memfilectx(repo, path, data, islink=islink, isexec=isexec, |
|
340 | return memfilectx(repo, path, data, islink=islink, isexec=isexec, | |
340 | copied=copied, memctx=memctx) |
|
341 | copied=copied, memctx=memctx) | |
341 | extra = {} |
|
342 | extra = {} | |
342 | if branch: |
|
343 | if branch: | |
343 | extra['branch'] = encoding.fromlocal(branch) |
|
344 | extra['branch'] = encoding.fromlocal(branch) | |
344 | ctx = memctx(repo, parents, text, files, getfilectx, user, |
|
345 | ctx = memctx(repo, parents, text, files, getfilectx, user, | |
345 | date, extra, editor) |
|
346 | date, extra, editor) | |
346 | return ctx |
|
347 | return ctx | |
347 |
|
348 | |||
348 | class changectx(basectx): |
|
349 | class changectx(basectx): | |
349 | """A changecontext object makes access to data related to a particular |
|
350 | """A changecontext object makes access to data related to a particular | |
350 | changeset convenient. It represents a read-only context already present in |
|
351 | changeset convenient. It represents a read-only context already present in | |
351 | the repo.""" |
|
352 | the repo.""" | |
352 | def __init__(self, repo, changeid=''): |
|
353 | def __init__(self, repo, changeid=''): | |
353 | """changeid is a revision number, node, or tag""" |
|
354 | """changeid is a revision number, node, or tag""" | |
354 |
|
355 | |||
355 | # since basectx.__new__ already took care of copying the object, we |
|
356 | # since basectx.__new__ already took care of copying the object, we | |
356 | # don't need to do anything in __init__, so we just exit here |
|
357 | # don't need to do anything in __init__, so we just exit here | |
357 | if isinstance(changeid, basectx): |
|
358 | if isinstance(changeid, basectx): | |
358 | return |
|
359 | return | |
359 |
|
360 | |||
360 | if changeid == '': |
|
361 | if changeid == '': | |
361 | changeid = '.' |
|
362 | changeid = '.' | |
362 | self._repo = repo |
|
363 | self._repo = repo | |
363 |
|
364 | |||
364 | if isinstance(changeid, int): |
|
365 | if isinstance(changeid, int): | |
365 | try: |
|
366 | try: | |
366 | self._node = repo.changelog.node(changeid) |
|
367 | self._node = repo.changelog.node(changeid) | |
367 | except IndexError: |
|
368 | except IndexError: | |
368 | raise error.RepoLookupError( |
|
369 | raise error.RepoLookupError( | |
369 | _("unknown revision '%s'") % changeid) |
|
370 | _("unknown revision '%s'") % changeid) | |
370 | self._rev = changeid |
|
371 | self._rev = changeid | |
371 | return |
|
372 | return | |
372 | if isinstance(changeid, long): |
|
373 | if isinstance(changeid, long): | |
373 | changeid = str(changeid) |
|
374 | changeid = str(changeid) | |
374 | if changeid == '.': |
|
375 | if changeid == '.': | |
375 | self._node = repo.dirstate.p1() |
|
376 | self._node = repo.dirstate.p1() | |
376 | self._rev = repo.changelog.rev(self._node) |
|
377 | self._rev = repo.changelog.rev(self._node) | |
377 | return |
|
378 | return | |
378 | if changeid == 'null': |
|
379 | if changeid == 'null': | |
379 | self._node = nullid |
|
380 | self._node = nullid | |
380 | self._rev = nullrev |
|
381 | self._rev = nullrev | |
381 | return |
|
382 | return | |
382 | if changeid == 'tip': |
|
383 | if changeid == 'tip': | |
383 | self._node = repo.changelog.tip() |
|
384 | self._node = repo.changelog.tip() | |
384 | self._rev = repo.changelog.rev(self._node) |
|
385 | self._rev = repo.changelog.rev(self._node) | |
385 | return |
|
386 | return | |
386 | if len(changeid) == 20: |
|
387 | if len(changeid) == 20: | |
387 | try: |
|
388 | try: | |
388 | self._node = changeid |
|
389 | self._node = changeid | |
389 | self._rev = repo.changelog.rev(changeid) |
|
390 | self._rev = repo.changelog.rev(changeid) | |
390 | return |
|
391 | return | |
391 | except LookupError: |
|
392 | except LookupError: | |
392 | pass |
|
393 | pass | |
393 |
|
394 | |||
394 | try: |
|
395 | try: | |
395 | r = int(changeid) |
|
396 | r = int(changeid) | |
396 | if str(r) != changeid: |
|
397 | if str(r) != changeid: | |
397 | raise ValueError |
|
398 | raise ValueError | |
398 | l = len(repo.changelog) |
|
399 | l = len(repo.changelog) | |
399 | if r < 0: |
|
400 | if r < 0: | |
400 | r += l |
|
401 | r += l | |
401 | if r < 0 or r >= l: |
|
402 | if r < 0 or r >= l: | |
402 | raise ValueError |
|
403 | raise ValueError | |
403 | self._rev = r |
|
404 | self._rev = r | |
404 | self._node = repo.changelog.node(r) |
|
405 | self._node = repo.changelog.node(r) | |
405 | return |
|
406 | return | |
406 | except (ValueError, OverflowError, IndexError): |
|
407 | except (ValueError, OverflowError, IndexError): | |
407 | pass |
|
408 | pass | |
408 |
|
409 | |||
409 | if len(changeid) == 40: |
|
410 | if len(changeid) == 40: | |
410 | try: |
|
411 | try: | |
411 | self._node = bin(changeid) |
|
412 | self._node = bin(changeid) | |
412 | self._rev = repo.changelog.rev(self._node) |
|
413 | self._rev = repo.changelog.rev(self._node) | |
413 | return |
|
414 | return | |
414 | except (TypeError, LookupError): |
|
415 | except (TypeError, LookupError): | |
415 | pass |
|
416 | pass | |
416 |
|
417 | |||
417 | if changeid in repo._bookmarks: |
|
418 | if changeid in repo._bookmarks: | |
418 | self._node = repo._bookmarks[changeid] |
|
419 | self._node = repo._bookmarks[changeid] | |
419 | self._rev = repo.changelog.rev(self._node) |
|
420 | self._rev = repo.changelog.rev(self._node) | |
420 | return |
|
421 | return | |
421 | if changeid in repo._tagscache.tags: |
|
422 | if changeid in repo._tagscache.tags: | |
422 | self._node = repo._tagscache.tags[changeid] |
|
423 | self._node = repo._tagscache.tags[changeid] | |
423 | self._rev = repo.changelog.rev(self._node) |
|
424 | self._rev = repo.changelog.rev(self._node) | |
424 | return |
|
425 | return | |
425 | try: |
|
426 | try: | |
426 | self._node = repo.branchtip(changeid) |
|
427 | self._node = repo.branchtip(changeid) | |
427 | self._rev = repo.changelog.rev(self._node) |
|
428 | self._rev = repo.changelog.rev(self._node) | |
428 | return |
|
429 | return | |
429 | except error.RepoLookupError: |
|
430 | except error.RepoLookupError: | |
430 | pass |
|
431 | pass | |
431 |
|
432 | |||
432 | self._node = repo.changelog._partialmatch(changeid) |
|
433 | self._node = repo.changelog._partialmatch(changeid) | |
433 | if self._node is not None: |
|
434 | if self._node is not None: | |
434 | self._rev = repo.changelog.rev(self._node) |
|
435 | self._rev = repo.changelog.rev(self._node) | |
435 | return |
|
436 | return | |
436 |
|
437 | |||
437 | # lookup failed |
|
438 | # lookup failed | |
438 | # check if it might have come from damaged dirstate |
|
439 | # check if it might have come from damaged dirstate | |
439 | # |
|
440 | # | |
440 | # XXX we could avoid the unfiltered if we had a recognizable exception |
|
441 | # XXX we could avoid the unfiltered if we had a recognizable exception | |
441 | # for filtered changeset access |
|
442 | # for filtered changeset access | |
442 | if changeid in repo.unfiltered().dirstate.parents(): |
|
443 | if changeid in repo.unfiltered().dirstate.parents(): | |
443 | raise error.Abort(_("working directory has unknown parent '%s'!") |
|
444 | raise error.Abort(_("working directory has unknown parent '%s'!") | |
444 | % short(changeid)) |
|
445 | % short(changeid)) | |
445 | try: |
|
446 | try: | |
446 | if len(changeid) == 20: |
|
447 | if len(changeid) == 20: | |
447 | changeid = hex(changeid) |
|
448 | changeid = hex(changeid) | |
448 | except TypeError: |
|
449 | except TypeError: | |
449 | pass |
|
450 | pass | |
450 | raise error.RepoLookupError( |
|
451 | raise error.RepoLookupError( | |
451 | _("unknown revision '%s'") % changeid) |
|
452 | _("unknown revision '%s'") % changeid) | |
452 |
|
453 | |||
453 | def __hash__(self): |
|
454 | def __hash__(self): | |
454 | try: |
|
455 | try: | |
455 | return hash(self._rev) |
|
456 | return hash(self._rev) | |
456 | except AttributeError: |
|
457 | except AttributeError: | |
457 | return id(self) |
|
458 | return id(self) | |
458 |
|
459 | |||
459 | def __nonzero__(self): |
|
460 | def __nonzero__(self): | |
460 | return self._rev != nullrev |
|
461 | return self._rev != nullrev | |
461 |
|
462 | |||
462 | @propertycache |
|
463 | @propertycache | |
463 | def _changeset(self): |
|
464 | def _changeset(self): | |
464 | return self._repo.changelog.read(self.rev()) |
|
465 | return self._repo.changelog.read(self.rev()) | |
465 |
|
466 | |||
466 | @propertycache |
|
467 | @propertycache | |
467 | def _manifest(self): |
|
468 | def _manifest(self): | |
468 | return self._repo.manifest.read(self._changeset[0]) |
|
469 | return self._repo.manifest.read(self._changeset[0]) | |
469 |
|
470 | |||
470 | @propertycache |
|
471 | @propertycache | |
471 | def _manifestdelta(self): |
|
472 | def _manifestdelta(self): | |
472 | return self._repo.manifest.readdelta(self._changeset[0]) |
|
473 | return self._repo.manifest.readdelta(self._changeset[0]) | |
473 |
|
474 | |||
474 | @propertycache |
|
475 | @propertycache | |
475 | def _parents(self): |
|
476 | def _parents(self): | |
476 | p = self._repo.changelog.parentrevs(self._rev) |
|
477 | p = self._repo.changelog.parentrevs(self._rev) | |
477 | if p[1] == nullrev: |
|
478 | if p[1] == nullrev: | |
478 | p = p[:-1] |
|
479 | p = p[:-1] | |
479 | return [changectx(self._repo, x) for x in p] |
|
480 | return [changectx(self._repo, x) for x in p] | |
480 |
|
481 | |||
481 | def changeset(self): |
|
482 | def changeset(self): | |
482 | return self._changeset |
|
483 | return self._changeset | |
483 | def manifestnode(self): |
|
484 | def manifestnode(self): | |
484 | return self._changeset[0] |
|
485 | return self._changeset[0] | |
485 |
|
486 | |||
486 | def user(self): |
|
487 | def user(self): | |
487 | return self._changeset[1] |
|
488 | return self._changeset[1] | |
488 | def date(self): |
|
489 | def date(self): | |
489 | return self._changeset[2] |
|
490 | return self._changeset[2] | |
490 | def files(self): |
|
491 | def files(self): | |
491 | return self._changeset[3] |
|
492 | return self._changeset[3] | |
492 | def description(self): |
|
493 | def description(self): | |
493 | return self._changeset[4] |
|
494 | return self._changeset[4] | |
494 | def branch(self): |
|
495 | def branch(self): | |
495 | return encoding.tolocal(self._changeset[5].get("branch")) |
|
496 | return encoding.tolocal(self._changeset[5].get("branch")) | |
496 | def closesbranch(self): |
|
497 | def closesbranch(self): | |
497 | return 'close' in self._changeset[5] |
|
498 | return 'close' in self._changeset[5] | |
498 | def extra(self): |
|
499 | def extra(self): | |
499 | return self._changeset[5] |
|
500 | return self._changeset[5] | |
500 | def tags(self): |
|
501 | def tags(self): | |
501 | return self._repo.nodetags(self._node) |
|
502 | return self._repo.nodetags(self._node) | |
502 | def bookmarks(self): |
|
503 | def bookmarks(self): | |
503 | return self._repo.nodebookmarks(self._node) |
|
504 | return self._repo.nodebookmarks(self._node) | |
504 | def phase(self): |
|
505 | def phase(self): | |
505 | return self._repo._phasecache.phase(self._repo, self._rev) |
|
506 | return self._repo._phasecache.phase(self._repo, self._rev) | |
506 | def hidden(self): |
|
507 | def hidden(self): | |
507 | return self._rev in repoview.filterrevs(self._repo, 'visible') |
|
508 | return self._rev in repoview.filterrevs(self._repo, 'visible') | |
508 |
|
509 | |||
509 | def children(self): |
|
510 | def children(self): | |
510 | """return contexts for each child changeset""" |
|
511 | """return contexts for each child changeset""" | |
511 | c = self._repo.changelog.children(self._node) |
|
512 | c = self._repo.changelog.children(self._node) | |
512 | return [changectx(self._repo, x) for x in c] |
|
513 | return [changectx(self._repo, x) for x in c] | |
513 |
|
514 | |||
514 | def ancestors(self): |
|
515 | def ancestors(self): | |
515 | for a in self._repo.changelog.ancestors([self._rev]): |
|
516 | for a in self._repo.changelog.ancestors([self._rev]): | |
516 | yield changectx(self._repo, a) |
|
517 | yield changectx(self._repo, a) | |
517 |
|
518 | |||
518 | def descendants(self): |
|
519 | def descendants(self): | |
519 | for d in self._repo.changelog.descendants([self._rev]): |
|
520 | for d in self._repo.changelog.descendants([self._rev]): | |
520 | yield changectx(self._repo, d) |
|
521 | yield changectx(self._repo, d) | |
521 |
|
522 | |||
522 | def filectx(self, path, fileid=None, filelog=None): |
|
523 | def filectx(self, path, fileid=None, filelog=None): | |
523 | """get a file context from this changeset""" |
|
524 | """get a file context from this changeset""" | |
524 | if fileid is None: |
|
525 | if fileid is None: | |
525 | fileid = self.filenode(path) |
|
526 | fileid = self.filenode(path) | |
526 | return filectx(self._repo, path, fileid=fileid, |
|
527 | return filectx(self._repo, path, fileid=fileid, | |
527 | changectx=self, filelog=filelog) |
|
528 | changectx=self, filelog=filelog) | |
528 |
|
529 | |||
529 | def ancestor(self, c2, warn=False): |
|
530 | def ancestor(self, c2, warn=False): | |
530 | """ |
|
531 | """ | |
531 | return the "best" ancestor context of self and c2 |
|
532 | return the "best" ancestor context of self and c2 | |
532 | """ |
|
533 | """ | |
533 | # deal with workingctxs |
|
534 | # deal with workingctxs | |
534 | n2 = c2._node |
|
535 | n2 = c2._node | |
535 | if n2 is None: |
|
536 | if n2 is None: | |
536 | n2 = c2._parents[0]._node |
|
537 | n2 = c2._parents[0]._node | |
537 | cahs = self._repo.changelog.commonancestorsheads(self._node, n2) |
|
538 | cahs = self._repo.changelog.commonancestorsheads(self._node, n2) | |
538 | if not cahs: |
|
539 | if not cahs: | |
539 | anc = nullid |
|
540 | anc = nullid | |
540 | elif len(cahs) == 1: |
|
541 | elif len(cahs) == 1: | |
541 | anc = cahs[0] |
|
542 | anc = cahs[0] | |
542 | else: |
|
543 | else: | |
543 | for r in self._repo.ui.configlist('merge', 'preferancestor'): |
|
544 | for r in self._repo.ui.configlist('merge', 'preferancestor'): | |
544 | ctx = changectx(self._repo, r) |
|
545 | ctx = changectx(self._repo, r) | |
545 | anc = ctx.node() |
|
546 | anc = ctx.node() | |
546 | if anc in cahs: |
|
547 | if anc in cahs: | |
547 | break |
|
548 | break | |
548 | else: |
|
549 | else: | |
549 | anc = self._repo.changelog.ancestor(self._node, n2) |
|
550 | anc = self._repo.changelog.ancestor(self._node, n2) | |
550 | if warn: |
|
551 | if warn: | |
551 | self._repo.ui.status( |
|
552 | self._repo.ui.status( | |
552 | (_("note: using %s as ancestor of %s and %s\n") % |
|
553 | (_("note: using %s as ancestor of %s and %s\n") % | |
553 | (short(anc), short(self._node), short(n2))) + |
|
554 | (short(anc), short(self._node), short(n2))) + | |
554 | ''.join(_(" alternatively, use --config " |
|
555 | ''.join(_(" alternatively, use --config " | |
555 | "merge.preferancestor=%s\n") % |
|
556 | "merge.preferancestor=%s\n") % | |
556 | short(n) for n in sorted(cahs) if n != anc)) |
|
557 | short(n) for n in sorted(cahs) if n != anc)) | |
557 | return changectx(self._repo, anc) |
|
558 | return changectx(self._repo, anc) | |
558 |
|
559 | |||
559 | def descendant(self, other): |
|
560 | def descendant(self, other): | |
560 | """True if other is descendant of this changeset""" |
|
561 | """True if other is descendant of this changeset""" | |
561 | return self._repo.changelog.descendant(self._rev, other._rev) |
|
562 | return self._repo.changelog.descendant(self._rev, other._rev) | |
562 |
|
563 | |||
563 | def walk(self, match): |
|
564 | def walk(self, match): | |
564 | fset = set(match.files()) |
|
565 | fset = set(match.files()) | |
565 | # for dirstate.walk, files=['.'] means "walk the whole tree". |
|
566 | # for dirstate.walk, files=['.'] means "walk the whole tree". | |
566 | # follow that here, too |
|
567 | # follow that here, too | |
567 | fset.discard('.') |
|
568 | fset.discard('.') | |
568 |
|
569 | |||
569 | # avoid the entire walk if we're only looking for specific files |
|
570 | # avoid the entire walk if we're only looking for specific files | |
570 | if fset and not match.anypats(): |
|
571 | if fset and not match.anypats(): | |
571 | if util.all([fn in self for fn in fset]): |
|
572 | if util.all([fn in self for fn in fset]): | |
572 | for fn in sorted(fset): |
|
573 | for fn in sorted(fset): | |
573 | if match(fn): |
|
574 | if match(fn): | |
574 | yield fn |
|
575 | yield fn | |
575 | raise StopIteration |
|
576 | raise StopIteration | |
576 |
|
577 | |||
577 | for fn in self: |
|
578 | for fn in self: | |
578 | if fn in fset: |
|
579 | if fn in fset: | |
579 | # specified pattern is the exact name |
|
580 | # specified pattern is the exact name | |
580 | fset.remove(fn) |
|
581 | fset.remove(fn) | |
581 | if match(fn): |
|
582 | if match(fn): | |
582 | yield fn |
|
583 | yield fn | |
583 | for fn in sorted(fset): |
|
584 | for fn in sorted(fset): | |
584 | if fn in self._dirs: |
|
585 | if fn in self._dirs: | |
585 | # specified pattern is a directory |
|
586 | # specified pattern is a directory | |
586 | continue |
|
587 | continue | |
587 | match.bad(fn, _('no such file in rev %s') % self) |
|
588 | match.bad(fn, _('no such file in rev %s') % self) | |
588 |
|
589 | |||
589 | class basefilectx(object): |
|
590 | class basefilectx(object): | |
590 | """A filecontext object represents the common logic for its children: |
|
591 | """A filecontext object represents the common logic for its children: | |
591 | filectx: read-only access to a filerevision that is already present |
|
592 | filectx: read-only access to a filerevision that is already present | |
592 | in the repo, |
|
593 | in the repo, | |
593 | workingfilectx: a filecontext that represents files from the working |
|
594 | workingfilectx: a filecontext that represents files from the working | |
594 | directory, |
|
595 | directory, | |
595 | memfilectx: a filecontext that represents files in-memory.""" |
|
596 | memfilectx: a filecontext that represents files in-memory.""" | |
596 | def __new__(cls, repo, path, *args, **kwargs): |
|
597 | def __new__(cls, repo, path, *args, **kwargs): | |
597 | return super(basefilectx, cls).__new__(cls) |
|
598 | return super(basefilectx, cls).__new__(cls) | |
598 |
|
599 | |||
599 | @propertycache |
|
600 | @propertycache | |
600 | def _filelog(self): |
|
601 | def _filelog(self): | |
601 | return self._repo.file(self._path) |
|
602 | return self._repo.file(self._path) | |
602 |
|
603 | |||
603 | @propertycache |
|
604 | @propertycache | |
604 | def _changeid(self): |
|
605 | def _changeid(self): | |
605 | if '_changeid' in self.__dict__: |
|
606 | if '_changeid' in self.__dict__: | |
606 | return self._changeid |
|
607 | return self._changeid | |
607 | elif '_changectx' in self.__dict__: |
|
608 | elif '_changectx' in self.__dict__: | |
608 | return self._changectx.rev() |
|
609 | return self._changectx.rev() | |
609 | else: |
|
610 | else: | |
610 | return self._filelog.linkrev(self._filerev) |
|
611 | return self._filelog.linkrev(self._filerev) | |
611 |
|
612 | |||
612 | @propertycache |
|
613 | @propertycache | |
613 | def _filenode(self): |
|
614 | def _filenode(self): | |
614 | if '_fileid' in self.__dict__: |
|
615 | if '_fileid' in self.__dict__: | |
615 | return self._filelog.lookup(self._fileid) |
|
616 | return self._filelog.lookup(self._fileid) | |
616 | else: |
|
617 | else: | |
617 | return self._changectx.filenode(self._path) |
|
618 | return self._changectx.filenode(self._path) | |
618 |
|
619 | |||
619 | @propertycache |
|
620 | @propertycache | |
620 | def _filerev(self): |
|
621 | def _filerev(self): | |
621 | return self._filelog.rev(self._filenode) |
|
622 | return self._filelog.rev(self._filenode) | |
622 |
|
623 | |||
623 | @propertycache |
|
624 | @propertycache | |
624 | def _repopath(self): |
|
625 | def _repopath(self): | |
625 | return self._path |
|
626 | return self._path | |
626 |
|
627 | |||
627 | def __nonzero__(self): |
|
628 | def __nonzero__(self): | |
628 | try: |
|
629 | try: | |
629 | self._filenode |
|
630 | self._filenode | |
630 | return True |
|
631 | return True | |
631 | except error.LookupError: |
|
632 | except error.LookupError: | |
632 | # file is missing |
|
633 | # file is missing | |
633 | return False |
|
634 | return False | |
634 |
|
635 | |||
635 | def __str__(self): |
|
636 | def __str__(self): | |
636 | return "%s@%s" % (self.path(), self._changectx) |
|
637 | return "%s@%s" % (self.path(), self._changectx) | |
637 |
|
638 | |||
638 | def __repr__(self): |
|
639 | def __repr__(self): | |
639 | return "<%s %s>" % (type(self).__name__, str(self)) |
|
640 | return "<%s %s>" % (type(self).__name__, str(self)) | |
640 |
|
641 | |||
641 | def __hash__(self): |
|
642 | def __hash__(self): | |
642 | try: |
|
643 | try: | |
643 | return hash((self._path, self._filenode)) |
|
644 | return hash((self._path, self._filenode)) | |
644 | except AttributeError: |
|
645 | except AttributeError: | |
645 | return id(self) |
|
646 | return id(self) | |
646 |
|
647 | |||
647 | def __eq__(self, other): |
|
648 | def __eq__(self, other): | |
648 | try: |
|
649 | try: | |
649 | return (type(self) == type(other) and self._path == other._path |
|
650 | return (type(self) == type(other) and self._path == other._path | |
650 | and self._filenode == other._filenode) |
|
651 | and self._filenode == other._filenode) | |
651 | except AttributeError: |
|
652 | except AttributeError: | |
652 | return False |
|
653 | return False | |
653 |
|
654 | |||
654 | def __ne__(self, other): |
|
655 | def __ne__(self, other): | |
655 | return not (self == other) |
|
656 | return not (self == other) | |
656 |
|
657 | |||
657 | def filerev(self): |
|
658 | def filerev(self): | |
658 | return self._filerev |
|
659 | return self._filerev | |
659 | def filenode(self): |
|
660 | def filenode(self): | |
660 | return self._filenode |
|
661 | return self._filenode | |
661 | def flags(self): |
|
662 | def flags(self): | |
662 | return self._changectx.flags(self._path) |
|
663 | return self._changectx.flags(self._path) | |
663 | def filelog(self): |
|
664 | def filelog(self): | |
664 | return self._filelog |
|
665 | return self._filelog | |
665 | def rev(self): |
|
666 | def rev(self): | |
666 | return self._changeid |
|
667 | return self._changeid | |
667 | def linkrev(self): |
|
668 | def linkrev(self): | |
668 | return self._filelog.linkrev(self._filerev) |
|
669 | return self._filelog.linkrev(self._filerev) | |
669 | def node(self): |
|
670 | def node(self): | |
670 | return self._changectx.node() |
|
671 | return self._changectx.node() | |
671 | def hex(self): |
|
672 | def hex(self): | |
672 | return self._changectx.hex() |
|
673 | return self._changectx.hex() | |
673 | def user(self): |
|
674 | def user(self): | |
674 | return self._changectx.user() |
|
675 | return self._changectx.user() | |
675 | def date(self): |
|
676 | def date(self): | |
676 | return self._changectx.date() |
|
677 | return self._changectx.date() | |
677 | def files(self): |
|
678 | def files(self): | |
678 | return self._changectx.files() |
|
679 | return self._changectx.files() | |
679 | def description(self): |
|
680 | def description(self): | |
680 | return self._changectx.description() |
|
681 | return self._changectx.description() | |
681 | def branch(self): |
|
682 | def branch(self): | |
682 | return self._changectx.branch() |
|
683 | return self._changectx.branch() | |
683 | def extra(self): |
|
684 | def extra(self): | |
684 | return self._changectx.extra() |
|
685 | return self._changectx.extra() | |
685 | def phase(self): |
|
686 | def phase(self): | |
686 | return self._changectx.phase() |
|
687 | return self._changectx.phase() | |
687 | def phasestr(self): |
|
688 | def phasestr(self): | |
688 | return self._changectx.phasestr() |
|
689 | return self._changectx.phasestr() | |
689 | def manifest(self): |
|
690 | def manifest(self): | |
690 | return self._changectx.manifest() |
|
691 | return self._changectx.manifest() | |
691 | def changectx(self): |
|
692 | def changectx(self): | |
692 | return self._changectx |
|
693 | return self._changectx | |
693 |
|
694 | |||
694 | def path(self): |
|
695 | def path(self): | |
695 | return self._path |
|
696 | return self._path | |
696 |
|
697 | |||
697 | def isbinary(self): |
|
698 | def isbinary(self): | |
698 | try: |
|
699 | try: | |
699 | return util.binary(self.data()) |
|
700 | return util.binary(self.data()) | |
700 | except IOError: |
|
701 | except IOError: | |
701 | return False |
|
702 | return False | |
702 |
|
703 | |||
703 | def cmp(self, fctx): |
|
704 | def cmp(self, fctx): | |
704 | """compare with other file context |
|
705 | """compare with other file context | |
705 |
|
706 | |||
706 | returns True if different than fctx. |
|
707 | returns True if different than fctx. | |
707 | """ |
|
708 | """ | |
708 | if (fctx._filerev is None |
|
709 | if (fctx._filerev is None | |
709 | and (self._repo._encodefilterpats |
|
710 | and (self._repo._encodefilterpats | |
710 | # if file data starts with '\1\n', empty metadata block is |
|
711 | # if file data starts with '\1\n', empty metadata block is | |
711 | # prepended, which adds 4 bytes to filelog.size(). |
|
712 | # prepended, which adds 4 bytes to filelog.size(). | |
712 | or self.size() - 4 == fctx.size()) |
|
713 | or self.size() - 4 == fctx.size()) | |
713 | or self.size() == fctx.size()): |
|
714 | or self.size() == fctx.size()): | |
714 | return self._filelog.cmp(self._filenode, fctx.data()) |
|
715 | return self._filelog.cmp(self._filenode, fctx.data()) | |
715 |
|
716 | |||
716 | return True |
|
717 | return True | |
717 |
|
718 | |||
718 | def parents(self): |
|
719 | def parents(self): | |
719 | p = self._path |
|
720 | p = self._path | |
720 | fl = self._filelog |
|
721 | fl = self._filelog | |
721 | pl = [(p, n, fl) for n in self._filelog.parents(self._filenode)] |
|
722 | pl = [(p, n, fl) for n in self._filelog.parents(self._filenode)] | |
722 |
|
723 | |||
723 | r = self._filelog.renamed(self._filenode) |
|
724 | r = self._filelog.renamed(self._filenode) | |
724 | if r: |
|
725 | if r: | |
725 | pl[0] = (r[0], r[1], None) |
|
726 | pl[0] = (r[0], r[1], None) | |
726 |
|
727 | |||
727 | return [filectx(self._repo, p, fileid=n, filelog=l) |
|
728 | return [filectx(self._repo, p, fileid=n, filelog=l) | |
728 | for p, n, l in pl if n != nullid] |
|
729 | for p, n, l in pl if n != nullid] | |
729 |
|
730 | |||
730 | def p1(self): |
|
731 | def p1(self): | |
731 | return self.parents()[0] |
|
732 | return self.parents()[0] | |
732 |
|
733 | |||
733 | def p2(self): |
|
734 | def p2(self): | |
734 | p = self.parents() |
|
735 | p = self.parents() | |
735 | if len(p) == 2: |
|
736 | if len(p) == 2: | |
736 | return p[1] |
|
737 | return p[1] | |
737 | return filectx(self._repo, self._path, fileid=-1, filelog=self._filelog) |
|
738 | return filectx(self._repo, self._path, fileid=-1, filelog=self._filelog) | |
738 |
|
739 | |||
739 | def annotate(self, follow=False, linenumber=None, diffopts=None): |
|
740 | def annotate(self, follow=False, linenumber=None, diffopts=None): | |
740 | '''returns a list of tuples of (ctx, line) for each line |
|
741 | '''returns a list of tuples of (ctx, line) for each line | |
741 | in the file, where ctx is the filectx of the node where |
|
742 | in the file, where ctx is the filectx of the node where | |
742 | that line was last changed. |
|
743 | that line was last changed. | |
743 | This returns tuples of ((ctx, linenumber), line) for each line, |
|
744 | This returns tuples of ((ctx, linenumber), line) for each line, | |
744 | if "linenumber" parameter is NOT "None". |
|
745 | if "linenumber" parameter is NOT "None". | |
745 | In such tuples, linenumber means one at the first appearance |
|
746 | In such tuples, linenumber means one at the first appearance | |
746 | in the managed file. |
|
747 | in the managed file. | |
747 | To reduce annotation cost, |
|
748 | To reduce annotation cost, | |
748 | this returns fixed value(False is used) as linenumber, |
|
749 | this returns fixed value(False is used) as linenumber, | |
749 | if "linenumber" parameter is "False".''' |
|
750 | if "linenumber" parameter is "False".''' | |
750 |
|
751 | |||
751 | def decorate_compat(text, rev): |
|
752 | def decorate_compat(text, rev): | |
752 | return ([rev] * len(text.splitlines()), text) |
|
753 | return ([rev] * len(text.splitlines()), text) | |
753 |
|
754 | |||
754 | def without_linenumber(text, rev): |
|
755 | def without_linenumber(text, rev): | |
755 | return ([(rev, False)] * len(text.splitlines()), text) |
|
756 | return ([(rev, False)] * len(text.splitlines()), text) | |
756 |
|
757 | |||
757 | def with_linenumber(text, rev): |
|
758 | def with_linenumber(text, rev): | |
758 | size = len(text.splitlines()) |
|
759 | size = len(text.splitlines()) | |
759 | return ([(rev, i) for i in xrange(1, size + 1)], text) |
|
760 | return ([(rev, i) for i in xrange(1, size + 1)], text) | |
760 |
|
761 | |||
761 | decorate = (((linenumber is None) and decorate_compat) or |
|
762 | decorate = (((linenumber is None) and decorate_compat) or | |
762 | (linenumber and with_linenumber) or |
|
763 | (linenumber and with_linenumber) or | |
763 | without_linenumber) |
|
764 | without_linenumber) | |
764 |
|
765 | |||
765 | def pair(parent, child): |
|
766 | def pair(parent, child): | |
766 | blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts, |
|
767 | blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts, | |
767 | refine=True) |
|
768 | refine=True) | |
768 | for (a1, a2, b1, b2), t in blocks: |
|
769 | for (a1, a2, b1, b2), t in blocks: | |
769 | # Changed blocks ('!') or blocks made only of blank lines ('~') |
|
770 | # Changed blocks ('!') or blocks made only of blank lines ('~') | |
770 | # belong to the child. |
|
771 | # belong to the child. | |
771 | if t == '=': |
|
772 | if t == '=': | |
772 | child[0][b1:b2] = parent[0][a1:a2] |
|
773 | child[0][b1:b2] = parent[0][a1:a2] | |
773 | return child |
|
774 | return child | |
774 |
|
775 | |||
775 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) |
|
776 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) | |
776 |
|
777 | |||
777 | def parents(f): |
|
778 | def parents(f): | |
778 | pl = f.parents() |
|
779 | pl = f.parents() | |
779 |
|
780 | |||
780 | # Don't return renamed parents if we aren't following. |
|
781 | # Don't return renamed parents if we aren't following. | |
781 | if not follow: |
|
782 | if not follow: | |
782 | pl = [p for p in pl if p.path() == f.path()] |
|
783 | pl = [p for p in pl if p.path() == f.path()] | |
783 |
|
784 | |||
784 | # renamed filectx won't have a filelog yet, so set it |
|
785 | # renamed filectx won't have a filelog yet, so set it | |
785 | # from the cache to save time |
|
786 | # from the cache to save time | |
786 | for p in pl: |
|
787 | for p in pl: | |
787 | if not '_filelog' in p.__dict__: |
|
788 | if not '_filelog' in p.__dict__: | |
788 | p._filelog = getlog(p.path()) |
|
789 | p._filelog = getlog(p.path()) | |
789 |
|
790 | |||
790 | return pl |
|
791 | return pl | |
791 |
|
792 | |||
792 | # use linkrev to find the first changeset where self appeared |
|
793 | # use linkrev to find the first changeset where self appeared | |
793 | if self.rev() != self.linkrev(): |
|
794 | if self.rev() != self.linkrev(): | |
794 | base = self.filectx(self.filenode()) |
|
795 | base = self.filectx(self.filenode()) | |
795 | else: |
|
796 | else: | |
796 | base = self |
|
797 | base = self | |
797 |
|
798 | |||
798 | # This algorithm would prefer to be recursive, but Python is a |
|
799 | # This algorithm would prefer to be recursive, but Python is a | |
799 | # bit recursion-hostile. Instead we do an iterative |
|
800 | # bit recursion-hostile. Instead we do an iterative | |
800 | # depth-first search. |
|
801 | # depth-first search. | |
801 |
|
802 | |||
802 | visit = [base] |
|
803 | visit = [base] | |
803 | hist = {} |
|
804 | hist = {} | |
804 | pcache = {} |
|
805 | pcache = {} | |
805 | needed = {base: 1} |
|
806 | needed = {base: 1} | |
806 | while visit: |
|
807 | while visit: | |
807 | f = visit[-1] |
|
808 | f = visit[-1] | |
808 | pcached = f in pcache |
|
809 | pcached = f in pcache | |
809 | if not pcached: |
|
810 | if not pcached: | |
810 | pcache[f] = parents(f) |
|
811 | pcache[f] = parents(f) | |
811 |
|
812 | |||
812 | ready = True |
|
813 | ready = True | |
813 | pl = pcache[f] |
|
814 | pl = pcache[f] | |
814 | for p in pl: |
|
815 | for p in pl: | |
815 | if p not in hist: |
|
816 | if p not in hist: | |
816 | ready = False |
|
817 | ready = False | |
817 | visit.append(p) |
|
818 | visit.append(p) | |
818 | if not pcached: |
|
819 | if not pcached: | |
819 | needed[p] = needed.get(p, 0) + 1 |
|
820 | needed[p] = needed.get(p, 0) + 1 | |
820 | if ready: |
|
821 | if ready: | |
821 | visit.pop() |
|
822 | visit.pop() | |
822 | reusable = f in hist |
|
823 | reusable = f in hist | |
823 | if reusable: |
|
824 | if reusable: | |
824 | curr = hist[f] |
|
825 | curr = hist[f] | |
825 | else: |
|
826 | else: | |
826 | curr = decorate(f.data(), f) |
|
827 | curr = decorate(f.data(), f) | |
827 | for p in pl: |
|
828 | for p in pl: | |
828 | if not reusable: |
|
829 | if not reusable: | |
829 | curr = pair(hist[p], curr) |
|
830 | curr = pair(hist[p], curr) | |
830 | if needed[p] == 1: |
|
831 | if needed[p] == 1: | |
831 | del hist[p] |
|
832 | del hist[p] | |
832 | del needed[p] |
|
833 | del needed[p] | |
833 | else: |
|
834 | else: | |
834 | needed[p] -= 1 |
|
835 | needed[p] -= 1 | |
835 |
|
836 | |||
836 | hist[f] = curr |
|
837 | hist[f] = curr | |
837 | pcache[f] = [] |
|
838 | pcache[f] = [] | |
838 |
|
839 | |||
839 | return zip(hist[base][0], hist[base][1].splitlines(True)) |
|
840 | return zip(hist[base][0], hist[base][1].splitlines(True)) | |
840 |
|
841 | |||
841 | def ancestors(self, followfirst=False): |
|
842 | def ancestors(self, followfirst=False): | |
842 | visit = {} |
|
843 | visit = {} | |
843 | c = self |
|
844 | c = self | |
844 | cut = followfirst and 1 or None |
|
845 | cut = followfirst and 1 or None | |
845 | while True: |
|
846 | while True: | |
846 | for parent in c.parents()[:cut]: |
|
847 | for parent in c.parents()[:cut]: | |
847 | visit[(parent.rev(), parent.node())] = parent |
|
848 | visit[(parent.rev(), parent.node())] = parent | |
848 | if not visit: |
|
849 | if not visit: | |
849 | break |
|
850 | break | |
850 | c = visit.pop(max(visit)) |
|
851 | c = visit.pop(max(visit)) | |
851 | yield c |
|
852 | yield c | |
852 |
|
853 | |||
853 | class filectx(basefilectx): |
|
854 | class filectx(basefilectx): | |
854 | """A filecontext object makes access to data related to a particular |
|
855 | """A filecontext object makes access to data related to a particular | |
855 | filerevision convenient.""" |
|
856 | filerevision convenient.""" | |
856 | def __init__(self, repo, path, changeid=None, fileid=None, |
|
857 | def __init__(self, repo, path, changeid=None, fileid=None, | |
857 | filelog=None, changectx=None): |
|
858 | filelog=None, changectx=None): | |
858 | """changeid can be a changeset revision, node, or tag. |
|
859 | """changeid can be a changeset revision, node, or tag. | |
859 | fileid can be a file revision or node.""" |
|
860 | fileid can be a file revision or node.""" | |
860 | self._repo = repo |
|
861 | self._repo = repo | |
861 | self._path = path |
|
862 | self._path = path | |
862 |
|
863 | |||
863 | assert (changeid is not None |
|
864 | assert (changeid is not None | |
864 | or fileid is not None |
|
865 | or fileid is not None | |
865 | or changectx is not None), \ |
|
866 | or changectx is not None), \ | |
866 | ("bad args: changeid=%r, fileid=%r, changectx=%r" |
|
867 | ("bad args: changeid=%r, fileid=%r, changectx=%r" | |
867 | % (changeid, fileid, changectx)) |
|
868 | % (changeid, fileid, changectx)) | |
868 |
|
869 | |||
869 | if filelog is not None: |
|
870 | if filelog is not None: | |
870 | self._filelog = filelog |
|
871 | self._filelog = filelog | |
871 |
|
872 | |||
872 | if changeid is not None: |
|
873 | if changeid is not None: | |
873 | self._changeid = changeid |
|
874 | self._changeid = changeid | |
874 | if changectx is not None: |
|
875 | if changectx is not None: | |
875 | self._changectx = changectx |
|
876 | self._changectx = changectx | |
876 | if fileid is not None: |
|
877 | if fileid is not None: | |
877 | self._fileid = fileid |
|
878 | self._fileid = fileid | |
878 |
|
879 | |||
879 | @propertycache |
|
880 | @propertycache | |
880 | def _changectx(self): |
|
881 | def _changectx(self): | |
881 | try: |
|
882 | try: | |
882 | return changectx(self._repo, self._changeid) |
|
883 | return changectx(self._repo, self._changeid) | |
883 | except error.RepoLookupError: |
|
884 | except error.RepoLookupError: | |
884 | # Linkrev may point to any revision in the repository. When the |
|
885 | # Linkrev may point to any revision in the repository. When the | |
885 | # repository is filtered this may lead to `filectx` trying to build |
|
886 | # repository is filtered this may lead to `filectx` trying to build | |
886 | # `changectx` for filtered revision. In such case we fallback to |
|
887 | # `changectx` for filtered revision. In such case we fallback to | |
887 | # creating `changectx` on the unfiltered version of the reposition. |
|
888 | # creating `changectx` on the unfiltered version of the reposition. | |
888 | # This fallback should not be an issue because `changectx` from |
|
889 | # This fallback should not be an issue because `changectx` from | |
889 | # `filectx` are not used in complex operations that care about |
|
890 | # `filectx` are not used in complex operations that care about | |
890 | # filtering. |
|
891 | # filtering. | |
891 | # |
|
892 | # | |
892 | # This fallback is a cheap and dirty fix that prevent several |
|
893 | # This fallback is a cheap and dirty fix that prevent several | |
893 | # crashes. It does not ensure the behavior is correct. However the |
|
894 | # crashes. It does not ensure the behavior is correct. However the | |
894 | # behavior was not correct before filtering either and "incorrect |
|
895 | # behavior was not correct before filtering either and "incorrect | |
895 | # behavior" is seen as better as "crash" |
|
896 | # behavior" is seen as better as "crash" | |
896 | # |
|
897 | # | |
897 | # Linkrevs have several serious troubles with filtering that are |
|
898 | # Linkrevs have several serious troubles with filtering that are | |
898 | # complicated to solve. Proper handling of the issue here should be |
|
899 | # complicated to solve. Proper handling of the issue here should be | |
899 | # considered when solving linkrev issue are on the table. |
|
900 | # considered when solving linkrev issue are on the table. | |
900 | return changectx(self._repo.unfiltered(), self._changeid) |
|
901 | return changectx(self._repo.unfiltered(), self._changeid) | |
901 |
|
902 | |||
902 | def filectx(self, fileid): |
|
903 | def filectx(self, fileid): | |
903 | '''opens an arbitrary revision of the file without |
|
904 | '''opens an arbitrary revision of the file without | |
904 | opening a new filelog''' |
|
905 | opening a new filelog''' | |
905 | return filectx(self._repo, self._path, fileid=fileid, |
|
906 | return filectx(self._repo, self._path, fileid=fileid, | |
906 | filelog=self._filelog) |
|
907 | filelog=self._filelog) | |
907 |
|
908 | |||
908 | def data(self): |
|
909 | def data(self): | |
909 | return self._filelog.read(self._filenode) |
|
910 | return self._filelog.read(self._filenode) | |
910 | def size(self): |
|
911 | def size(self): | |
911 | return self._filelog.size(self._filerev) |
|
912 | return self._filelog.size(self._filerev) | |
912 |
|
913 | |||
913 | def renamed(self): |
|
914 | def renamed(self): | |
914 | """check if file was actually renamed in this changeset revision |
|
915 | """check if file was actually renamed in this changeset revision | |
915 |
|
916 | |||
916 | If rename logged in file revision, we report copy for changeset only |
|
917 | If rename logged in file revision, we report copy for changeset only | |
917 | if file revisions linkrev points back to the changeset in question |
|
918 | if file revisions linkrev points back to the changeset in question | |
918 | or both changeset parents contain different file revisions. |
|
919 | or both changeset parents contain different file revisions. | |
919 | """ |
|
920 | """ | |
920 |
|
921 | |||
921 | renamed = self._filelog.renamed(self._filenode) |
|
922 | renamed = self._filelog.renamed(self._filenode) | |
922 | if not renamed: |
|
923 | if not renamed: | |
923 | return renamed |
|
924 | return renamed | |
924 |
|
925 | |||
925 | if self.rev() == self.linkrev(): |
|
926 | if self.rev() == self.linkrev(): | |
926 | return renamed |
|
927 | return renamed | |
927 |
|
928 | |||
928 | name = self.path() |
|
929 | name = self.path() | |
929 | fnode = self._filenode |
|
930 | fnode = self._filenode | |
930 | for p in self._changectx.parents(): |
|
931 | for p in self._changectx.parents(): | |
931 | try: |
|
932 | try: | |
932 | if fnode == p.filenode(name): |
|
933 | if fnode == p.filenode(name): | |
933 | return None |
|
934 | return None | |
934 | except error.LookupError: |
|
935 | except error.LookupError: | |
935 | pass |
|
936 | pass | |
936 | return renamed |
|
937 | return renamed | |
937 |
|
938 | |||
938 | def children(self): |
|
939 | def children(self): | |
939 | # hard for renames |
|
940 | # hard for renames | |
940 | c = self._filelog.children(self._filenode) |
|
941 | c = self._filelog.children(self._filenode) | |
941 | return [filectx(self._repo, self._path, fileid=x, |
|
942 | return [filectx(self._repo, self._path, fileid=x, | |
942 | filelog=self._filelog) for x in c] |
|
943 | filelog=self._filelog) for x in c] | |
943 |
|
944 | |||
944 | class committablectx(basectx): |
|
945 | class committablectx(basectx): | |
945 | """A committablectx object provides common functionality for a context that |
|
946 | """A committablectx object provides common functionality for a context that | |
946 | wants the ability to commit, e.g. workingctx or memctx.""" |
|
947 | wants the ability to commit, e.g. workingctx or memctx.""" | |
947 | def __init__(self, repo, text="", user=None, date=None, extra=None, |
|
948 | def __init__(self, repo, text="", user=None, date=None, extra=None, | |
948 | changes=None): |
|
949 | changes=None): | |
949 | self._repo = repo |
|
950 | self._repo = repo | |
950 | self._rev = None |
|
951 | self._rev = None | |
951 | self._node = None |
|
952 | self._node = None | |
952 | self._text = text |
|
953 | self._text = text | |
953 | if date: |
|
954 | if date: | |
954 | self._date = util.parsedate(date) |
|
955 | self._date = util.parsedate(date) | |
955 | if user: |
|
956 | if user: | |
956 | self._user = user |
|
957 | self._user = user | |
957 | if changes: |
|
958 | if changes: | |
958 | self._status = changes |
|
959 | self._status = changes | |
959 |
|
960 | |||
960 | self._extra = {} |
|
961 | self._extra = {} | |
961 | if extra: |
|
962 | if extra: | |
962 | self._extra = extra.copy() |
|
963 | self._extra = extra.copy() | |
963 | if 'branch' not in self._extra: |
|
964 | if 'branch' not in self._extra: | |
964 | try: |
|
965 | try: | |
965 | branch = encoding.fromlocal(self._repo.dirstate.branch()) |
|
966 | branch = encoding.fromlocal(self._repo.dirstate.branch()) | |
966 | except UnicodeDecodeError: |
|
967 | except UnicodeDecodeError: | |
967 | raise util.Abort(_('branch name not in UTF-8!')) |
|
968 | raise util.Abort(_('branch name not in UTF-8!')) | |
968 | self._extra['branch'] = branch |
|
969 | self._extra['branch'] = branch | |
969 | if self._extra['branch'] == '': |
|
970 | if self._extra['branch'] == '': | |
970 | self._extra['branch'] = 'default' |
|
971 | self._extra['branch'] = 'default' | |
971 |
|
972 | |||
972 | def __str__(self): |
|
973 | def __str__(self): | |
973 | return str(self._parents[0]) + "+" |
|
974 | return str(self._parents[0]) + "+" | |
974 |
|
975 | |||
975 | def __nonzero__(self): |
|
976 | def __nonzero__(self): | |
976 | return True |
|
977 | return True | |
977 |
|
978 | |||
978 | def __contains__(self, key): |
|
979 | def __contains__(self, key): | |
979 | return self._repo.dirstate[key] not in "?r" |
|
980 | return self._repo.dirstate[key] not in "?r" | |
980 |
|
981 | |||
981 | def _buildflagfunc(self): |
|
982 | def _buildflagfunc(self): | |
982 | # Create a fallback function for getting file flags when the |
|
983 | # Create a fallback function for getting file flags when the | |
983 | # filesystem doesn't support them |
|
984 | # filesystem doesn't support them | |
984 |
|
985 | |||
985 | copiesget = self._repo.dirstate.copies().get |
|
986 | copiesget = self._repo.dirstate.copies().get | |
986 |
|
987 | |||
987 | if len(self._parents) < 2: |
|
988 | if len(self._parents) < 2: | |
988 | # when we have one parent, it's easy: copy from parent |
|
989 | # when we have one parent, it's easy: copy from parent | |
989 | man = self._parents[0].manifest() |
|
990 | man = self._parents[0].manifest() | |
990 | def func(f): |
|
991 | def func(f): | |
991 | f = copiesget(f, f) |
|
992 | f = copiesget(f, f) | |
992 | return man.flags(f) |
|
993 | return man.flags(f) | |
993 | else: |
|
994 | else: | |
994 | # merges are tricky: we try to reconstruct the unstored |
|
995 | # merges are tricky: we try to reconstruct the unstored | |
995 | # result from the merge (issue1802) |
|
996 | # result from the merge (issue1802) | |
996 | p1, p2 = self._parents |
|
997 | p1, p2 = self._parents | |
997 | pa = p1.ancestor(p2) |
|
998 | pa = p1.ancestor(p2) | |
998 | m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() |
|
999 | m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() | |
999 |
|
1000 | |||
1000 | def func(f): |
|
1001 | def func(f): | |
1001 | f = copiesget(f, f) # may be wrong for merges with copies |
|
1002 | f = copiesget(f, f) # may be wrong for merges with copies | |
1002 | fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) |
|
1003 | fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) | |
1003 | if fl1 == fl2: |
|
1004 | if fl1 == fl2: | |
1004 | return fl1 |
|
1005 | return fl1 | |
1005 | if fl1 == fla: |
|
1006 | if fl1 == fla: | |
1006 | return fl2 |
|
1007 | return fl2 | |
1007 | if fl2 == fla: |
|
1008 | if fl2 == fla: | |
1008 | return fl1 |
|
1009 | return fl1 | |
1009 | return '' # punt for conflicts |
|
1010 | return '' # punt for conflicts | |
1010 |
|
1011 | |||
1011 | return func |
|
1012 | return func | |
1012 |
|
1013 | |||
1013 | @propertycache |
|
1014 | @propertycache | |
1014 | def _flagfunc(self): |
|
1015 | def _flagfunc(self): | |
1015 | return self._repo.dirstate.flagfunc(self._buildflagfunc) |
|
1016 | return self._repo.dirstate.flagfunc(self._buildflagfunc) | |
1016 |
|
1017 | |||
1017 | @propertycache |
|
1018 | @propertycache | |
1018 | def _manifest(self): |
|
1019 | def _manifest(self): | |
1019 | """generate a manifest corresponding to the values in self._status""" |
|
1020 | """generate a manifest corresponding to the values in self._status""" | |
1020 |
|
1021 | |||
1021 | man = self._parents[0].manifest().copy() |
|
1022 | man = self._parents[0].manifest().copy() | |
1022 | if len(self._parents) > 1: |
|
1023 | if len(self._parents) > 1: | |
1023 | man2 = self.p2().manifest() |
|
1024 | man2 = self.p2().manifest() | |
1024 | def getman(f): |
|
1025 | def getman(f): | |
1025 | if f in man: |
|
1026 | if f in man: | |
1026 | return man |
|
1027 | return man | |
1027 | return man2 |
|
1028 | return man2 | |
1028 | else: |
|
1029 | else: | |
1029 | getman = lambda f: man |
|
1030 | getman = lambda f: man | |
1030 |
|
1031 | |||
1031 | copied = self._repo.dirstate.copies() |
|
1032 | copied = self._repo.dirstate.copies() | |
1032 | ff = self._flagfunc |
|
1033 | ff = self._flagfunc | |
1033 | modified, added, removed, deleted = self._status[:4] |
|
1034 | modified, added, removed, deleted = self._status[:4] | |
1034 | for i, l in (("a", added), ("m", modified)): |
|
1035 | for i, l in (("a", added), ("m", modified)): | |
1035 | for f in l: |
|
1036 | for f in l: | |
1036 | orig = copied.get(f, f) |
|
1037 | orig = copied.get(f, f) | |
1037 | man[f] = getman(orig).get(orig, nullid) + i |
|
1038 | man[f] = getman(orig).get(orig, nullid) + i | |
1038 | try: |
|
1039 | try: | |
1039 | man.set(f, ff(f)) |
|
1040 | man.set(f, ff(f)) | |
1040 | except OSError: |
|
1041 | except OSError: | |
1041 | pass |
|
1042 | pass | |
1042 |
|
1043 | |||
1043 | for f in deleted + removed: |
|
1044 | for f in deleted + removed: | |
1044 | if f in man: |
|
1045 | if f in man: | |
1045 | del man[f] |
|
1046 | del man[f] | |
1046 |
|
1047 | |||
1047 | return man |
|
1048 | return man | |
1048 |
|
1049 | |||
1049 | @propertycache |
|
1050 | @propertycache | |
1050 | def _status(self): |
|
1051 | def _status(self): | |
1051 | return self._repo.status() |
|
1052 | return self._repo.status() | |
1052 |
|
1053 | |||
1053 | @propertycache |
|
1054 | @propertycache | |
1054 | def _user(self): |
|
1055 | def _user(self): | |
1055 | return self._repo.ui.username() |
|
1056 | return self._repo.ui.username() | |
1056 |
|
1057 | |||
1057 | @propertycache |
|
1058 | @propertycache | |
1058 | def _date(self): |
|
1059 | def _date(self): | |
1059 | return util.makedate() |
|
1060 | return util.makedate() | |
1060 |
|
1061 | |||
1061 | def subrev(self, subpath): |
|
1062 | def subrev(self, subpath): | |
1062 | return None |
|
1063 | return None | |
1063 |
|
1064 | |||
1064 | def user(self): |
|
1065 | def user(self): | |
1065 | return self._user or self._repo.ui.username() |
|
1066 | return self._user or self._repo.ui.username() | |
1066 | def date(self): |
|
1067 | def date(self): | |
1067 | return self._date |
|
1068 | return self._date | |
1068 | def description(self): |
|
1069 | def description(self): | |
1069 | return self._text |
|
1070 | return self._text | |
1070 | def files(self): |
|
1071 | def files(self): | |
1071 | return sorted(self._status[0] + self._status[1] + self._status[2]) |
|
1072 | return sorted(self._status[0] + self._status[1] + self._status[2]) | |
1072 |
|
1073 | |||
1073 | def modified(self): |
|
1074 | def modified(self): | |
1074 | return self._status[0] |
|
1075 | return self._status[0] | |
1075 | def added(self): |
|
1076 | def added(self): | |
1076 | return self._status[1] |
|
1077 | return self._status[1] | |
1077 | def removed(self): |
|
1078 | def removed(self): | |
1078 | return self._status[2] |
|
1079 | return self._status[2] | |
1079 | def deleted(self): |
|
1080 | def deleted(self): | |
1080 | return self._status[3] |
|
1081 | return self._status[3] | |
1081 | def unknown(self): |
|
1082 | def unknown(self): | |
1082 | return self._status[4] |
|
1083 | return self._status[4] | |
1083 | def ignored(self): |
|
1084 | def ignored(self): | |
1084 | return self._status[5] |
|
1085 | return self._status[5] | |
1085 | def clean(self): |
|
1086 | def clean(self): | |
1086 | return self._status[6] |
|
1087 | return self._status[6] | |
1087 | def branch(self): |
|
1088 | def branch(self): | |
1088 | return encoding.tolocal(self._extra['branch']) |
|
1089 | return encoding.tolocal(self._extra['branch']) | |
1089 | def closesbranch(self): |
|
1090 | def closesbranch(self): | |
1090 | return 'close' in self._extra |
|
1091 | return 'close' in self._extra | |
1091 | def extra(self): |
|
1092 | def extra(self): | |
1092 | return self._extra |
|
1093 | return self._extra | |
1093 |
|
1094 | |||
1094 | def tags(self): |
|
1095 | def tags(self): | |
1095 | t = [] |
|
1096 | t = [] | |
1096 | for p in self.parents(): |
|
1097 | for p in self.parents(): | |
1097 | t.extend(p.tags()) |
|
1098 | t.extend(p.tags()) | |
1098 | return t |
|
1099 | return t | |
1099 |
|
1100 | |||
1100 | def bookmarks(self): |
|
1101 | def bookmarks(self): | |
1101 | b = [] |
|
1102 | b = [] | |
1102 | for p in self.parents(): |
|
1103 | for p in self.parents(): | |
1103 | b.extend(p.bookmarks()) |
|
1104 | b.extend(p.bookmarks()) | |
1104 | return b |
|
1105 | return b | |
1105 |
|
1106 | |||
1106 | def phase(self): |
|
1107 | def phase(self): | |
1107 | phase = phases.draft # default phase to draft |
|
1108 | phase = phases.draft # default phase to draft | |
1108 | for p in self.parents(): |
|
1109 | for p in self.parents(): | |
1109 | phase = max(phase, p.phase()) |
|
1110 | phase = max(phase, p.phase()) | |
1110 | return phase |
|
1111 | return phase | |
1111 |
|
1112 | |||
1112 | def hidden(self): |
|
1113 | def hidden(self): | |
1113 | return False |
|
1114 | return False | |
1114 |
|
1115 | |||
1115 | def children(self): |
|
1116 | def children(self): | |
1116 | return [] |
|
1117 | return [] | |
1117 |
|
1118 | |||
1118 | def flags(self, path): |
|
1119 | def flags(self, path): | |
1119 | if '_manifest' in self.__dict__: |
|
1120 | if '_manifest' in self.__dict__: | |
1120 | try: |
|
1121 | try: | |
1121 | return self._manifest.flags(path) |
|
1122 | return self._manifest.flags(path) | |
1122 | except KeyError: |
|
1123 | except KeyError: | |
1123 | return '' |
|
1124 | return '' | |
1124 |
|
1125 | |||
1125 | try: |
|
1126 | try: | |
1126 | return self._flagfunc(path) |
|
1127 | return self._flagfunc(path) | |
1127 | except OSError: |
|
1128 | except OSError: | |
1128 | return '' |
|
1129 | return '' | |
1129 |
|
1130 | |||
1130 | def ancestor(self, c2): |
|
1131 | def ancestor(self, c2): | |
1131 | """return the ancestor context of self and c2""" |
|
1132 | """return the ancestor context of self and c2""" | |
1132 | return self._parents[0].ancestor(c2) # punt on two parents for now |
|
1133 | return self._parents[0].ancestor(c2) # punt on two parents for now | |
1133 |
|
1134 | |||
1134 | def walk(self, match): |
|
1135 | def walk(self, match): | |
1135 | return sorted(self._repo.dirstate.walk(match, sorted(self.substate), |
|
1136 | return sorted(self._repo.dirstate.walk(match, sorted(self.substate), | |
1136 | True, False)) |
|
1137 | True, False)) | |
1137 |
|
1138 | |||
1138 | def ancestors(self): |
|
1139 | def ancestors(self): | |
1139 | for a in self._repo.changelog.ancestors( |
|
1140 | for a in self._repo.changelog.ancestors( | |
1140 | [p.rev() for p in self._parents]): |
|
1141 | [p.rev() for p in self._parents]): | |
1141 | yield changectx(self._repo, a) |
|
1142 | yield changectx(self._repo, a) | |
1142 |
|
1143 | |||
1143 | def markcommitted(self, node): |
|
1144 | def markcommitted(self, node): | |
1144 | """Perform post-commit cleanup necessary after committing this ctx |
|
1145 | """Perform post-commit cleanup necessary after committing this ctx | |
1145 |
|
1146 | |||
1146 | Specifically, this updates backing stores this working context |
|
1147 | Specifically, this updates backing stores this working context | |
1147 | wraps to reflect the fact that the changes reflected by this |
|
1148 | wraps to reflect the fact that the changes reflected by this | |
1148 | workingctx have been committed. For example, it marks |
|
1149 | workingctx have been committed. For example, it marks | |
1149 | modified and added files as normal in the dirstate. |
|
1150 | modified and added files as normal in the dirstate. | |
1150 |
|
1151 | |||
1151 | """ |
|
1152 | """ | |
1152 |
|
1153 | |||
1153 | for f in self.modified() + self.added(): |
|
1154 | for f in self.modified() + self.added(): | |
1154 | self._repo.dirstate.normal(f) |
|
1155 | self._repo.dirstate.normal(f) | |
1155 | for f in self.removed(): |
|
1156 | for f in self.removed(): | |
1156 | self._repo.dirstate.drop(f) |
|
1157 | self._repo.dirstate.drop(f) | |
1157 | self._repo.dirstate.setparents(node) |
|
1158 | self._repo.dirstate.setparents(node) | |
1158 |
|
1159 | |||
1159 | def dirs(self): |
|
1160 | def dirs(self): | |
1160 | return self._repo.dirstate.dirs() |
|
1161 | return self._repo.dirstate.dirs() | |
1161 |
|
1162 | |||
1162 | class workingctx(committablectx): |
|
1163 | class workingctx(committablectx): | |
1163 | """A workingctx object makes access to data related to |
|
1164 | """A workingctx object makes access to data related to | |
1164 | the current working directory convenient. |
|
1165 | the current working directory convenient. | |
1165 | date - any valid date string or (unixtime, offset), or None. |
|
1166 | date - any valid date string or (unixtime, offset), or None. | |
1166 | user - username string, or None. |
|
1167 | user - username string, or None. | |
1167 | extra - a dictionary of extra values, or None. |
|
1168 | extra - a dictionary of extra values, or None. | |
1168 | changes - a list of file lists as returned by localrepo.status() |
|
1169 | changes - a list of file lists as returned by localrepo.status() | |
1169 | or None to use the repository status. |
|
1170 | or None to use the repository status. | |
1170 | """ |
|
1171 | """ | |
1171 | def __init__(self, repo, text="", user=None, date=None, extra=None, |
|
1172 | def __init__(self, repo, text="", user=None, date=None, extra=None, | |
1172 | changes=None): |
|
1173 | changes=None): | |
1173 | super(workingctx, self).__init__(repo, text, user, date, extra, changes) |
|
1174 | super(workingctx, self).__init__(repo, text, user, date, extra, changes) | |
1174 |
|
1175 | |||
1175 | def __iter__(self): |
|
1176 | def __iter__(self): | |
1176 | d = self._repo.dirstate |
|
1177 | d = self._repo.dirstate | |
1177 | for f in d: |
|
1178 | for f in d: | |
1178 | if d[f] != 'r': |
|
1179 | if d[f] != 'r': | |
1179 | yield f |
|
1180 | yield f | |
1180 |
|
1181 | |||
1181 | @propertycache |
|
1182 | @propertycache | |
1182 | def _parents(self): |
|
1183 | def _parents(self): | |
1183 | p = self._repo.dirstate.parents() |
|
1184 | p = self._repo.dirstate.parents() | |
1184 | if p[1] == nullid: |
|
1185 | if p[1] == nullid: | |
1185 | p = p[:-1] |
|
1186 | p = p[:-1] | |
1186 | return [changectx(self._repo, x) for x in p] |
|
1187 | return [changectx(self._repo, x) for x in p] | |
1187 |
|
1188 | |||
1188 | def filectx(self, path, filelog=None): |
|
1189 | def filectx(self, path, filelog=None): | |
1189 | """get a file context from the working directory""" |
|
1190 | """get a file context from the working directory""" | |
1190 | return workingfilectx(self._repo, path, workingctx=self, |
|
1191 | return workingfilectx(self._repo, path, workingctx=self, | |
1191 | filelog=filelog) |
|
1192 | filelog=filelog) | |
1192 |
|
1193 | |||
1193 | def dirty(self, missing=False, merge=True, branch=True): |
|
1194 | def dirty(self, missing=False, merge=True, branch=True): | |
1194 | "check whether a working directory is modified" |
|
1195 | "check whether a working directory is modified" | |
1195 | # check subrepos first |
|
1196 | # check subrepos first | |
1196 | for s in sorted(self.substate): |
|
1197 | for s in sorted(self.substate): | |
1197 | if self.sub(s).dirty(): |
|
1198 | if self.sub(s).dirty(): | |
1198 | return True |
|
1199 | return True | |
1199 | # check current working dir |
|
1200 | # check current working dir | |
1200 | return ((merge and self.p2()) or |
|
1201 | return ((merge and self.p2()) or | |
1201 | (branch and self.branch() != self.p1().branch()) or |
|
1202 | (branch and self.branch() != self.p1().branch()) or | |
1202 | self.modified() or self.added() or self.removed() or |
|
1203 | self.modified() or self.added() or self.removed() or | |
1203 | (missing and self.deleted())) |
|
1204 | (missing and self.deleted())) | |
1204 |
|
1205 | |||
1205 | def add(self, list, prefix=""): |
|
1206 | def add(self, list, prefix=""): | |
1206 | join = lambda f: os.path.join(prefix, f) |
|
1207 | join = lambda f: os.path.join(prefix, f) | |
1207 | wlock = self._repo.wlock() |
|
1208 | wlock = self._repo.wlock() | |
1208 | ui, ds = self._repo.ui, self._repo.dirstate |
|
1209 | ui, ds = self._repo.ui, self._repo.dirstate | |
1209 | try: |
|
1210 | try: | |
1210 | rejected = [] |
|
1211 | rejected = [] | |
1211 | lstat = self._repo.wvfs.lstat |
|
1212 | lstat = self._repo.wvfs.lstat | |
1212 | for f in list: |
|
1213 | for f in list: | |
1213 | scmutil.checkportable(ui, join(f)) |
|
1214 | scmutil.checkportable(ui, join(f)) | |
1214 | try: |
|
1215 | try: | |
1215 | st = lstat(f) |
|
1216 | st = lstat(f) | |
1216 | except OSError: |
|
1217 | except OSError: | |
1217 | ui.warn(_("%s does not exist!\n") % join(f)) |
|
1218 | ui.warn(_("%s does not exist!\n") % join(f)) | |
1218 | rejected.append(f) |
|
1219 | rejected.append(f) | |
1219 | continue |
|
1220 | continue | |
1220 | if st.st_size > 10000000: |
|
1221 | if st.st_size > 10000000: | |
1221 | ui.warn(_("%s: up to %d MB of RAM may be required " |
|
1222 | ui.warn(_("%s: up to %d MB of RAM may be required " | |
1222 | "to manage this file\n" |
|
1223 | "to manage this file\n" | |
1223 | "(use 'hg revert %s' to cancel the " |
|
1224 | "(use 'hg revert %s' to cancel the " | |
1224 | "pending addition)\n") |
|
1225 | "pending addition)\n") | |
1225 | % (f, 3 * st.st_size // 1000000, join(f))) |
|
1226 | % (f, 3 * st.st_size // 1000000, join(f))) | |
1226 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): |
|
1227 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | |
1227 | ui.warn(_("%s not added: only files and symlinks " |
|
1228 | ui.warn(_("%s not added: only files and symlinks " | |
1228 | "supported currently\n") % join(f)) |
|
1229 | "supported currently\n") % join(f)) | |
1229 | rejected.append(f) |
|
1230 | rejected.append(f) | |
1230 | elif ds[f] in 'amn': |
|
1231 | elif ds[f] in 'amn': | |
1231 | ui.warn(_("%s already tracked!\n") % join(f)) |
|
1232 | ui.warn(_("%s already tracked!\n") % join(f)) | |
1232 | elif ds[f] == 'r': |
|
1233 | elif ds[f] == 'r': | |
1233 | ds.normallookup(f) |
|
1234 | ds.normallookup(f) | |
1234 | else: |
|
1235 | else: | |
1235 | ds.add(f) |
|
1236 | ds.add(f) | |
1236 | return rejected |
|
1237 | return rejected | |
1237 | finally: |
|
1238 | finally: | |
1238 | wlock.release() |
|
1239 | wlock.release() | |
1239 |
|
1240 | |||
1240 | def forget(self, files, prefix=""): |
|
1241 | def forget(self, files, prefix=""): | |
1241 | join = lambda f: os.path.join(prefix, f) |
|
1242 | join = lambda f: os.path.join(prefix, f) | |
1242 | wlock = self._repo.wlock() |
|
1243 | wlock = self._repo.wlock() | |
1243 | try: |
|
1244 | try: | |
1244 | rejected = [] |
|
1245 | rejected = [] | |
1245 | for f in files: |
|
1246 | for f in files: | |
1246 | if f not in self._repo.dirstate: |
|
1247 | if f not in self._repo.dirstate: | |
1247 | self._repo.ui.warn(_("%s not tracked!\n") % join(f)) |
|
1248 | self._repo.ui.warn(_("%s not tracked!\n") % join(f)) | |
1248 | rejected.append(f) |
|
1249 | rejected.append(f) | |
1249 | elif self._repo.dirstate[f] != 'a': |
|
1250 | elif self._repo.dirstate[f] != 'a': | |
1250 | self._repo.dirstate.remove(f) |
|
1251 | self._repo.dirstate.remove(f) | |
1251 | else: |
|
1252 | else: | |
1252 | self._repo.dirstate.drop(f) |
|
1253 | self._repo.dirstate.drop(f) | |
1253 | return rejected |
|
1254 | return rejected | |
1254 | finally: |
|
1255 | finally: | |
1255 | wlock.release() |
|
1256 | wlock.release() | |
1256 |
|
1257 | |||
1257 | def undelete(self, list): |
|
1258 | def undelete(self, list): | |
1258 | pctxs = self.parents() |
|
1259 | pctxs = self.parents() | |
1259 | wlock = self._repo.wlock() |
|
1260 | wlock = self._repo.wlock() | |
1260 | try: |
|
1261 | try: | |
1261 | for f in list: |
|
1262 | for f in list: | |
1262 | if self._repo.dirstate[f] != 'r': |
|
1263 | if self._repo.dirstate[f] != 'r': | |
1263 | self._repo.ui.warn(_("%s not removed!\n") % f) |
|
1264 | self._repo.ui.warn(_("%s not removed!\n") % f) | |
1264 | else: |
|
1265 | else: | |
1265 | fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f] |
|
1266 | fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f] | |
1266 | t = fctx.data() |
|
1267 | t = fctx.data() | |
1267 | self._repo.wwrite(f, t, fctx.flags()) |
|
1268 | self._repo.wwrite(f, t, fctx.flags()) | |
1268 | self._repo.dirstate.normal(f) |
|
1269 | self._repo.dirstate.normal(f) | |
1269 | finally: |
|
1270 | finally: | |
1270 | wlock.release() |
|
1271 | wlock.release() | |
1271 |
|
1272 | |||
1272 | def copy(self, source, dest): |
|
1273 | def copy(self, source, dest): | |
1273 | try: |
|
1274 | try: | |
1274 | st = self._repo.wvfs.lstat(dest) |
|
1275 | st = self._repo.wvfs.lstat(dest) | |
1275 | except OSError, err: |
|
1276 | except OSError, err: | |
1276 | if err.errno != errno.ENOENT: |
|
1277 | if err.errno != errno.ENOENT: | |
1277 | raise |
|
1278 | raise | |
1278 | self._repo.ui.warn(_("%s does not exist!\n") % dest) |
|
1279 | self._repo.ui.warn(_("%s does not exist!\n") % dest) | |
1279 | return |
|
1280 | return | |
1280 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): |
|
1281 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | |
1281 | self._repo.ui.warn(_("copy failed: %s is not a file or a " |
|
1282 | self._repo.ui.warn(_("copy failed: %s is not a file or a " | |
1282 | "symbolic link\n") % dest) |
|
1283 | "symbolic link\n") % dest) | |
1283 | else: |
|
1284 | else: | |
1284 | wlock = self._repo.wlock() |
|
1285 | wlock = self._repo.wlock() | |
1285 | try: |
|
1286 | try: | |
1286 | if self._repo.dirstate[dest] in '?r': |
|
1287 | if self._repo.dirstate[dest] in '?r': | |
1287 | self._repo.dirstate.add(dest) |
|
1288 | self._repo.dirstate.add(dest) | |
1288 | self._repo.dirstate.copy(source, dest) |
|
1289 | self._repo.dirstate.copy(source, dest) | |
1289 | finally: |
|
1290 | finally: | |
1290 | wlock.release() |
|
1291 | wlock.release() | |
1291 |
|
1292 | |||
1292 | def _filtersuspectsymlink(self, files): |
|
1293 | def _filtersuspectsymlink(self, files): | |
1293 | if not files or self._repo.dirstate._checklink: |
|
1294 | if not files or self._repo.dirstate._checklink: | |
1294 | return files |
|
1295 | return files | |
1295 |
|
1296 | |||
1296 | # Symlink placeholders may get non-symlink-like contents |
|
1297 | # Symlink placeholders may get non-symlink-like contents | |
1297 | # via user error or dereferencing by NFS or Samba servers, |
|
1298 | # via user error or dereferencing by NFS or Samba servers, | |
1298 | # so we filter out any placeholders that don't look like a |
|
1299 | # so we filter out any placeholders that don't look like a | |
1299 | # symlink |
|
1300 | # symlink | |
1300 | sane = [] |
|
1301 | sane = [] | |
1301 | for f in files: |
|
1302 | for f in files: | |
1302 | if self.flags(f) == 'l': |
|
1303 | if self.flags(f) == 'l': | |
1303 | d = self[f].data() |
|
1304 | d = self[f].data() | |
1304 | if d == '' or len(d) >= 1024 or '\n' in d or util.binary(d): |
|
1305 | if d == '' or len(d) >= 1024 or '\n' in d or util.binary(d): | |
1305 | self._repo.ui.debug('ignoring suspect symlink placeholder' |
|
1306 | self._repo.ui.debug('ignoring suspect symlink placeholder' | |
1306 | ' "%s"\n' % f) |
|
1307 | ' "%s"\n' % f) | |
1307 | continue |
|
1308 | continue | |
1308 | sane.append(f) |
|
1309 | sane.append(f) | |
1309 | return sane |
|
1310 | return sane | |
1310 |
|
1311 | |||
1311 | def _checklookup(self, files): |
|
1312 | def _checklookup(self, files): | |
1312 | # check for any possibly clean files |
|
1313 | # check for any possibly clean files | |
1313 | if not files: |
|
1314 | if not files: | |
1314 | return [], [] |
|
1315 | return [], [] | |
1315 |
|
1316 | |||
1316 | modified = [] |
|
1317 | modified = [] | |
1317 | fixup = [] |
|
1318 | fixup = [] | |
1318 | pctx = self._parents[0] |
|
1319 | pctx = self._parents[0] | |
1319 | # do a full compare of any files that might have changed |
|
1320 | # do a full compare of any files that might have changed | |
1320 | for f in sorted(files): |
|
1321 | for f in sorted(files): | |
1321 | if (f not in pctx or self.flags(f) != pctx.flags(f) |
|
1322 | if (f not in pctx or self.flags(f) != pctx.flags(f) | |
1322 | or pctx[f].cmp(self[f])): |
|
1323 | or pctx[f].cmp(self[f])): | |
1323 | modified.append(f) |
|
1324 | modified.append(f) | |
1324 | else: |
|
1325 | else: | |
1325 | fixup.append(f) |
|
1326 | fixup.append(f) | |
1326 |
|
1327 | |||
1327 | # update dirstate for files that are actually clean |
|
1328 | # update dirstate for files that are actually clean | |
1328 | if fixup: |
|
1329 | if fixup: | |
1329 | try: |
|
1330 | try: | |
1330 | # updating the dirstate is optional |
|
1331 | # updating the dirstate is optional | |
1331 | # so we don't wait on the lock |
|
1332 | # so we don't wait on the lock | |
1332 | normal = self._repo.dirstate.normal |
|
1333 | normal = self._repo.dirstate.normal | |
1333 | wlock = self._repo.wlock(False) |
|
1334 | wlock = self._repo.wlock(False) | |
1334 | try: |
|
1335 | try: | |
1335 | for f in fixup: |
|
1336 | for f in fixup: | |
1336 | normal(f) |
|
1337 | normal(f) | |
1337 | finally: |
|
1338 | finally: | |
1338 | wlock.release() |
|
1339 | wlock.release() | |
1339 | except error.LockError: |
|
1340 | except error.LockError: | |
1340 | pass |
|
1341 | pass | |
1341 | return modified, fixup |
|
1342 | return modified, fixup | |
1342 |
|
1343 | |||
1343 | def _manifestmatches(self, match, s): |
|
1344 | def _manifestmatches(self, match, s): | |
1344 | """Slow path for workingctx |
|
1345 | """Slow path for workingctx | |
1345 |
|
1346 | |||
1346 | The fast path is when we compare the working directory to its parent |
|
1347 | The fast path is when we compare the working directory to its parent | |
1347 | which means this function is comparing with a non-parent; therefore we |
|
1348 | which means this function is comparing with a non-parent; therefore we | |
1348 | need to build a manifest and return what matches. |
|
1349 | need to build a manifest and return what matches. | |
1349 | """ |
|
1350 | """ | |
1350 | mf = self._repo['.']._manifestmatches(match, s) |
|
1351 | mf = self._repo['.']._manifestmatches(match, s) | |
1351 | modified, added, removed = s[0:3] |
|
1352 | modified, added, removed = s[0:3] | |
1352 | for f in modified + added: |
|
1353 | for f in modified + added: | |
1353 | mf[f] = None |
|
1354 | mf[f] = None | |
1354 | mf.set(f, self.flags(f)) |
|
1355 | mf.set(f, self.flags(f)) | |
1355 | for f in removed: |
|
1356 | for f in removed: | |
1356 | if f in mf: |
|
1357 | if f in mf: | |
1357 | del mf[f] |
|
1358 | del mf[f] | |
1358 | return mf |
|
1359 | return mf | |
1359 |
|
1360 | |||
1360 | def _prestatus(self, other, s, match, listignored, listclean, listunknown): |
|
1361 | def _prestatus(self, other, s, match, listignored, listclean, listunknown): | |
1361 | """override the parent hook with a dirstate query |
|
1362 | """override the parent hook with a dirstate query | |
1362 |
|
1363 | |||
1363 | We use this prestatus hook to populate the status with information from |
|
1364 | We use this prestatus hook to populate the status with information from | |
1364 | the dirstate. |
|
1365 | the dirstate. | |
1365 | """ |
|
1366 | """ | |
1366 | # doesn't need to call super; if that changes, be aware that super |
|
1367 | # doesn't need to call super; if that changes, be aware that super | |
1367 | # calls self.manifest which would slow down the common case of calling |
|
1368 | # calls self.manifest which would slow down the common case of calling | |
1368 | # status against a workingctx's parent |
|
1369 | # status against a workingctx's parent | |
1369 | return self._dirstatestatus(match, listignored, listclean, listunknown) |
|
1370 | return self._dirstatestatus(match, listignored, listclean, listunknown) | |
1370 |
|
1371 | |||
1371 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): |
|
1372 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): | |
1372 | """override the parent hook with a filter for suspect symlinks |
|
1373 | """override the parent hook with a filter for suspect symlinks | |
1373 |
|
1374 | |||
1374 | We use this poststatus hook to filter out symlinks that might have |
|
1375 | We use this poststatus hook to filter out symlinks that might have | |
1375 | accidentally ended up with the entire contents of the file they are |
|
1376 | accidentally ended up with the entire contents of the file they are | |
1376 | susposed to be linking to. |
|
1377 | susposed to be linking to. | |
1377 | """ |
|
1378 | """ | |
1378 | s[0] = self._filtersuspectsymlink(s[0]) |
|
1379 | s[0] = self._filtersuspectsymlink(s[0]) | |
1379 | self._status = s[:] |
|
1380 | self._status = s[:] | |
1380 | return s |
|
1381 | return s | |
1381 |
|
1382 | |||
1382 | def _dirstatestatus(self, match=None, ignored=False, clean=False, |
|
1383 | def _dirstatestatus(self, match=None, ignored=False, clean=False, | |
1383 | unknown=False): |
|
1384 | unknown=False): | |
1384 | '''Gets the status from the dirstate -- internal use only.''' |
|
1385 | '''Gets the status from the dirstate -- internal use only.''' | |
1385 | listignored, listclean, listunknown = ignored, clean, unknown |
|
1386 | listignored, listclean, listunknown = ignored, clean, unknown | |
1386 | match = match or matchmod.always(self._repo.root, self._repo.getcwd()) |
|
1387 | match = match or matchmod.always(self._repo.root, self._repo.getcwd()) | |
1387 | subrepos = [] |
|
1388 | subrepos = [] | |
1388 | if '.hgsub' in self: |
|
1389 | if '.hgsub' in self: | |
1389 | subrepos = sorted(self.substate) |
|
1390 | subrepos = sorted(self.substate) | |
1390 | s = self._repo.dirstate.status(match, subrepos, listignored, |
|
1391 | s = self._repo.dirstate.status(match, subrepos, listignored, | |
1391 | listclean, listunknown) |
|
1392 | listclean, listunknown) | |
1392 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
|
1393 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s | |
1393 |
|
1394 | |||
1394 | # check for any possibly clean files |
|
1395 | # check for any possibly clean files | |
1395 | if cmp: |
|
1396 | if cmp: | |
1396 | modified2, fixup = self._checklookup(cmp) |
|
1397 | modified2, fixup = self._checklookup(cmp) | |
1397 | modified += modified2 |
|
1398 | modified += modified2 | |
1398 |
|
1399 | |||
1399 | # update dirstate for files that are actually clean |
|
1400 | # update dirstate for files that are actually clean | |
1400 | if fixup and listclean: |
|
1401 | if fixup and listclean: | |
1401 | clean += fixup |
|
1402 | clean += fixup | |
1402 |
|
1403 | |||
1403 | return [modified, added, removed, deleted, unknown, ignored, clean] |
|
1404 | return [modified, added, removed, deleted, unknown, ignored, clean] | |
1404 |
|
1405 | |||
1405 | def _buildstatus(self, other, s, match, listignored, listclean, |
|
1406 | def _buildstatus(self, other, s, match, listignored, listclean, | |
1406 | listunknown): |
|
1407 | listunknown): | |
1407 | """build a status with respect to another context |
|
1408 | """build a status with respect to another context | |
1408 |
|
1409 | |||
1409 | This includes logic for maintaining the fast path of status when |
|
1410 | This includes logic for maintaining the fast path of status when | |
1410 | comparing the working directory against its parent, which is to skip |
|
1411 | comparing the working directory against its parent, which is to skip | |
1411 | building a new manifest if self (working directory) is not comparing |
|
1412 | building a new manifest if self (working directory) is not comparing | |
1412 | against its parent (repo['.']). |
|
1413 | against its parent (repo['.']). | |
1413 | """ |
|
1414 | """ | |
1414 | if other != self._repo['.']: |
|
1415 | if other != self._repo['.']: | |
1415 | s = super(workingctx, self)._buildstatus(other, s, match, |
|
1416 | s = super(workingctx, self)._buildstatus(other, s, match, | |
1416 | listignored, listclean, |
|
1417 | listignored, listclean, | |
1417 | listunknown) |
|
1418 | listunknown) | |
1418 | return s |
|
1419 | return s | |
1419 |
|
1420 | |||
1420 | def _matchstatus(self, other, s, match, listignored, listclean, |
|
1421 | def _matchstatus(self, other, s, match, listignored, listclean, | |
1421 | listunknown): |
|
1422 | listunknown): | |
1422 | """override the match method with a filter for directory patterns |
|
1423 | """override the match method with a filter for directory patterns | |
1423 |
|
1424 | |||
1424 | We use inheritance to customize the match.bad method only in cases of |
|
1425 | We use inheritance to customize the match.bad method only in cases of | |
1425 | workingctx since it belongs only to the working directory when |
|
1426 | workingctx since it belongs only to the working directory when | |
1426 | comparing against the parent changeset. |
|
1427 | comparing against the parent changeset. | |
1427 |
|
1428 | |||
1428 | If we aren't comparing against the working directory's parent, then we |
|
1429 | If we aren't comparing against the working directory's parent, then we | |
1429 | just use the default match object sent to us. |
|
1430 | just use the default match object sent to us. | |
1430 | """ |
|
1431 | """ | |
1431 | superself = super(workingctx, self) |
|
1432 | superself = super(workingctx, self) | |
1432 | match = superself._matchstatus(other, s, match, listignored, listclean, |
|
1433 | match = superself._matchstatus(other, s, match, listignored, listclean, | |
1433 | listunknown) |
|
1434 | listunknown) | |
1434 | if other != self._repo['.']: |
|
1435 | if other != self._repo['.']: | |
1435 | def bad(f, msg): |
|
1436 | def bad(f, msg): | |
1436 | # 'f' may be a directory pattern from 'match.files()', |
|
1437 | # 'f' may be a directory pattern from 'match.files()', | |
1437 | # so 'f not in ctx1' is not enough |
|
1438 | # so 'f not in ctx1' is not enough | |
1438 | if f not in other and f not in other.dirs(): |
|
1439 | if f not in other and f not in other.dirs(): | |
1439 | self._repo.ui.warn('%s: %s\n' % |
|
1440 | self._repo.ui.warn('%s: %s\n' % | |
1440 | (self._repo.dirstate.pathto(f), msg)) |
|
1441 | (self._repo.dirstate.pathto(f), msg)) | |
1441 | match.bad = bad |
|
1442 | match.bad = bad | |
1442 | return match |
|
1443 | return match | |
1443 |
|
1444 | |||
1444 | def status(self, other='.', match=None, listignored=False, |
|
1445 | def status(self, other='.', match=None, listignored=False, | |
1445 | listclean=False, listunknown=False, listsubrepos=False): |
|
1446 | listclean=False, listunknown=False, listsubrepos=False): | |
1446 | # yet to be determined: what to do if 'other' is a 'workingctx' or a |
|
1447 | # yet to be determined: what to do if 'other' is a 'workingctx' or a | |
1447 | # 'memctx'? |
|
1448 | # 'memctx'? | |
1448 | s = super(workingctx, self).status(other, match, listignored, listclean, |
|
1449 | s = super(workingctx, self).status(other, match, listignored, listclean, | |
1449 | listunknown, listsubrepos) |
|
1450 | listunknown, listsubrepos) | |
1450 | # calling 'super' subtly reveresed the contexts, so we flip the results |
|
1451 | # calling 'super' subtly reveresed the contexts, so we flip the results | |
1451 | # (s[1] is 'added' and s[2] is 'removed') |
|
1452 | # (s[1] is 'added' and s[2] is 'removed') | |
1452 | s = list(s) |
|
1453 | s = list(s) | |
1453 | s[1], s[2] = s[2], s[1] |
|
1454 | s[1], s[2] = s[2], s[1] | |
1454 | return tuple(s) |
|
1455 | return tuple(s) | |
1455 |
|
1456 | |||
1456 | class committablefilectx(basefilectx): |
|
1457 | class committablefilectx(basefilectx): | |
1457 | """A committablefilectx provides common functionality for a file context |
|
1458 | """A committablefilectx provides common functionality for a file context | |
1458 | that wants the ability to commit, e.g. workingfilectx or memfilectx.""" |
|
1459 | that wants the ability to commit, e.g. workingfilectx or memfilectx.""" | |
1459 | def __init__(self, repo, path, filelog=None, ctx=None): |
|
1460 | def __init__(self, repo, path, filelog=None, ctx=None): | |
1460 | self._repo = repo |
|
1461 | self._repo = repo | |
1461 | self._path = path |
|
1462 | self._path = path | |
1462 | self._changeid = None |
|
1463 | self._changeid = None | |
1463 | self._filerev = self._filenode = None |
|
1464 | self._filerev = self._filenode = None | |
1464 |
|
1465 | |||
1465 | if filelog is not None: |
|
1466 | if filelog is not None: | |
1466 | self._filelog = filelog |
|
1467 | self._filelog = filelog | |
1467 | if ctx: |
|
1468 | if ctx: | |
1468 | self._changectx = ctx |
|
1469 | self._changectx = ctx | |
1469 |
|
1470 | |||
1470 | def __nonzero__(self): |
|
1471 | def __nonzero__(self): | |
1471 | return True |
|
1472 | return True | |
1472 |
|
1473 | |||
1473 | def parents(self): |
|
1474 | def parents(self): | |
1474 | '''return parent filectxs, following copies if necessary''' |
|
1475 | '''return parent filectxs, following copies if necessary''' | |
1475 | def filenode(ctx, path): |
|
1476 | def filenode(ctx, path): | |
1476 | return ctx._manifest.get(path, nullid) |
|
1477 | return ctx._manifest.get(path, nullid) | |
1477 |
|
1478 | |||
1478 | path = self._path |
|
1479 | path = self._path | |
1479 | fl = self._filelog |
|
1480 | fl = self._filelog | |
1480 | pcl = self._changectx._parents |
|
1481 | pcl = self._changectx._parents | |
1481 | renamed = self.renamed() |
|
1482 | renamed = self.renamed() | |
1482 |
|
1483 | |||
1483 | if renamed: |
|
1484 | if renamed: | |
1484 | pl = [renamed + (None,)] |
|
1485 | pl = [renamed + (None,)] | |
1485 | else: |
|
1486 | else: | |
1486 | pl = [(path, filenode(pcl[0], path), fl)] |
|
1487 | pl = [(path, filenode(pcl[0], path), fl)] | |
1487 |
|
1488 | |||
1488 | for pc in pcl[1:]: |
|
1489 | for pc in pcl[1:]: | |
1489 | pl.append((path, filenode(pc, path), fl)) |
|
1490 | pl.append((path, filenode(pc, path), fl)) | |
1490 |
|
1491 | |||
1491 | return [filectx(self._repo, p, fileid=n, filelog=l) |
|
1492 | return [filectx(self._repo, p, fileid=n, filelog=l) | |
1492 | for p, n, l in pl if n != nullid] |
|
1493 | for p, n, l in pl if n != nullid] | |
1493 |
|
1494 | |||
1494 | def children(self): |
|
1495 | def children(self): | |
1495 | return [] |
|
1496 | return [] | |
1496 |
|
1497 | |||
1497 | class workingfilectx(committablefilectx): |
|
1498 | class workingfilectx(committablefilectx): | |
1498 | """A workingfilectx object makes access to data related to a particular |
|
1499 | """A workingfilectx object makes access to data related to a particular | |
1499 | file in the working directory convenient.""" |
|
1500 | file in the working directory convenient.""" | |
1500 | def __init__(self, repo, path, filelog=None, workingctx=None): |
|
1501 | def __init__(self, repo, path, filelog=None, workingctx=None): | |
1501 | super(workingfilectx, self).__init__(repo, path, filelog, workingctx) |
|
1502 | super(workingfilectx, self).__init__(repo, path, filelog, workingctx) | |
1502 |
|
1503 | |||
1503 | @propertycache |
|
1504 | @propertycache | |
1504 | def _changectx(self): |
|
1505 | def _changectx(self): | |
1505 | return workingctx(self._repo) |
|
1506 | return workingctx(self._repo) | |
1506 |
|
1507 | |||
1507 | def data(self): |
|
1508 | def data(self): | |
1508 | return self._repo.wread(self._path) |
|
1509 | return self._repo.wread(self._path) | |
1509 | def renamed(self): |
|
1510 | def renamed(self): | |
1510 | rp = self._repo.dirstate.copied(self._path) |
|
1511 | rp = self._repo.dirstate.copied(self._path) | |
1511 | if not rp: |
|
1512 | if not rp: | |
1512 | return None |
|
1513 | return None | |
1513 | return rp, self._changectx._parents[0]._manifest.get(rp, nullid) |
|
1514 | return rp, self._changectx._parents[0]._manifest.get(rp, nullid) | |
1514 |
|
1515 | |||
1515 | def size(self): |
|
1516 | def size(self): | |
1516 | return self._repo.wvfs.lstat(self._path).st_size |
|
1517 | return self._repo.wvfs.lstat(self._path).st_size | |
1517 | def date(self): |
|
1518 | def date(self): | |
1518 | t, tz = self._changectx.date() |
|
1519 | t, tz = self._changectx.date() | |
1519 | try: |
|
1520 | try: | |
1520 | return (int(self._repo.wvfs.lstat(self._path).st_mtime), tz) |
|
1521 | return (int(self._repo.wvfs.lstat(self._path).st_mtime), tz) | |
1521 | except OSError, err: |
|
1522 | except OSError, err: | |
1522 | if err.errno != errno.ENOENT: |
|
1523 | if err.errno != errno.ENOENT: | |
1523 | raise |
|
1524 | raise | |
1524 | return (t, tz) |
|
1525 | return (t, tz) | |
1525 |
|
1526 | |||
1526 | def cmp(self, fctx): |
|
1527 | def cmp(self, fctx): | |
1527 | """compare with other file context |
|
1528 | """compare with other file context | |
1528 |
|
1529 | |||
1529 | returns True if different than fctx. |
|
1530 | returns True if different than fctx. | |
1530 | """ |
|
1531 | """ | |
1531 | # fctx should be a filectx (not a workingfilectx) |
|
1532 | # fctx should be a filectx (not a workingfilectx) | |
1532 | # invert comparison to reuse the same code path |
|
1533 | # invert comparison to reuse the same code path | |
1533 | return fctx.cmp(self) |
|
1534 | return fctx.cmp(self) | |
1534 |
|
1535 | |||
1535 | class memctx(committablectx): |
|
1536 | class memctx(committablectx): | |
1536 | """Use memctx to perform in-memory commits via localrepo.commitctx(). |
|
1537 | """Use memctx to perform in-memory commits via localrepo.commitctx(). | |
1537 |
|
1538 | |||
1538 | Revision information is supplied at initialization time while |
|
1539 | Revision information is supplied at initialization time while | |
1539 | related files data and is made available through a callback |
|
1540 | related files data and is made available through a callback | |
1540 | mechanism. 'repo' is the current localrepo, 'parents' is a |
|
1541 | mechanism. 'repo' is the current localrepo, 'parents' is a | |
1541 | sequence of two parent revisions identifiers (pass None for every |
|
1542 | sequence of two parent revisions identifiers (pass None for every | |
1542 | missing parent), 'text' is the commit message and 'files' lists |
|
1543 | missing parent), 'text' is the commit message and 'files' lists | |
1543 | names of files touched by the revision (normalized and relative to |
|
1544 | names of files touched by the revision (normalized and relative to | |
1544 | repository root). |
|
1545 | repository root). | |
1545 |
|
1546 | |||
1546 | filectxfn(repo, memctx, path) is a callable receiving the |
|
1547 | filectxfn(repo, memctx, path) is a callable receiving the | |
1547 | repository, the current memctx object and the normalized path of |
|
1548 | repository, the current memctx object and the normalized path of | |
1548 | requested file, relative to repository root. It is fired by the |
|
1549 | requested file, relative to repository root. It is fired by the | |
1549 | commit function for every file in 'files', but calls order is |
|
1550 | commit function for every file in 'files', but calls order is | |
1550 | undefined. If the file is available in the revision being |
|
1551 | undefined. If the file is available in the revision being | |
1551 | committed (updated or added), filectxfn returns a memfilectx |
|
1552 | committed (updated or added), filectxfn returns a memfilectx | |
1552 | object. If the file was removed, filectxfn raises an |
|
1553 | object. If the file was removed, filectxfn raises an | |
1553 | IOError. Moved files are represented by marking the source file |
|
1554 | IOError. Moved files are represented by marking the source file | |
1554 | removed and the new file added with copy information (see |
|
1555 | removed and the new file added with copy information (see | |
1555 | memfilectx). |
|
1556 | memfilectx). | |
1556 |
|
1557 | |||
1557 | user receives the committer name and defaults to current |
|
1558 | user receives the committer name and defaults to current | |
1558 | repository username, date is the commit date in any format |
|
1559 | repository username, date is the commit date in any format | |
1559 | supported by util.parsedate() and defaults to current date, extra |
|
1560 | supported by util.parsedate() and defaults to current date, extra | |
1560 | is a dictionary of metadata or is left empty. |
|
1561 | is a dictionary of metadata or is left empty. | |
1561 | """ |
|
1562 | """ | |
1562 | def __init__(self, repo, parents, text, files, filectxfn, user=None, |
|
1563 | def __init__(self, repo, parents, text, files, filectxfn, user=None, | |
1563 | date=None, extra=None, editor=False): |
|
1564 | date=None, extra=None, editor=False): | |
1564 | super(memctx, self).__init__(repo, text, user, date, extra) |
|
1565 | super(memctx, self).__init__(repo, text, user, date, extra) | |
1565 | self._rev = None |
|
1566 | self._rev = None | |
1566 | self._node = None |
|
1567 | self._node = None | |
1567 | parents = [(p or nullid) for p in parents] |
|
1568 | parents = [(p or nullid) for p in parents] | |
1568 | p1, p2 = parents |
|
1569 | p1, p2 = parents | |
1569 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] |
|
1570 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] | |
1570 | files = sorted(set(files)) |
|
1571 | files = sorted(set(files)) | |
1571 | self._status = [files, [], [], [], []] |
|
1572 | self._status = [files, [], [], [], []] | |
1572 | self._filectxfn = filectxfn |
|
1573 | self._filectxfn = filectxfn | |
1573 |
|
1574 | |||
1574 | self._extra = extra and extra.copy() or {} |
|
1575 | self._extra = extra and extra.copy() or {} | |
1575 | if self._extra.get('branch', '') == '': |
|
1576 | if self._extra.get('branch', '') == '': | |
1576 | self._extra['branch'] = 'default' |
|
1577 | self._extra['branch'] = 'default' | |
1577 |
|
1578 | |||
1578 | if editor: |
|
1579 | if editor: | |
1579 | self._text = editor(self._repo, self, []) |
|
1580 | self._text = editor(self._repo, self, []) | |
1580 | self._repo.savecommitmessage(self._text) |
|
1581 | self._repo.savecommitmessage(self._text) | |
1581 |
|
1582 | |||
1582 | def filectx(self, path, filelog=None): |
|
1583 | def filectx(self, path, filelog=None): | |
1583 | """get a file context from the working directory""" |
|
1584 | """get a file context from the working directory""" | |
1584 | return self._filectxfn(self._repo, self, path) |
|
1585 | return self._filectxfn(self._repo, self, path) | |
1585 |
|
1586 | |||
1586 | def commit(self): |
|
1587 | def commit(self): | |
1587 | """commit context to the repo""" |
|
1588 | """commit context to the repo""" | |
1588 | return self._repo.commitctx(self) |
|
1589 | return self._repo.commitctx(self) | |
1589 |
|
1590 | |||
|
1591 | @propertycache | |||
|
1592 | def _manifest(self): | |||
|
1593 | """generate a manifest based on the return values of filectxfn""" | |||
|
1594 | ||||
|
1595 | # keep this simple for now; just worry about p1 | |||
|
1596 | pctx = self._parents[0] | |||
|
1597 | man = pctx.manifest().copy() | |||
|
1598 | ||||
|
1599 | for f, fnode in man.iteritems(): | |||
|
1600 | p1node = nullid | |||
|
1601 | p2node = nullid | |||
|
1602 | p = pctx[f].parents() | |||
|
1603 | if len(p) > 0: | |||
|
1604 | p1node = p[0].node() | |||
|
1605 | if len(p) > 1: | |||
|
1606 | p2node = p[1].node() | |||
|
1607 | man[f] = revlog.hash(self[f].data(), p1node, p2node) | |||
|
1608 | ||||
|
1609 | return man | |||
|
1610 | ||||
|
1611 | ||||
1590 | class memfilectx(committablefilectx): |
|
1612 | class memfilectx(committablefilectx): | |
1591 | """memfilectx represents an in-memory file to commit. |
|
1613 | """memfilectx represents an in-memory file to commit. | |
1592 |
|
1614 | |||
1593 | See memctx and commitablefilectx for more details. |
|
1615 | See memctx and commitablefilectx for more details. | |
1594 | """ |
|
1616 | """ | |
1595 | def __init__(self, repo, path, data, islink=False, |
|
1617 | def __init__(self, repo, path, data, islink=False, | |
1596 | isexec=False, copied=None, memctx=None): |
|
1618 | isexec=False, copied=None, memctx=None): | |
1597 | """ |
|
1619 | """ | |
1598 | path is the normalized file path relative to repository root. |
|
1620 | path is the normalized file path relative to repository root. | |
1599 | data is the file content as a string. |
|
1621 | data is the file content as a string. | |
1600 | islink is True if the file is a symbolic link. |
|
1622 | islink is True if the file is a symbolic link. | |
1601 | isexec is True if the file is executable. |
|
1623 | isexec is True if the file is executable. | |
1602 | copied is the source file path if current file was copied in the |
|
1624 | copied is the source file path if current file was copied in the | |
1603 | revision being committed, or None.""" |
|
1625 | revision being committed, or None.""" | |
1604 | super(memfilectx, self).__init__(repo, path, None, memctx) |
|
1626 | super(memfilectx, self).__init__(repo, path, None, memctx) | |
1605 | self._data = data |
|
1627 | self._data = data | |
1606 | self._flags = (islink and 'l' or '') + (isexec and 'x' or '') |
|
1628 | self._flags = (islink and 'l' or '') + (isexec and 'x' or '') | |
1607 | self._copied = None |
|
1629 | self._copied = None | |
1608 | if copied: |
|
1630 | if copied: | |
1609 | self._copied = (copied, nullid) |
|
1631 | self._copied = (copied, nullid) | |
1610 |
|
1632 | |||
1611 | def data(self): |
|
1633 | def data(self): | |
1612 | return self._data |
|
1634 | return self._data | |
1613 | def size(self): |
|
1635 | def size(self): | |
1614 | return len(self.data()) |
|
1636 | return len(self.data()) | |
1615 | def flags(self): |
|
1637 | def flags(self): | |
1616 | return self._flags |
|
1638 | return self._flags | |
1617 | def isexec(self): |
|
1639 | def isexec(self): | |
1618 | return 'x' in self._flags |
|
1640 | return 'x' in self._flags | |
1619 | def islink(self): |
|
1641 | def islink(self): | |
1620 | return 'l' in self._flags |
|
1642 | return 'l' in self._flags | |
1621 | def renamed(self): |
|
1643 | def renamed(self): | |
1622 | return self._copied |
|
1644 | return self._copied |
General Comments 0
You need to be logged in to leave comments.
Login now