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