##// END OF EJS Templates
context: set stack level for deprecation warning...
Martin von Zweigbergk -
r37694:1764527a default
parent child Browse files
Show More
@@ -1,2597 +1,2597 b''
1 1 # context.py - changeset and file context objects for mercurial
2 2 #
3 3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import errno
11 11 import filecmp
12 12 import os
13 13 import re
14 14 import stat
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 addednodeid,
19 19 bin,
20 20 hex,
21 21 modifiednodeid,
22 22 nullid,
23 23 nullrev,
24 24 short,
25 25 wdirfilenodeids,
26 26 wdirid,
27 27 wdirrev,
28 28 )
29 29 from . import (
30 30 dagop,
31 31 encoding,
32 32 error,
33 33 fileset,
34 34 match as matchmod,
35 35 obsolete as obsmod,
36 36 patch,
37 37 pathutil,
38 38 phases,
39 39 pycompat,
40 40 repoview,
41 41 revlog,
42 42 scmutil,
43 43 sparse,
44 44 subrepo,
45 45 subrepoutil,
46 46 util,
47 47 )
48 48 from .utils import (
49 49 dateutil,
50 50 stringutil,
51 51 )
52 52
53 53 propertycache = util.propertycache
54 54
55 55 nonascii = re.compile(br'[^\x21-\x7f]').search
56 56
57 57 class basectx(object):
58 58 """A basectx object represents the common logic for its children:
59 59 changectx: read-only context that is already present in the repo,
60 60 workingctx: a context that represents the working directory and can
61 61 be committed,
62 62 memctx: a context that represents changes in-memory and can also
63 63 be committed."""
64 64
65 65 def __init__(self, repo):
66 66 self._repo = repo
67 67
68 68 def __bytes__(self):
69 69 return short(self.node())
70 70
71 71 __str__ = encoding.strmethod(__bytes__)
72 72
73 73 def __repr__(self):
74 74 return r"<%s %s>" % (type(self).__name__, str(self))
75 75
76 76 def __eq__(self, other):
77 77 try:
78 78 return type(self) == type(other) and self._rev == other._rev
79 79 except AttributeError:
80 80 return False
81 81
82 82 def __ne__(self, other):
83 83 return not (self == other)
84 84
85 85 def __contains__(self, key):
86 86 return key in self._manifest
87 87
88 88 def __getitem__(self, key):
89 89 return self.filectx(key)
90 90
91 91 def __iter__(self):
92 92 return iter(self._manifest)
93 93
94 94 def _buildstatusmanifest(self, status):
95 95 """Builds a manifest that includes the given status results, if this is
96 96 a working copy context. For non-working copy contexts, it just returns
97 97 the normal manifest."""
98 98 return self.manifest()
99 99
100 100 def _matchstatus(self, other, match):
101 101 """This internal method provides a way for child objects to override the
102 102 match operator.
103 103 """
104 104 return match
105 105
106 106 def _buildstatus(self, other, s, match, listignored, listclean,
107 107 listunknown):
108 108 """build a status with respect to another context"""
109 109 # Load earliest manifest first for caching reasons. More specifically,
110 110 # if you have revisions 1000 and 1001, 1001 is probably stored as a
111 111 # delta against 1000. Thus, if you read 1000 first, we'll reconstruct
112 112 # 1000 and cache it so that when you read 1001, we just need to apply a
113 113 # delta to what's in the cache. So that's one full reconstruction + one
114 114 # delta application.
115 115 mf2 = None
116 116 if self.rev() is not None and self.rev() < other.rev():
117 117 mf2 = self._buildstatusmanifest(s)
118 118 mf1 = other._buildstatusmanifest(s)
119 119 if mf2 is None:
120 120 mf2 = self._buildstatusmanifest(s)
121 121
122 122 modified, added = [], []
123 123 removed = []
124 124 clean = []
125 125 deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
126 126 deletedset = set(deleted)
127 127 d = mf1.diff(mf2, match=match, clean=listclean)
128 128 for fn, value in d.iteritems():
129 129 if fn in deletedset:
130 130 continue
131 131 if value is None:
132 132 clean.append(fn)
133 133 continue
134 134 (node1, flag1), (node2, flag2) = value
135 135 if node1 is None:
136 136 added.append(fn)
137 137 elif node2 is None:
138 138 removed.append(fn)
139 139 elif flag1 != flag2:
140 140 modified.append(fn)
141 141 elif node2 not in wdirfilenodeids:
142 142 # When comparing files between two commits, we save time by
143 143 # not comparing the file contents when the nodeids differ.
144 144 # Note that this means we incorrectly report a reverted change
145 145 # to a file as a modification.
146 146 modified.append(fn)
147 147 elif self[fn].cmp(other[fn]):
148 148 modified.append(fn)
149 149 else:
150 150 clean.append(fn)
151 151
152 152 if removed:
153 153 # need to filter files if they are already reported as removed
154 154 unknown = [fn for fn in unknown if fn not in mf1 and
155 155 (not match or match(fn))]
156 156 ignored = [fn for fn in ignored if fn not in mf1 and
157 157 (not match or match(fn))]
158 158 # if they're deleted, don't report them as removed
159 159 removed = [fn for fn in removed if fn not in deletedset]
160 160
161 161 return scmutil.status(modified, added, removed, deleted, unknown,
162 162 ignored, clean)
163 163
164 164 @propertycache
165 165 def substate(self):
166 166 return subrepoutil.state(self, self._repo.ui)
167 167
168 168 def subrev(self, subpath):
169 169 return self.substate[subpath][1]
170 170
171 171 def rev(self):
172 172 return self._rev
173 173 def node(self):
174 174 return self._node
175 175 def hex(self):
176 176 return hex(self.node())
177 177 def manifest(self):
178 178 return self._manifest
179 179 def manifestctx(self):
180 180 return self._manifestctx
181 181 def repo(self):
182 182 return self._repo
183 183 def phasestr(self):
184 184 return phases.phasenames[self.phase()]
185 185 def mutable(self):
186 186 return self.phase() > phases.public
187 187
188 188 def getfileset(self, expr):
189 189 return fileset.getfileset(self, expr)
190 190
191 191 def obsolete(self):
192 192 """True if the changeset is obsolete"""
193 193 return self.rev() in obsmod.getrevs(self._repo, 'obsolete')
194 194
195 195 def extinct(self):
196 196 """True if the changeset is extinct"""
197 197 return self.rev() in obsmod.getrevs(self._repo, 'extinct')
198 198
199 199 def orphan(self):
200 200 """True if the changeset is not obsolete but it's ancestor are"""
201 201 return self.rev() in obsmod.getrevs(self._repo, 'orphan')
202 202
203 203 def phasedivergent(self):
204 204 """True if the changeset try to be a successor of a public changeset
205 205
206 206 Only non-public and non-obsolete changesets may be bumped.
207 207 """
208 208 return self.rev() in obsmod.getrevs(self._repo, 'phasedivergent')
209 209
210 210 def contentdivergent(self):
211 211 """Is a successors of a changeset with multiple possible successors set
212 212
213 213 Only non-public and non-obsolete changesets may be divergent.
214 214 """
215 215 return self.rev() in obsmod.getrevs(self._repo, 'contentdivergent')
216 216
217 217 def isunstable(self):
218 218 """True if the changeset is either unstable, bumped or divergent"""
219 219 return self.orphan() or self.phasedivergent() or self.contentdivergent()
220 220
221 221 def instabilities(self):
222 222 """return the list of instabilities affecting this changeset.
223 223
224 224 Instabilities are returned as strings. possible values are:
225 225 - orphan,
226 226 - phase-divergent,
227 227 - content-divergent.
228 228 """
229 229 instabilities = []
230 230 if self.orphan():
231 231 instabilities.append('orphan')
232 232 if self.phasedivergent():
233 233 instabilities.append('phase-divergent')
234 234 if self.contentdivergent():
235 235 instabilities.append('content-divergent')
236 236 return instabilities
237 237
238 238 def parents(self):
239 239 """return contexts for each parent changeset"""
240 240 return self._parents
241 241
242 242 def p1(self):
243 243 return self._parents[0]
244 244
245 245 def p2(self):
246 246 parents = self._parents
247 247 if len(parents) == 2:
248 248 return parents[1]
249 249 return changectx(self._repo, nullrev)
250 250
251 251 def _fileinfo(self, path):
252 252 if r'_manifest' in self.__dict__:
253 253 try:
254 254 return self._manifest[path], self._manifest.flags(path)
255 255 except KeyError:
256 256 raise error.ManifestLookupError(self._node, path,
257 257 _('not found in manifest'))
258 258 if r'_manifestdelta' in self.__dict__ or path in self.files():
259 259 if path in self._manifestdelta:
260 260 return (self._manifestdelta[path],
261 261 self._manifestdelta.flags(path))
262 262 mfl = self._repo.manifestlog
263 263 try:
264 264 node, flag = mfl[self._changeset.manifest].find(path)
265 265 except KeyError:
266 266 raise error.ManifestLookupError(self._node, path,
267 267 _('not found in manifest'))
268 268
269 269 return node, flag
270 270
271 271 def filenode(self, path):
272 272 return self._fileinfo(path)[0]
273 273
274 274 def flags(self, path):
275 275 try:
276 276 return self._fileinfo(path)[1]
277 277 except error.LookupError:
278 278 return ''
279 279
280 280 def sub(self, path, allowcreate=True):
281 281 '''return a subrepo for the stored revision of path, never wdir()'''
282 282 return subrepo.subrepo(self, path, allowcreate=allowcreate)
283 283
284 284 def nullsub(self, path, pctx):
285 285 return subrepo.nullsubrepo(self, path, pctx)
286 286
287 287 def workingsub(self, path):
288 288 '''return a subrepo for the stored revision, or wdir if this is a wdir
289 289 context.
290 290 '''
291 291 return subrepo.subrepo(self, path, allowwdir=True)
292 292
293 293 def match(self, pats=None, include=None, exclude=None, default='glob',
294 294 listsubrepos=False, badfn=None):
295 295 r = self._repo
296 296 return matchmod.match(r.root, r.getcwd(), pats,
297 297 include, exclude, default,
298 298 auditor=r.nofsauditor, ctx=self,
299 299 listsubrepos=listsubrepos, badfn=badfn)
300 300
301 301 def diff(self, ctx2=None, match=None, **opts):
302 302 """Returns a diff generator for the given contexts and matcher"""
303 303 if ctx2 is None:
304 304 ctx2 = self.p1()
305 305 if ctx2 is not None:
306 306 ctx2 = self._repo[ctx2]
307 307 diffopts = patch.diffopts(self._repo.ui, pycompat.byteskwargs(opts))
308 308 return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts)
309 309
310 310 def dirs(self):
311 311 return self._manifest.dirs()
312 312
313 313 def hasdir(self, dir):
314 314 return self._manifest.hasdir(dir)
315 315
316 316 def status(self, other=None, match=None, listignored=False,
317 317 listclean=False, listunknown=False, listsubrepos=False):
318 318 """return status of files between two nodes or node and working
319 319 directory.
320 320
321 321 If other is None, compare this node with working directory.
322 322
323 323 returns (modified, added, removed, deleted, unknown, ignored, clean)
324 324 """
325 325
326 326 ctx1 = self
327 327 ctx2 = self._repo[other]
328 328
329 329 # This next code block is, admittedly, fragile logic that tests for
330 330 # reversing the contexts and wouldn't need to exist if it weren't for
331 331 # the fast (and common) code path of comparing the working directory
332 332 # with its first parent.
333 333 #
334 334 # What we're aiming for here is the ability to call:
335 335 #
336 336 # workingctx.status(parentctx)
337 337 #
338 338 # If we always built the manifest for each context and compared those,
339 339 # then we'd be done. But the special case of the above call means we
340 340 # just copy the manifest of the parent.
341 341 reversed = False
342 342 if (not isinstance(ctx1, changectx)
343 343 and isinstance(ctx2, changectx)):
344 344 reversed = True
345 345 ctx1, ctx2 = ctx2, ctx1
346 346
347 347 match = match or matchmod.always(self._repo.root, self._repo.getcwd())
348 348 match = ctx2._matchstatus(ctx1, match)
349 349 r = scmutil.status([], [], [], [], [], [], [])
350 350 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
351 351 listunknown)
352 352
353 353 if reversed:
354 354 # Reverse added and removed. Clear deleted, unknown and ignored as
355 355 # these make no sense to reverse.
356 356 r = scmutil.status(r.modified, r.removed, r.added, [], [], [],
357 357 r.clean)
358 358
359 359 if listsubrepos:
360 360 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
361 361 try:
362 362 rev2 = ctx2.subrev(subpath)
363 363 except KeyError:
364 364 # A subrepo that existed in node1 was deleted between
365 365 # node1 and node2 (inclusive). Thus, ctx2's substate
366 366 # won't contain that subpath. The best we can do ignore it.
367 367 rev2 = None
368 368 submatch = matchmod.subdirmatcher(subpath, match)
369 369 s = sub.status(rev2, match=submatch, ignored=listignored,
370 370 clean=listclean, unknown=listunknown,
371 371 listsubrepos=True)
372 372 for rfiles, sfiles in zip(r, s):
373 373 rfiles.extend("%s/%s" % (subpath, f) for f in sfiles)
374 374
375 375 for l in r:
376 376 l.sort()
377 377
378 378 return r
379 379
380 380 def changectxdeprecwarn(repo):
381 381 # changectx's constructor will soon lose support for these forms of
382 382 # changeids:
383 383 # * stringinfied ints
384 384 # * bookmarks, tags, branches, and other namespace identifiers
385 385 # * hex nodeid prefixes
386 386 #
387 387 # Depending on your use case, replace repo[x] by one of these:
388 388 # * If you want to support general revsets, use scmutil.revsingle(x)
389 389 # * If you know that "x" is a stringified int, use repo[int(x)]
390 390 # * If you know that "x" is a bookmark, use repo._bookmarks.changectx(x)
391 391 # * If you know that "x" is a tag, use repo[repo.tags()[x]]
392 392 # * If you know that "x" is a branch or in some other namespace,
393 393 # use the appropriate mechanism for that namespace
394 394 # * If you know that "x" is a hex nodeid prefix, use
395 395 # repo[scmutil.resolvepartialhexnodeid(repo, x)]
396 396 # * If "x" is a string that can be any of the above, but you don't want
397 397 # to allow general revsets (perhaps because "x" may come from a remote
398 398 # user and the revset may be too costly), use scmutil.revsymbol(repo, x)
399 399 # * If "x" can be a mix of the above, you'll have to figure it out
400 400 # yourself
401 401 repo.ui.deprecwarn("changectx.__init__ is getting more limited, see source "
402 "for details", "4.6")
402 "for details", "4.6", stacklevel=4)
403 403
404 404 class changectx(basectx):
405 405 """A changecontext object makes access to data related to a particular
406 406 changeset convenient. It represents a read-only context already present in
407 407 the repo."""
408 408 def __init__(self, repo, changeid='.'):
409 409 """changeid is a revision number, node, or tag"""
410 410 super(changectx, self).__init__(repo)
411 411
412 412 try:
413 413 if isinstance(changeid, int):
414 414 self._node = repo.changelog.node(changeid)
415 415 self._rev = changeid
416 416 return
417 417 if changeid == 'null':
418 418 self._node = nullid
419 419 self._rev = nullrev
420 420 return
421 421 if changeid == 'tip':
422 422 self._node = repo.changelog.tip()
423 423 self._rev = repo.changelog.rev(self._node)
424 424 return
425 425 if (changeid == '.'
426 426 or repo.local() and changeid == repo.dirstate.p1()):
427 427 # this is a hack to delay/avoid loading obsmarkers
428 428 # when we know that '.' won't be hidden
429 429 self._node = repo.dirstate.p1()
430 430 self._rev = repo.unfiltered().changelog.rev(self._node)
431 431 return
432 432 if len(changeid) == 20:
433 433 try:
434 434 self._node = changeid
435 435 self._rev = repo.changelog.rev(changeid)
436 436 return
437 437 except error.FilteredLookupError:
438 438 raise
439 439 except LookupError:
440 440 pass
441 441
442 442 try:
443 443 r = int(changeid)
444 444 if '%d' % r != changeid:
445 445 raise ValueError
446 446 l = len(repo.changelog)
447 447 if r < 0:
448 448 r += l
449 449 if r < 0 or r >= l and r != wdirrev:
450 450 raise ValueError
451 451 self._rev = r
452 452 self._node = repo.changelog.node(r)
453 453 changectxdeprecwarn(repo)
454 454 return
455 455 except error.FilteredIndexError:
456 456 raise
457 457 except (ValueError, OverflowError, IndexError):
458 458 pass
459 459
460 460 if len(changeid) == 40:
461 461 try:
462 462 self._node = bin(changeid)
463 463 self._rev = repo.changelog.rev(self._node)
464 464 return
465 465 except error.FilteredLookupError:
466 466 raise
467 467 except (TypeError, LookupError):
468 468 pass
469 469
470 470 # lookup bookmarks through the name interface
471 471 try:
472 472 self._node = repo.names.singlenode(repo, changeid)
473 473 self._rev = repo.changelog.rev(self._node)
474 474 changectxdeprecwarn(repo)
475 475 return
476 476 except KeyError:
477 477 pass
478 478
479 479 self._node = scmutil.resolvepartialhexnodeid(repo, changeid)
480 480 if self._node is not None:
481 481 self._rev = repo.changelog.rev(self._node)
482 482 changectxdeprecwarn(repo)
483 483 return
484 484
485 485 # lookup failed
486 486 # check if it might have come from damaged dirstate
487 487 #
488 488 # XXX we could avoid the unfiltered if we had a recognizable
489 489 # exception for filtered changeset access
490 490 if (repo.local()
491 491 and changeid in repo.unfiltered().dirstate.parents()):
492 492 msg = _("working directory has unknown parent '%s'!")
493 493 raise error.Abort(msg % short(changeid))
494 494 try:
495 495 if len(changeid) == 20 and nonascii(changeid):
496 496 changeid = hex(changeid)
497 497 except TypeError:
498 498 pass
499 499 except (error.FilteredIndexError, error.FilteredLookupError,
500 500 error.FilteredRepoLookupError):
501 501 raise
502 502 except IndexError:
503 503 pass
504 504 raise error.RepoLookupError(
505 505 _("unknown revision '%s'") % changeid)
506 506
507 507 def __hash__(self):
508 508 try:
509 509 return hash(self._rev)
510 510 except AttributeError:
511 511 return id(self)
512 512
513 513 def __nonzero__(self):
514 514 return self._rev != nullrev
515 515
516 516 __bool__ = __nonzero__
517 517
518 518 @propertycache
519 519 def _changeset(self):
520 520 return self._repo.changelog.changelogrevision(self.rev())
521 521
522 522 @propertycache
523 523 def _manifest(self):
524 524 return self._manifestctx.read()
525 525
526 526 @property
527 527 def _manifestctx(self):
528 528 return self._repo.manifestlog[self._changeset.manifest]
529 529
530 530 @propertycache
531 531 def _manifestdelta(self):
532 532 return self._manifestctx.readdelta()
533 533
534 534 @propertycache
535 535 def _parents(self):
536 536 repo = self._repo
537 537 p1, p2 = repo.changelog.parentrevs(self._rev)
538 538 if p2 == nullrev:
539 539 return [changectx(repo, p1)]
540 540 return [changectx(repo, p1), changectx(repo, p2)]
541 541
542 542 def changeset(self):
543 543 c = self._changeset
544 544 return (
545 545 c.manifest,
546 546 c.user,
547 547 c.date,
548 548 c.files,
549 549 c.description,
550 550 c.extra,
551 551 )
552 552 def manifestnode(self):
553 553 return self._changeset.manifest
554 554
555 555 def user(self):
556 556 return self._changeset.user
557 557 def date(self):
558 558 return self._changeset.date
559 559 def files(self):
560 560 return self._changeset.files
561 561 def description(self):
562 562 return self._changeset.description
563 563 def branch(self):
564 564 return encoding.tolocal(self._changeset.extra.get("branch"))
565 565 def closesbranch(self):
566 566 return 'close' in self._changeset.extra
567 567 def extra(self):
568 568 """Return a dict of extra information."""
569 569 return self._changeset.extra
570 570 def tags(self):
571 571 """Return a list of byte tag names"""
572 572 return self._repo.nodetags(self._node)
573 573 def bookmarks(self):
574 574 """Return a list of byte bookmark names."""
575 575 return self._repo.nodebookmarks(self._node)
576 576 def phase(self):
577 577 return self._repo._phasecache.phase(self._repo, self._rev)
578 578 def hidden(self):
579 579 return self._rev in repoview.filterrevs(self._repo, 'visible')
580 580
581 581 def isinmemory(self):
582 582 return False
583 583
584 584 def children(self):
585 585 """return list of changectx contexts for each child changeset.
586 586
587 587 This returns only the immediate child changesets. Use descendants() to
588 588 recursively walk children.
589 589 """
590 590 c = self._repo.changelog.children(self._node)
591 591 return [changectx(self._repo, x) for x in c]
592 592
593 593 def ancestors(self):
594 594 for a in self._repo.changelog.ancestors([self._rev]):
595 595 yield changectx(self._repo, a)
596 596
597 597 def descendants(self):
598 598 """Recursively yield all children of the changeset.
599 599
600 600 For just the immediate children, use children()
601 601 """
602 602 for d in self._repo.changelog.descendants([self._rev]):
603 603 yield changectx(self._repo, d)
604 604
605 605 def filectx(self, path, fileid=None, filelog=None):
606 606 """get a file context from this changeset"""
607 607 if fileid is None:
608 608 fileid = self.filenode(path)
609 609 return filectx(self._repo, path, fileid=fileid,
610 610 changectx=self, filelog=filelog)
611 611
612 612 def ancestor(self, c2, warn=False):
613 613 """return the "best" ancestor context of self and c2
614 614
615 615 If there are multiple candidates, it will show a message and check
616 616 merge.preferancestor configuration before falling back to the
617 617 revlog ancestor."""
618 618 # deal with workingctxs
619 619 n2 = c2._node
620 620 if n2 is None:
621 621 n2 = c2._parents[0]._node
622 622 cahs = self._repo.changelog.commonancestorsheads(self._node, n2)
623 623 if not cahs:
624 624 anc = nullid
625 625 elif len(cahs) == 1:
626 626 anc = cahs[0]
627 627 else:
628 628 # experimental config: merge.preferancestor
629 629 for r in self._repo.ui.configlist('merge', 'preferancestor'):
630 630 try:
631 631 ctx = scmutil.revsymbol(self._repo, r)
632 632 except error.RepoLookupError:
633 633 continue
634 634 anc = ctx.node()
635 635 if anc in cahs:
636 636 break
637 637 else:
638 638 anc = self._repo.changelog.ancestor(self._node, n2)
639 639 if warn:
640 640 self._repo.ui.status(
641 641 (_("note: using %s as ancestor of %s and %s\n") %
642 642 (short(anc), short(self._node), short(n2))) +
643 643 ''.join(_(" alternatively, use --config "
644 644 "merge.preferancestor=%s\n") %
645 645 short(n) for n in sorted(cahs) if n != anc))
646 646 return changectx(self._repo, anc)
647 647
648 648 def descendant(self, other):
649 649 """True if other is descendant of this changeset"""
650 650 return self._repo.changelog.descendant(self._rev, other._rev)
651 651
652 652 def walk(self, match):
653 653 '''Generates matching file names.'''
654 654
655 655 # Wrap match.bad method to have message with nodeid
656 656 def bad(fn, msg):
657 657 # The manifest doesn't know about subrepos, so don't complain about
658 658 # paths into valid subrepos.
659 659 if any(fn == s or fn.startswith(s + '/')
660 660 for s in self.substate):
661 661 return
662 662 match.bad(fn, _('no such file in rev %s') % self)
663 663
664 664 m = matchmod.badmatch(match, bad)
665 665 return self._manifest.walk(m)
666 666
667 667 def matches(self, match):
668 668 return self.walk(match)
669 669
670 670 class basefilectx(object):
671 671 """A filecontext object represents the common logic for its children:
672 672 filectx: read-only access to a filerevision that is already present
673 673 in the repo,
674 674 workingfilectx: a filecontext that represents files from the working
675 675 directory,
676 676 memfilectx: a filecontext that represents files in-memory,
677 677 overlayfilectx: duplicate another filecontext with some fields overridden.
678 678 """
679 679 @propertycache
680 680 def _filelog(self):
681 681 return self._repo.file(self._path)
682 682
683 683 @propertycache
684 684 def _changeid(self):
685 685 if r'_changeid' in self.__dict__:
686 686 return self._changeid
687 687 elif r'_changectx' in self.__dict__:
688 688 return self._changectx.rev()
689 689 elif r'_descendantrev' in self.__dict__:
690 690 # this file context was created from a revision with a known
691 691 # descendant, we can (lazily) correct for linkrev aliases
692 692 return self._adjustlinkrev(self._descendantrev)
693 693 else:
694 694 return self._filelog.linkrev(self._filerev)
695 695
696 696 @propertycache
697 697 def _filenode(self):
698 698 if r'_fileid' in self.__dict__:
699 699 return self._filelog.lookup(self._fileid)
700 700 else:
701 701 return self._changectx.filenode(self._path)
702 702
703 703 @propertycache
704 704 def _filerev(self):
705 705 return self._filelog.rev(self._filenode)
706 706
707 707 @propertycache
708 708 def _repopath(self):
709 709 return self._path
710 710
711 711 def __nonzero__(self):
712 712 try:
713 713 self._filenode
714 714 return True
715 715 except error.LookupError:
716 716 # file is missing
717 717 return False
718 718
719 719 __bool__ = __nonzero__
720 720
721 721 def __bytes__(self):
722 722 try:
723 723 return "%s@%s" % (self.path(), self._changectx)
724 724 except error.LookupError:
725 725 return "%s@???" % self.path()
726 726
727 727 __str__ = encoding.strmethod(__bytes__)
728 728
729 729 def __repr__(self):
730 730 return r"<%s %s>" % (type(self).__name__, str(self))
731 731
732 732 def __hash__(self):
733 733 try:
734 734 return hash((self._path, self._filenode))
735 735 except AttributeError:
736 736 return id(self)
737 737
738 738 def __eq__(self, other):
739 739 try:
740 740 return (type(self) == type(other) and self._path == other._path
741 741 and self._filenode == other._filenode)
742 742 except AttributeError:
743 743 return False
744 744
745 745 def __ne__(self, other):
746 746 return not (self == other)
747 747
748 748 def filerev(self):
749 749 return self._filerev
750 750 def filenode(self):
751 751 return self._filenode
752 752 @propertycache
753 753 def _flags(self):
754 754 return self._changectx.flags(self._path)
755 755 def flags(self):
756 756 return self._flags
757 757 def filelog(self):
758 758 return self._filelog
759 759 def rev(self):
760 760 return self._changeid
761 761 def linkrev(self):
762 762 return self._filelog.linkrev(self._filerev)
763 763 def node(self):
764 764 return self._changectx.node()
765 765 def hex(self):
766 766 return self._changectx.hex()
767 767 def user(self):
768 768 return self._changectx.user()
769 769 def date(self):
770 770 return self._changectx.date()
771 771 def files(self):
772 772 return self._changectx.files()
773 773 def description(self):
774 774 return self._changectx.description()
775 775 def branch(self):
776 776 return self._changectx.branch()
777 777 def extra(self):
778 778 return self._changectx.extra()
779 779 def phase(self):
780 780 return self._changectx.phase()
781 781 def phasestr(self):
782 782 return self._changectx.phasestr()
783 783 def obsolete(self):
784 784 return self._changectx.obsolete()
785 785 def instabilities(self):
786 786 return self._changectx.instabilities()
787 787 def manifest(self):
788 788 return self._changectx.manifest()
789 789 def changectx(self):
790 790 return self._changectx
791 791 def renamed(self):
792 792 return self._copied
793 793 def repo(self):
794 794 return self._repo
795 795 def size(self):
796 796 return len(self.data())
797 797
798 798 def path(self):
799 799 return self._path
800 800
801 801 def isbinary(self):
802 802 try:
803 803 return stringutil.binary(self.data())
804 804 except IOError:
805 805 return False
806 806 def isexec(self):
807 807 return 'x' in self.flags()
808 808 def islink(self):
809 809 return 'l' in self.flags()
810 810
811 811 def isabsent(self):
812 812 """whether this filectx represents a file not in self._changectx
813 813
814 814 This is mainly for merge code to detect change/delete conflicts. This is
815 815 expected to be True for all subclasses of basectx."""
816 816 return False
817 817
818 818 _customcmp = False
819 819 def cmp(self, fctx):
820 820 """compare with other file context
821 821
822 822 returns True if different than fctx.
823 823 """
824 824 if fctx._customcmp:
825 825 return fctx.cmp(self)
826 826
827 827 if (fctx._filenode is None
828 828 and (self._repo._encodefilterpats
829 829 # if file data starts with '\1\n', empty metadata block is
830 830 # prepended, which adds 4 bytes to filelog.size().
831 831 or self.size() - 4 == fctx.size())
832 832 or self.size() == fctx.size()):
833 833 return self._filelog.cmp(self._filenode, fctx.data())
834 834
835 835 return True
836 836
837 837 def _adjustlinkrev(self, srcrev, inclusive=False):
838 838 """return the first ancestor of <srcrev> introducing <fnode>
839 839
840 840 If the linkrev of the file revision does not point to an ancestor of
841 841 srcrev, we'll walk down the ancestors until we find one introducing
842 842 this file revision.
843 843
844 844 :srcrev: the changeset revision we search ancestors from
845 845 :inclusive: if true, the src revision will also be checked
846 846 """
847 847 repo = self._repo
848 848 cl = repo.unfiltered().changelog
849 849 mfl = repo.manifestlog
850 850 # fetch the linkrev
851 851 lkr = self.linkrev()
852 852 # hack to reuse ancestor computation when searching for renames
853 853 memberanc = getattr(self, '_ancestrycontext', None)
854 854 iteranc = None
855 855 if srcrev is None:
856 856 # wctx case, used by workingfilectx during mergecopy
857 857 revs = [p.rev() for p in self._repo[None].parents()]
858 858 inclusive = True # we skipped the real (revless) source
859 859 else:
860 860 revs = [srcrev]
861 861 if memberanc is None:
862 862 memberanc = iteranc = cl.ancestors(revs, lkr,
863 863 inclusive=inclusive)
864 864 # check if this linkrev is an ancestor of srcrev
865 865 if lkr not in memberanc:
866 866 if iteranc is None:
867 867 iteranc = cl.ancestors(revs, lkr, inclusive=inclusive)
868 868 fnode = self._filenode
869 869 path = self._path
870 870 for a in iteranc:
871 871 ac = cl.read(a) # get changeset data (we avoid object creation)
872 872 if path in ac[3]: # checking the 'files' field.
873 873 # The file has been touched, check if the content is
874 874 # similar to the one we search for.
875 875 if fnode == mfl[ac[0]].readfast().get(path):
876 876 return a
877 877 # In theory, we should never get out of that loop without a result.
878 878 # But if manifest uses a buggy file revision (not children of the
879 879 # one it replaces) we could. Such a buggy situation will likely
880 880 # result is crash somewhere else at to some point.
881 881 return lkr
882 882
883 883 def introrev(self):
884 884 """return the rev of the changeset which introduced this file revision
885 885
886 886 This method is different from linkrev because it take into account the
887 887 changeset the filectx was created from. It ensures the returned
888 888 revision is one of its ancestors. This prevents bugs from
889 889 'linkrev-shadowing' when a file revision is used by multiple
890 890 changesets.
891 891 """
892 892 lkr = self.linkrev()
893 893 attrs = vars(self)
894 894 noctx = not (r'_changeid' in attrs or r'_changectx' in attrs)
895 895 if noctx or self.rev() == lkr:
896 896 return self.linkrev()
897 897 return self._adjustlinkrev(self.rev(), inclusive=True)
898 898
899 899 def introfilectx(self):
900 900 """Return filectx having identical contents, but pointing to the
901 901 changeset revision where this filectx was introduced"""
902 902 introrev = self.introrev()
903 903 if self.rev() == introrev:
904 904 return self
905 905 return self.filectx(self.filenode(), changeid=introrev)
906 906
907 907 def _parentfilectx(self, path, fileid, filelog):
908 908 """create parent filectx keeping ancestry info for _adjustlinkrev()"""
909 909 fctx = filectx(self._repo, path, fileid=fileid, filelog=filelog)
910 910 if r'_changeid' in vars(self) or r'_changectx' in vars(self):
911 911 # If self is associated with a changeset (probably explicitly
912 912 # fed), ensure the created filectx is associated with a
913 913 # changeset that is an ancestor of self.changectx.
914 914 # This lets us later use _adjustlinkrev to get a correct link.
915 915 fctx._descendantrev = self.rev()
916 916 fctx._ancestrycontext = getattr(self, '_ancestrycontext', None)
917 917 elif r'_descendantrev' in vars(self):
918 918 # Otherwise propagate _descendantrev if we have one associated.
919 919 fctx._descendantrev = self._descendantrev
920 920 fctx._ancestrycontext = getattr(self, '_ancestrycontext', None)
921 921 return fctx
922 922
923 923 def parents(self):
924 924 _path = self._path
925 925 fl = self._filelog
926 926 parents = self._filelog.parents(self._filenode)
927 927 pl = [(_path, node, fl) for node in parents if node != nullid]
928 928
929 929 r = fl.renamed(self._filenode)
930 930 if r:
931 931 # - In the simple rename case, both parent are nullid, pl is empty.
932 932 # - In case of merge, only one of the parent is null id and should
933 933 # be replaced with the rename information. This parent is -always-
934 934 # the first one.
935 935 #
936 936 # As null id have always been filtered out in the previous list
937 937 # comprehension, inserting to 0 will always result in "replacing
938 938 # first nullid parent with rename information.
939 939 pl.insert(0, (r[0], r[1], self._repo.file(r[0])))
940 940
941 941 return [self._parentfilectx(path, fnode, l) for path, fnode, l in pl]
942 942
943 943 def p1(self):
944 944 return self.parents()[0]
945 945
946 946 def p2(self):
947 947 p = self.parents()
948 948 if len(p) == 2:
949 949 return p[1]
950 950 return filectx(self._repo, self._path, fileid=-1, filelog=self._filelog)
951 951
952 952 def annotate(self, follow=False, skiprevs=None, diffopts=None):
953 953 """Returns a list of annotateline objects for each line in the file
954 954
955 955 - line.fctx is the filectx of the node where that line was last changed
956 956 - line.lineno is the line number at the first appearance in the managed
957 957 file
958 958 - line.text is the data on that line (including newline character)
959 959 """
960 960 getlog = util.lrucachefunc(lambda x: self._repo.file(x))
961 961
962 962 def parents(f):
963 963 # Cut _descendantrev here to mitigate the penalty of lazy linkrev
964 964 # adjustment. Otherwise, p._adjustlinkrev() would walk changelog
965 965 # from the topmost introrev (= srcrev) down to p.linkrev() if it
966 966 # isn't an ancestor of the srcrev.
967 967 f._changeid
968 968 pl = f.parents()
969 969
970 970 # Don't return renamed parents if we aren't following.
971 971 if not follow:
972 972 pl = [p for p in pl if p.path() == f.path()]
973 973
974 974 # renamed filectx won't have a filelog yet, so set it
975 975 # from the cache to save time
976 976 for p in pl:
977 977 if not r'_filelog' in p.__dict__:
978 978 p._filelog = getlog(p.path())
979 979
980 980 return pl
981 981
982 982 # use linkrev to find the first changeset where self appeared
983 983 base = self.introfilectx()
984 984 if getattr(base, '_ancestrycontext', None) is None:
985 985 cl = self._repo.changelog
986 986 if base.rev() is None:
987 987 # wctx is not inclusive, but works because _ancestrycontext
988 988 # is used to test filelog revisions
989 989 ac = cl.ancestors([p.rev() for p in base.parents()],
990 990 inclusive=True)
991 991 else:
992 992 ac = cl.ancestors([base.rev()], inclusive=True)
993 993 base._ancestrycontext = ac
994 994
995 995 return dagop.annotate(base, parents, skiprevs=skiprevs,
996 996 diffopts=diffopts)
997 997
998 998 def ancestors(self, followfirst=False):
999 999 visit = {}
1000 1000 c = self
1001 1001 if followfirst:
1002 1002 cut = 1
1003 1003 else:
1004 1004 cut = None
1005 1005
1006 1006 while True:
1007 1007 for parent in c.parents()[:cut]:
1008 1008 visit[(parent.linkrev(), parent.filenode())] = parent
1009 1009 if not visit:
1010 1010 break
1011 1011 c = visit.pop(max(visit))
1012 1012 yield c
1013 1013
1014 1014 def decodeddata(self):
1015 1015 """Returns `data()` after running repository decoding filters.
1016 1016
1017 1017 This is often equivalent to how the data would be expressed on disk.
1018 1018 """
1019 1019 return self._repo.wwritedata(self.path(), self.data())
1020 1020
1021 1021 class filectx(basefilectx):
1022 1022 """A filecontext object makes access to data related to a particular
1023 1023 filerevision convenient."""
1024 1024 def __init__(self, repo, path, changeid=None, fileid=None,
1025 1025 filelog=None, changectx=None):
1026 1026 """changeid can be a changeset revision, node, or tag.
1027 1027 fileid can be a file revision or node."""
1028 1028 self._repo = repo
1029 1029 self._path = path
1030 1030
1031 1031 assert (changeid is not None
1032 1032 or fileid is not None
1033 1033 or changectx is not None), \
1034 1034 ("bad args: changeid=%r, fileid=%r, changectx=%r"
1035 1035 % (changeid, fileid, changectx))
1036 1036
1037 1037 if filelog is not None:
1038 1038 self._filelog = filelog
1039 1039
1040 1040 if changeid is not None:
1041 1041 self._changeid = changeid
1042 1042 if changectx is not None:
1043 1043 self._changectx = changectx
1044 1044 if fileid is not None:
1045 1045 self._fileid = fileid
1046 1046
1047 1047 @propertycache
1048 1048 def _changectx(self):
1049 1049 try:
1050 1050 return changectx(self._repo, self._changeid)
1051 1051 except error.FilteredRepoLookupError:
1052 1052 # Linkrev may point to any revision in the repository. When the
1053 1053 # repository is filtered this may lead to `filectx` trying to build
1054 1054 # `changectx` for filtered revision. In such case we fallback to
1055 1055 # creating `changectx` on the unfiltered version of the reposition.
1056 1056 # This fallback should not be an issue because `changectx` from
1057 1057 # `filectx` are not used in complex operations that care about
1058 1058 # filtering.
1059 1059 #
1060 1060 # This fallback is a cheap and dirty fix that prevent several
1061 1061 # crashes. It does not ensure the behavior is correct. However the
1062 1062 # behavior was not correct before filtering either and "incorrect
1063 1063 # behavior" is seen as better as "crash"
1064 1064 #
1065 1065 # Linkrevs have several serious troubles with filtering that are
1066 1066 # complicated to solve. Proper handling of the issue here should be
1067 1067 # considered when solving linkrev issue are on the table.
1068 1068 return changectx(self._repo.unfiltered(), self._changeid)
1069 1069
1070 1070 def filectx(self, fileid, changeid=None):
1071 1071 '''opens an arbitrary revision of the file without
1072 1072 opening a new filelog'''
1073 1073 return filectx(self._repo, self._path, fileid=fileid,
1074 1074 filelog=self._filelog, changeid=changeid)
1075 1075
1076 1076 def rawdata(self):
1077 1077 return self._filelog.revision(self._filenode, raw=True)
1078 1078
1079 1079 def rawflags(self):
1080 1080 """low-level revlog flags"""
1081 1081 return self._filelog.flags(self._filerev)
1082 1082
1083 1083 def data(self):
1084 1084 try:
1085 1085 return self._filelog.read(self._filenode)
1086 1086 except error.CensoredNodeError:
1087 1087 if self._repo.ui.config("censor", "policy") == "ignore":
1088 1088 return ""
1089 1089 raise error.Abort(_("censored node: %s") % short(self._filenode),
1090 1090 hint=_("set censor.policy to ignore errors"))
1091 1091
1092 1092 def size(self):
1093 1093 return self._filelog.size(self._filerev)
1094 1094
1095 1095 @propertycache
1096 1096 def _copied(self):
1097 1097 """check if file was actually renamed in this changeset revision
1098 1098
1099 1099 If rename logged in file revision, we report copy for changeset only
1100 1100 if file revisions linkrev points back to the changeset in question
1101 1101 or both changeset parents contain different file revisions.
1102 1102 """
1103 1103
1104 1104 renamed = self._filelog.renamed(self._filenode)
1105 1105 if not renamed:
1106 1106 return renamed
1107 1107
1108 1108 if self.rev() == self.linkrev():
1109 1109 return renamed
1110 1110
1111 1111 name = self.path()
1112 1112 fnode = self._filenode
1113 1113 for p in self._changectx.parents():
1114 1114 try:
1115 1115 if fnode == p.filenode(name):
1116 1116 return None
1117 1117 except error.LookupError:
1118 1118 pass
1119 1119 return renamed
1120 1120
1121 1121 def children(self):
1122 1122 # hard for renames
1123 1123 c = self._filelog.children(self._filenode)
1124 1124 return [filectx(self._repo, self._path, fileid=x,
1125 1125 filelog=self._filelog) for x in c]
1126 1126
1127 1127 class committablectx(basectx):
1128 1128 """A committablectx object provides common functionality for a context that
1129 1129 wants the ability to commit, e.g. workingctx or memctx."""
1130 1130 def __init__(self, repo, text="", user=None, date=None, extra=None,
1131 1131 changes=None):
1132 1132 super(committablectx, self).__init__(repo)
1133 1133 self._rev = None
1134 1134 self._node = None
1135 1135 self._text = text
1136 1136 if date:
1137 1137 self._date = dateutil.parsedate(date)
1138 1138 if user:
1139 1139 self._user = user
1140 1140 if changes:
1141 1141 self._status = changes
1142 1142
1143 1143 self._extra = {}
1144 1144 if extra:
1145 1145 self._extra = extra.copy()
1146 1146 if 'branch' not in self._extra:
1147 1147 try:
1148 1148 branch = encoding.fromlocal(self._repo.dirstate.branch())
1149 1149 except UnicodeDecodeError:
1150 1150 raise error.Abort(_('branch name not in UTF-8!'))
1151 1151 self._extra['branch'] = branch
1152 1152 if self._extra['branch'] == '':
1153 1153 self._extra['branch'] = 'default'
1154 1154
1155 1155 def __bytes__(self):
1156 1156 return bytes(self._parents[0]) + "+"
1157 1157
1158 1158 __str__ = encoding.strmethod(__bytes__)
1159 1159
1160 1160 def __nonzero__(self):
1161 1161 return True
1162 1162
1163 1163 __bool__ = __nonzero__
1164 1164
1165 1165 def _buildflagfunc(self):
1166 1166 # Create a fallback function for getting file flags when the
1167 1167 # filesystem doesn't support them
1168 1168
1169 1169 copiesget = self._repo.dirstate.copies().get
1170 1170 parents = self.parents()
1171 1171 if len(parents) < 2:
1172 1172 # when we have one parent, it's easy: copy from parent
1173 1173 man = parents[0].manifest()
1174 1174 def func(f):
1175 1175 f = copiesget(f, f)
1176 1176 return man.flags(f)
1177 1177 else:
1178 1178 # merges are tricky: we try to reconstruct the unstored
1179 1179 # result from the merge (issue1802)
1180 1180 p1, p2 = parents
1181 1181 pa = p1.ancestor(p2)
1182 1182 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
1183 1183
1184 1184 def func(f):
1185 1185 f = copiesget(f, f) # may be wrong for merges with copies
1186 1186 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f)
1187 1187 if fl1 == fl2:
1188 1188 return fl1
1189 1189 if fl1 == fla:
1190 1190 return fl2
1191 1191 if fl2 == fla:
1192 1192 return fl1
1193 1193 return '' # punt for conflicts
1194 1194
1195 1195 return func
1196 1196
1197 1197 @propertycache
1198 1198 def _flagfunc(self):
1199 1199 return self._repo.dirstate.flagfunc(self._buildflagfunc)
1200 1200
1201 1201 @propertycache
1202 1202 def _status(self):
1203 1203 return self._repo.status()
1204 1204
1205 1205 @propertycache
1206 1206 def _user(self):
1207 1207 return self._repo.ui.username()
1208 1208
1209 1209 @propertycache
1210 1210 def _date(self):
1211 1211 ui = self._repo.ui
1212 1212 date = ui.configdate('devel', 'default-date')
1213 1213 if date is None:
1214 1214 date = dateutil.makedate()
1215 1215 return date
1216 1216
1217 1217 def subrev(self, subpath):
1218 1218 return None
1219 1219
1220 1220 def manifestnode(self):
1221 1221 return None
1222 1222 def user(self):
1223 1223 return self._user or self._repo.ui.username()
1224 1224 def date(self):
1225 1225 return self._date
1226 1226 def description(self):
1227 1227 return self._text
1228 1228 def files(self):
1229 1229 return sorted(self._status.modified + self._status.added +
1230 1230 self._status.removed)
1231 1231
1232 1232 def modified(self):
1233 1233 return self._status.modified
1234 1234 def added(self):
1235 1235 return self._status.added
1236 1236 def removed(self):
1237 1237 return self._status.removed
1238 1238 def deleted(self):
1239 1239 return self._status.deleted
1240 1240 def branch(self):
1241 1241 return encoding.tolocal(self._extra['branch'])
1242 1242 def closesbranch(self):
1243 1243 return 'close' in self._extra
1244 1244 def extra(self):
1245 1245 return self._extra
1246 1246
1247 1247 def isinmemory(self):
1248 1248 return False
1249 1249
1250 1250 def tags(self):
1251 1251 return []
1252 1252
1253 1253 def bookmarks(self):
1254 1254 b = []
1255 1255 for p in self.parents():
1256 1256 b.extend(p.bookmarks())
1257 1257 return b
1258 1258
1259 1259 def phase(self):
1260 1260 phase = phases.draft # default phase to draft
1261 1261 for p in self.parents():
1262 1262 phase = max(phase, p.phase())
1263 1263 return phase
1264 1264
1265 1265 def hidden(self):
1266 1266 return False
1267 1267
1268 1268 def children(self):
1269 1269 return []
1270 1270
1271 1271 def flags(self, path):
1272 1272 if r'_manifest' in self.__dict__:
1273 1273 try:
1274 1274 return self._manifest.flags(path)
1275 1275 except KeyError:
1276 1276 return ''
1277 1277
1278 1278 try:
1279 1279 return self._flagfunc(path)
1280 1280 except OSError:
1281 1281 return ''
1282 1282
1283 1283 def ancestor(self, c2):
1284 1284 """return the "best" ancestor context of self and c2"""
1285 1285 return self._parents[0].ancestor(c2) # punt on two parents for now
1286 1286
1287 1287 def walk(self, match):
1288 1288 '''Generates matching file names.'''
1289 1289 return sorted(self._repo.dirstate.walk(match,
1290 1290 subrepos=sorted(self.substate),
1291 1291 unknown=True, ignored=False))
1292 1292
1293 1293 def matches(self, match):
1294 1294 return sorted(self._repo.dirstate.matches(match))
1295 1295
1296 1296 def ancestors(self):
1297 1297 for p in self._parents:
1298 1298 yield p
1299 1299 for a in self._repo.changelog.ancestors(
1300 1300 [p.rev() for p in self._parents]):
1301 1301 yield changectx(self._repo, a)
1302 1302
1303 1303 def markcommitted(self, node):
1304 1304 """Perform post-commit cleanup necessary after committing this ctx
1305 1305
1306 1306 Specifically, this updates backing stores this working context
1307 1307 wraps to reflect the fact that the changes reflected by this
1308 1308 workingctx have been committed. For example, it marks
1309 1309 modified and added files as normal in the dirstate.
1310 1310
1311 1311 """
1312 1312
1313 1313 with self._repo.dirstate.parentchange():
1314 1314 for f in self.modified() + self.added():
1315 1315 self._repo.dirstate.normal(f)
1316 1316 for f in self.removed():
1317 1317 self._repo.dirstate.drop(f)
1318 1318 self._repo.dirstate.setparents(node)
1319 1319
1320 1320 # write changes out explicitly, because nesting wlock at
1321 1321 # runtime may prevent 'wlock.release()' in 'repo.commit()'
1322 1322 # from immediately doing so for subsequent changing files
1323 1323 self._repo.dirstate.write(self._repo.currenttransaction())
1324 1324
1325 1325 def dirty(self, missing=False, merge=True, branch=True):
1326 1326 return False
1327 1327
1328 1328 class workingctx(committablectx):
1329 1329 """A workingctx object makes access to data related to
1330 1330 the current working directory convenient.
1331 1331 date - any valid date string or (unixtime, offset), or None.
1332 1332 user - username string, or None.
1333 1333 extra - a dictionary of extra values, or None.
1334 1334 changes - a list of file lists as returned by localrepo.status()
1335 1335 or None to use the repository status.
1336 1336 """
1337 1337 def __init__(self, repo, text="", user=None, date=None, extra=None,
1338 1338 changes=None):
1339 1339 super(workingctx, self).__init__(repo, text, user, date, extra, changes)
1340 1340
1341 1341 def __iter__(self):
1342 1342 d = self._repo.dirstate
1343 1343 for f in d:
1344 1344 if d[f] != 'r':
1345 1345 yield f
1346 1346
1347 1347 def __contains__(self, key):
1348 1348 return self._repo.dirstate[key] not in "?r"
1349 1349
1350 1350 def hex(self):
1351 1351 return hex(wdirid)
1352 1352
1353 1353 @propertycache
1354 1354 def _parents(self):
1355 1355 p = self._repo.dirstate.parents()
1356 1356 if p[1] == nullid:
1357 1357 p = p[:-1]
1358 1358 return [changectx(self._repo, x) for x in p]
1359 1359
1360 1360 def _fileinfo(self, path):
1361 1361 # populate __dict__['_manifest'] as workingctx has no _manifestdelta
1362 1362 self._manifest
1363 1363 return super(workingctx, self)._fileinfo(path)
1364 1364
1365 1365 def filectx(self, path, filelog=None):
1366 1366 """get a file context from the working directory"""
1367 1367 return workingfilectx(self._repo, path, workingctx=self,
1368 1368 filelog=filelog)
1369 1369
1370 1370 def dirty(self, missing=False, merge=True, branch=True):
1371 1371 "check whether a working directory is modified"
1372 1372 # check subrepos first
1373 1373 for s in sorted(self.substate):
1374 1374 if self.sub(s).dirty(missing=missing):
1375 1375 return True
1376 1376 # check current working dir
1377 1377 return ((merge and self.p2()) or
1378 1378 (branch and self.branch() != self.p1().branch()) or
1379 1379 self.modified() or self.added() or self.removed() or
1380 1380 (missing and self.deleted()))
1381 1381
1382 1382 def add(self, list, prefix=""):
1383 1383 with self._repo.wlock():
1384 1384 ui, ds = self._repo.ui, self._repo.dirstate
1385 1385 uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
1386 1386 rejected = []
1387 1387 lstat = self._repo.wvfs.lstat
1388 1388 for f in list:
1389 1389 # ds.pathto() returns an absolute file when this is invoked from
1390 1390 # the keyword extension. That gets flagged as non-portable on
1391 1391 # Windows, since it contains the drive letter and colon.
1392 1392 scmutil.checkportable(ui, os.path.join(prefix, f))
1393 1393 try:
1394 1394 st = lstat(f)
1395 1395 except OSError:
1396 1396 ui.warn(_("%s does not exist!\n") % uipath(f))
1397 1397 rejected.append(f)
1398 1398 continue
1399 1399 if st.st_size > 10000000:
1400 1400 ui.warn(_("%s: up to %d MB of RAM may be required "
1401 1401 "to manage this file\n"
1402 1402 "(use 'hg revert %s' to cancel the "
1403 1403 "pending addition)\n")
1404 1404 % (f, 3 * st.st_size // 1000000, uipath(f)))
1405 1405 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
1406 1406 ui.warn(_("%s not added: only files and symlinks "
1407 1407 "supported currently\n") % uipath(f))
1408 1408 rejected.append(f)
1409 1409 elif ds[f] in 'amn':
1410 1410 ui.warn(_("%s already tracked!\n") % uipath(f))
1411 1411 elif ds[f] == 'r':
1412 1412 ds.normallookup(f)
1413 1413 else:
1414 1414 ds.add(f)
1415 1415 return rejected
1416 1416
1417 1417 def forget(self, files, prefix=""):
1418 1418 with self._repo.wlock():
1419 1419 ds = self._repo.dirstate
1420 1420 uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
1421 1421 rejected = []
1422 1422 for f in files:
1423 1423 if f not in self._repo.dirstate:
1424 1424 self._repo.ui.warn(_("%s not tracked!\n") % uipath(f))
1425 1425 rejected.append(f)
1426 1426 elif self._repo.dirstate[f] != 'a':
1427 1427 self._repo.dirstate.remove(f)
1428 1428 else:
1429 1429 self._repo.dirstate.drop(f)
1430 1430 return rejected
1431 1431
1432 1432 def undelete(self, list):
1433 1433 pctxs = self.parents()
1434 1434 with self._repo.wlock():
1435 1435 ds = self._repo.dirstate
1436 1436 for f in list:
1437 1437 if self._repo.dirstate[f] != 'r':
1438 1438 self._repo.ui.warn(_("%s not removed!\n") % ds.pathto(f))
1439 1439 else:
1440 1440 fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f]
1441 1441 t = fctx.data()
1442 1442 self._repo.wwrite(f, t, fctx.flags())
1443 1443 self._repo.dirstate.normal(f)
1444 1444
1445 1445 def copy(self, source, dest):
1446 1446 try:
1447 1447 st = self._repo.wvfs.lstat(dest)
1448 1448 except OSError as err:
1449 1449 if err.errno != errno.ENOENT:
1450 1450 raise
1451 1451 self._repo.ui.warn(_("%s does not exist!\n")
1452 1452 % self._repo.dirstate.pathto(dest))
1453 1453 return
1454 1454 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
1455 1455 self._repo.ui.warn(_("copy failed: %s is not a file or a "
1456 1456 "symbolic link\n")
1457 1457 % self._repo.dirstate.pathto(dest))
1458 1458 else:
1459 1459 with self._repo.wlock():
1460 1460 if self._repo.dirstate[dest] in '?':
1461 1461 self._repo.dirstate.add(dest)
1462 1462 elif self._repo.dirstate[dest] in 'r':
1463 1463 self._repo.dirstate.normallookup(dest)
1464 1464 self._repo.dirstate.copy(source, dest)
1465 1465
1466 1466 def match(self, pats=None, include=None, exclude=None, default='glob',
1467 1467 listsubrepos=False, badfn=None):
1468 1468 r = self._repo
1469 1469
1470 1470 # Only a case insensitive filesystem needs magic to translate user input
1471 1471 # to actual case in the filesystem.
1472 1472 icasefs = not util.fscasesensitive(r.root)
1473 1473 return matchmod.match(r.root, r.getcwd(), pats, include, exclude,
1474 1474 default, auditor=r.auditor, ctx=self,
1475 1475 listsubrepos=listsubrepos, badfn=badfn,
1476 1476 icasefs=icasefs)
1477 1477
1478 1478 def _filtersuspectsymlink(self, files):
1479 1479 if not files or self._repo.dirstate._checklink:
1480 1480 return files
1481 1481
1482 1482 # Symlink placeholders may get non-symlink-like contents
1483 1483 # via user error or dereferencing by NFS or Samba servers,
1484 1484 # so we filter out any placeholders that don't look like a
1485 1485 # symlink
1486 1486 sane = []
1487 1487 for f in files:
1488 1488 if self.flags(f) == 'l':
1489 1489 d = self[f].data()
1490 1490 if (d == '' or len(d) >= 1024 or '\n' in d
1491 1491 or stringutil.binary(d)):
1492 1492 self._repo.ui.debug('ignoring suspect symlink placeholder'
1493 1493 ' "%s"\n' % f)
1494 1494 continue
1495 1495 sane.append(f)
1496 1496 return sane
1497 1497
1498 1498 def _checklookup(self, files):
1499 1499 # check for any possibly clean files
1500 1500 if not files:
1501 1501 return [], [], []
1502 1502
1503 1503 modified = []
1504 1504 deleted = []
1505 1505 fixup = []
1506 1506 pctx = self._parents[0]
1507 1507 # do a full compare of any files that might have changed
1508 1508 for f in sorted(files):
1509 1509 try:
1510 1510 # This will return True for a file that got replaced by a
1511 1511 # directory in the interim, but fixing that is pretty hard.
1512 1512 if (f not in pctx or self.flags(f) != pctx.flags(f)
1513 1513 or pctx[f].cmp(self[f])):
1514 1514 modified.append(f)
1515 1515 else:
1516 1516 fixup.append(f)
1517 1517 except (IOError, OSError):
1518 1518 # A file become inaccessible in between? Mark it as deleted,
1519 1519 # matching dirstate behavior (issue5584).
1520 1520 # The dirstate has more complex behavior around whether a
1521 1521 # missing file matches a directory, etc, but we don't need to
1522 1522 # bother with that: if f has made it to this point, we're sure
1523 1523 # it's in the dirstate.
1524 1524 deleted.append(f)
1525 1525
1526 1526 return modified, deleted, fixup
1527 1527
1528 1528 def _poststatusfixup(self, status, fixup):
1529 1529 """update dirstate for files that are actually clean"""
1530 1530 poststatus = self._repo.postdsstatus()
1531 1531 if fixup or poststatus:
1532 1532 try:
1533 1533 oldid = self._repo.dirstate.identity()
1534 1534
1535 1535 # updating the dirstate is optional
1536 1536 # so we don't wait on the lock
1537 1537 # wlock can invalidate the dirstate, so cache normal _after_
1538 1538 # taking the lock
1539 1539 with self._repo.wlock(False):
1540 1540 if self._repo.dirstate.identity() == oldid:
1541 1541 if fixup:
1542 1542 normal = self._repo.dirstate.normal
1543 1543 for f in fixup:
1544 1544 normal(f)
1545 1545 # write changes out explicitly, because nesting
1546 1546 # wlock at runtime may prevent 'wlock.release()'
1547 1547 # after this block from doing so for subsequent
1548 1548 # changing files
1549 1549 tr = self._repo.currenttransaction()
1550 1550 self._repo.dirstate.write(tr)
1551 1551
1552 1552 if poststatus:
1553 1553 for ps in poststatus:
1554 1554 ps(self, status)
1555 1555 else:
1556 1556 # in this case, writing changes out breaks
1557 1557 # consistency, because .hg/dirstate was
1558 1558 # already changed simultaneously after last
1559 1559 # caching (see also issue5584 for detail)
1560 1560 self._repo.ui.debug('skip updating dirstate: '
1561 1561 'identity mismatch\n')
1562 1562 except error.LockError:
1563 1563 pass
1564 1564 finally:
1565 1565 # Even if the wlock couldn't be grabbed, clear out the list.
1566 1566 self._repo.clearpostdsstatus()
1567 1567
1568 1568 def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
1569 1569 '''Gets the status from the dirstate -- internal use only.'''
1570 1570 subrepos = []
1571 1571 if '.hgsub' in self:
1572 1572 subrepos = sorted(self.substate)
1573 1573 cmp, s = self._repo.dirstate.status(match, subrepos, ignored=ignored,
1574 1574 clean=clean, unknown=unknown)
1575 1575
1576 1576 # check for any possibly clean files
1577 1577 fixup = []
1578 1578 if cmp:
1579 1579 modified2, deleted2, fixup = self._checklookup(cmp)
1580 1580 s.modified.extend(modified2)
1581 1581 s.deleted.extend(deleted2)
1582 1582
1583 1583 if fixup and clean:
1584 1584 s.clean.extend(fixup)
1585 1585
1586 1586 self._poststatusfixup(s, fixup)
1587 1587
1588 1588 if match.always():
1589 1589 # cache for performance
1590 1590 if s.unknown or s.ignored or s.clean:
1591 1591 # "_status" is cached with list*=False in the normal route
1592 1592 self._status = scmutil.status(s.modified, s.added, s.removed,
1593 1593 s.deleted, [], [], [])
1594 1594 else:
1595 1595 self._status = s
1596 1596
1597 1597 return s
1598 1598
1599 1599 @propertycache
1600 1600 def _manifest(self):
1601 1601 """generate a manifest corresponding to the values in self._status
1602 1602
1603 1603 This reuse the file nodeid from parent, but we use special node
1604 1604 identifiers for added and modified files. This is used by manifests
1605 1605 merge to see that files are different and by update logic to avoid
1606 1606 deleting newly added files.
1607 1607 """
1608 1608 return self._buildstatusmanifest(self._status)
1609 1609
1610 1610 def _buildstatusmanifest(self, status):
1611 1611 """Builds a manifest that includes the given status results."""
1612 1612 parents = self.parents()
1613 1613
1614 1614 man = parents[0].manifest().copy()
1615 1615
1616 1616 ff = self._flagfunc
1617 1617 for i, l in ((addednodeid, status.added),
1618 1618 (modifiednodeid, status.modified)):
1619 1619 for f in l:
1620 1620 man[f] = i
1621 1621 try:
1622 1622 man.setflag(f, ff(f))
1623 1623 except OSError:
1624 1624 pass
1625 1625
1626 1626 for f in status.deleted + status.removed:
1627 1627 if f in man:
1628 1628 del man[f]
1629 1629
1630 1630 return man
1631 1631
1632 1632 def _buildstatus(self, other, s, match, listignored, listclean,
1633 1633 listunknown):
1634 1634 """build a status with respect to another context
1635 1635
1636 1636 This includes logic for maintaining the fast path of status when
1637 1637 comparing the working directory against its parent, which is to skip
1638 1638 building a new manifest if self (working directory) is not comparing
1639 1639 against its parent (repo['.']).
1640 1640 """
1641 1641 s = self._dirstatestatus(match, listignored, listclean, listunknown)
1642 1642 # Filter out symlinks that, in the case of FAT32 and NTFS filesystems,
1643 1643 # might have accidentally ended up with the entire contents of the file
1644 1644 # they are supposed to be linking to.
1645 1645 s.modified[:] = self._filtersuspectsymlink(s.modified)
1646 1646 if other != self._repo['.']:
1647 1647 s = super(workingctx, self)._buildstatus(other, s, match,
1648 1648 listignored, listclean,
1649 1649 listunknown)
1650 1650 return s
1651 1651
1652 1652 def _matchstatus(self, other, match):
1653 1653 """override the match method with a filter for directory patterns
1654 1654
1655 1655 We use inheritance to customize the match.bad method only in cases of
1656 1656 workingctx since it belongs only to the working directory when
1657 1657 comparing against the parent changeset.
1658 1658
1659 1659 If we aren't comparing against the working directory's parent, then we
1660 1660 just use the default match object sent to us.
1661 1661 """
1662 1662 if other != self._repo['.']:
1663 1663 def bad(f, msg):
1664 1664 # 'f' may be a directory pattern from 'match.files()',
1665 1665 # so 'f not in ctx1' is not enough
1666 1666 if f not in other and not other.hasdir(f):
1667 1667 self._repo.ui.warn('%s: %s\n' %
1668 1668 (self._repo.dirstate.pathto(f), msg))
1669 1669 match.bad = bad
1670 1670 return match
1671 1671
1672 1672 def markcommitted(self, node):
1673 1673 super(workingctx, self).markcommitted(node)
1674 1674
1675 1675 sparse.aftercommit(self._repo, node)
1676 1676
1677 1677 class committablefilectx(basefilectx):
1678 1678 """A committablefilectx provides common functionality for a file context
1679 1679 that wants the ability to commit, e.g. workingfilectx or memfilectx."""
1680 1680 def __init__(self, repo, path, filelog=None, ctx=None):
1681 1681 self._repo = repo
1682 1682 self._path = path
1683 1683 self._changeid = None
1684 1684 self._filerev = self._filenode = None
1685 1685
1686 1686 if filelog is not None:
1687 1687 self._filelog = filelog
1688 1688 if ctx:
1689 1689 self._changectx = ctx
1690 1690
1691 1691 def __nonzero__(self):
1692 1692 return True
1693 1693
1694 1694 __bool__ = __nonzero__
1695 1695
1696 1696 def linkrev(self):
1697 1697 # linked to self._changectx no matter if file is modified or not
1698 1698 return self.rev()
1699 1699
1700 1700 def parents(self):
1701 1701 '''return parent filectxs, following copies if necessary'''
1702 1702 def filenode(ctx, path):
1703 1703 return ctx._manifest.get(path, nullid)
1704 1704
1705 1705 path = self._path
1706 1706 fl = self._filelog
1707 1707 pcl = self._changectx._parents
1708 1708 renamed = self.renamed()
1709 1709
1710 1710 if renamed:
1711 1711 pl = [renamed + (None,)]
1712 1712 else:
1713 1713 pl = [(path, filenode(pcl[0], path), fl)]
1714 1714
1715 1715 for pc in pcl[1:]:
1716 1716 pl.append((path, filenode(pc, path), fl))
1717 1717
1718 1718 return [self._parentfilectx(p, fileid=n, filelog=l)
1719 1719 for p, n, l in pl if n != nullid]
1720 1720
1721 1721 def children(self):
1722 1722 return []
1723 1723
1724 1724 class workingfilectx(committablefilectx):
1725 1725 """A workingfilectx object makes access to data related to a particular
1726 1726 file in the working directory convenient."""
1727 1727 def __init__(self, repo, path, filelog=None, workingctx=None):
1728 1728 super(workingfilectx, self).__init__(repo, path, filelog, workingctx)
1729 1729
1730 1730 @propertycache
1731 1731 def _changectx(self):
1732 1732 return workingctx(self._repo)
1733 1733
1734 1734 def data(self):
1735 1735 return self._repo.wread(self._path)
1736 1736 def renamed(self):
1737 1737 rp = self._repo.dirstate.copied(self._path)
1738 1738 if not rp:
1739 1739 return None
1740 1740 return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
1741 1741
1742 1742 def size(self):
1743 1743 return self._repo.wvfs.lstat(self._path).st_size
1744 1744 def date(self):
1745 1745 t, tz = self._changectx.date()
1746 1746 try:
1747 1747 return (self._repo.wvfs.lstat(self._path)[stat.ST_MTIME], tz)
1748 1748 except OSError as err:
1749 1749 if err.errno != errno.ENOENT:
1750 1750 raise
1751 1751 return (t, tz)
1752 1752
1753 1753 def exists(self):
1754 1754 return self._repo.wvfs.exists(self._path)
1755 1755
1756 1756 def lexists(self):
1757 1757 return self._repo.wvfs.lexists(self._path)
1758 1758
1759 1759 def audit(self):
1760 1760 return self._repo.wvfs.audit(self._path)
1761 1761
1762 1762 def cmp(self, fctx):
1763 1763 """compare with other file context
1764 1764
1765 1765 returns True if different than fctx.
1766 1766 """
1767 1767 # fctx should be a filectx (not a workingfilectx)
1768 1768 # invert comparison to reuse the same code path
1769 1769 return fctx.cmp(self)
1770 1770
1771 1771 def remove(self, ignoremissing=False):
1772 1772 """wraps unlink for a repo's working directory"""
1773 1773 self._repo.wvfs.unlinkpath(self._path, ignoremissing=ignoremissing)
1774 1774
1775 1775 def write(self, data, flags, backgroundclose=False, **kwargs):
1776 1776 """wraps repo.wwrite"""
1777 1777 self._repo.wwrite(self._path, data, flags,
1778 1778 backgroundclose=backgroundclose,
1779 1779 **kwargs)
1780 1780
1781 1781 def markcopied(self, src):
1782 1782 """marks this file a copy of `src`"""
1783 1783 if self._repo.dirstate[self._path] in "nma":
1784 1784 self._repo.dirstate.copy(src, self._path)
1785 1785
1786 1786 def clearunknown(self):
1787 1787 """Removes conflicting items in the working directory so that
1788 1788 ``write()`` can be called successfully.
1789 1789 """
1790 1790 wvfs = self._repo.wvfs
1791 1791 f = self._path
1792 1792 wvfs.audit(f)
1793 1793 if wvfs.isdir(f) and not wvfs.islink(f):
1794 1794 wvfs.rmtree(f, forcibly=True)
1795 1795 if self._repo.ui.configbool('experimental', 'merge.checkpathconflicts'):
1796 1796 for p in reversed(list(util.finddirs(f))):
1797 1797 if wvfs.isfileorlink(p):
1798 1798 wvfs.unlink(p)
1799 1799 break
1800 1800
1801 1801 def setflags(self, l, x):
1802 1802 self._repo.wvfs.setflags(self._path, l, x)
1803 1803
1804 1804 class overlayworkingctx(committablectx):
1805 1805 """Wraps another mutable context with a write-back cache that can be
1806 1806 converted into a commit context.
1807 1807
1808 1808 self._cache[path] maps to a dict with keys: {
1809 1809 'exists': bool?
1810 1810 'date': date?
1811 1811 'data': str?
1812 1812 'flags': str?
1813 1813 'copied': str? (path or None)
1814 1814 }
1815 1815 If `exists` is True, `flags` must be non-None and 'date' is non-None. If it
1816 1816 is `False`, the file was deleted.
1817 1817 """
1818 1818
1819 1819 def __init__(self, repo):
1820 1820 super(overlayworkingctx, self).__init__(repo)
1821 1821 self.clean()
1822 1822
1823 1823 def setbase(self, wrappedctx):
1824 1824 self._wrappedctx = wrappedctx
1825 1825 self._parents = [wrappedctx]
1826 1826 # Drop old manifest cache as it is now out of date.
1827 1827 # This is necessary when, e.g., rebasing several nodes with one
1828 1828 # ``overlayworkingctx`` (e.g. with --collapse).
1829 1829 util.clearcachedproperty(self, '_manifest')
1830 1830
1831 1831 def data(self, path):
1832 1832 if self.isdirty(path):
1833 1833 if self._cache[path]['exists']:
1834 1834 if self._cache[path]['data']:
1835 1835 return self._cache[path]['data']
1836 1836 else:
1837 1837 # Must fallback here, too, because we only set flags.
1838 1838 return self._wrappedctx[path].data()
1839 1839 else:
1840 1840 raise error.ProgrammingError("No such file or directory: %s" %
1841 1841 path)
1842 1842 else:
1843 1843 return self._wrappedctx[path].data()
1844 1844
1845 1845 @propertycache
1846 1846 def _manifest(self):
1847 1847 parents = self.parents()
1848 1848 man = parents[0].manifest().copy()
1849 1849
1850 1850 flag = self._flagfunc
1851 1851 for path in self.added():
1852 1852 man[path] = addednodeid
1853 1853 man.setflag(path, flag(path))
1854 1854 for path in self.modified():
1855 1855 man[path] = modifiednodeid
1856 1856 man.setflag(path, flag(path))
1857 1857 for path in self.removed():
1858 1858 del man[path]
1859 1859 return man
1860 1860
1861 1861 @propertycache
1862 1862 def _flagfunc(self):
1863 1863 def f(path):
1864 1864 return self._cache[path]['flags']
1865 1865 return f
1866 1866
1867 1867 def files(self):
1868 1868 return sorted(self.added() + self.modified() + self.removed())
1869 1869
1870 1870 def modified(self):
1871 1871 return [f for f in self._cache.keys() if self._cache[f]['exists'] and
1872 1872 self._existsinparent(f)]
1873 1873
1874 1874 def added(self):
1875 1875 return [f for f in self._cache.keys() if self._cache[f]['exists'] and
1876 1876 not self._existsinparent(f)]
1877 1877
1878 1878 def removed(self):
1879 1879 return [f for f in self._cache.keys() if
1880 1880 not self._cache[f]['exists'] and self._existsinparent(f)]
1881 1881
1882 1882 def isinmemory(self):
1883 1883 return True
1884 1884
1885 1885 def filedate(self, path):
1886 1886 if self.isdirty(path):
1887 1887 return self._cache[path]['date']
1888 1888 else:
1889 1889 return self._wrappedctx[path].date()
1890 1890
1891 1891 def markcopied(self, path, origin):
1892 1892 if self.isdirty(path):
1893 1893 self._cache[path]['copied'] = origin
1894 1894 else:
1895 1895 raise error.ProgrammingError('markcopied() called on clean context')
1896 1896
1897 1897 def copydata(self, path):
1898 1898 if self.isdirty(path):
1899 1899 return self._cache[path]['copied']
1900 1900 else:
1901 1901 raise error.ProgrammingError('copydata() called on clean context')
1902 1902
1903 1903 def flags(self, path):
1904 1904 if self.isdirty(path):
1905 1905 if self._cache[path]['exists']:
1906 1906 return self._cache[path]['flags']
1907 1907 else:
1908 1908 raise error.ProgrammingError("No such file or directory: %s" %
1909 1909 self._path)
1910 1910 else:
1911 1911 return self._wrappedctx[path].flags()
1912 1912
1913 1913 def _existsinparent(self, path):
1914 1914 try:
1915 1915 # ``commitctx` raises a ``ManifestLookupError`` if a path does not
1916 1916 # exist, unlike ``workingctx``, which returns a ``workingfilectx``
1917 1917 # with an ``exists()`` function.
1918 1918 self._wrappedctx[path]
1919 1919 return True
1920 1920 except error.ManifestLookupError:
1921 1921 return False
1922 1922
1923 1923 def _auditconflicts(self, path):
1924 1924 """Replicates conflict checks done by wvfs.write().
1925 1925
1926 1926 Since we never write to the filesystem and never call `applyupdates` in
1927 1927 IMM, we'll never check that a path is actually writable -- e.g., because
1928 1928 it adds `a/foo`, but `a` is actually a file in the other commit.
1929 1929 """
1930 1930 def fail(path, component):
1931 1931 # p1() is the base and we're receiving "writes" for p2()'s
1932 1932 # files.
1933 1933 if 'l' in self.p1()[component].flags():
1934 1934 raise error.Abort("error: %s conflicts with symlink %s "
1935 1935 "in %s." % (path, component,
1936 1936 self.p1().rev()))
1937 1937 else:
1938 1938 raise error.Abort("error: '%s' conflicts with file '%s' in "
1939 1939 "%s." % (path, component,
1940 1940 self.p1().rev()))
1941 1941
1942 1942 # Test that each new directory to be created to write this path from p2
1943 1943 # is not a file in p1.
1944 1944 components = path.split('/')
1945 1945 for i in xrange(len(components)):
1946 1946 component = "/".join(components[0:i])
1947 1947 if component in self.p1():
1948 1948 fail(path, component)
1949 1949
1950 1950 # Test the other direction -- that this path from p2 isn't a directory
1951 1951 # in p1 (test that p1 doesn't any paths matching `path/*`).
1952 1952 match = matchmod.match('/', '', [path + '/'], default=b'relpath')
1953 1953 matches = self.p1().manifest().matches(match)
1954 1954 if len(matches) > 0:
1955 1955 if len(matches) == 1 and matches.keys()[0] == path:
1956 1956 return
1957 1957 raise error.Abort("error: file '%s' cannot be written because "
1958 1958 " '%s/' is a folder in %s (containing %d "
1959 1959 "entries: %s)"
1960 1960 % (path, path, self.p1(), len(matches),
1961 1961 ', '.join(matches.keys())))
1962 1962
1963 1963 def write(self, path, data, flags='', **kwargs):
1964 1964 if data is None:
1965 1965 raise error.ProgrammingError("data must be non-None")
1966 1966 self._auditconflicts(path)
1967 1967 self._markdirty(path, exists=True, data=data, date=dateutil.makedate(),
1968 1968 flags=flags)
1969 1969
1970 1970 def setflags(self, path, l, x):
1971 1971 self._markdirty(path, exists=True, date=dateutil.makedate(),
1972 1972 flags=(l and 'l' or '') + (x and 'x' or ''))
1973 1973
1974 1974 def remove(self, path):
1975 1975 self._markdirty(path, exists=False)
1976 1976
1977 1977 def exists(self, path):
1978 1978 """exists behaves like `lexists`, but needs to follow symlinks and
1979 1979 return False if they are broken.
1980 1980 """
1981 1981 if self.isdirty(path):
1982 1982 # If this path exists and is a symlink, "follow" it by calling
1983 1983 # exists on the destination path.
1984 1984 if (self._cache[path]['exists'] and
1985 1985 'l' in self._cache[path]['flags']):
1986 1986 return self.exists(self._cache[path]['data'].strip())
1987 1987 else:
1988 1988 return self._cache[path]['exists']
1989 1989
1990 1990 return self._existsinparent(path)
1991 1991
1992 1992 def lexists(self, path):
1993 1993 """lexists returns True if the path exists"""
1994 1994 if self.isdirty(path):
1995 1995 return self._cache[path]['exists']
1996 1996
1997 1997 return self._existsinparent(path)
1998 1998
1999 1999 def size(self, path):
2000 2000 if self.isdirty(path):
2001 2001 if self._cache[path]['exists']:
2002 2002 return len(self._cache[path]['data'])
2003 2003 else:
2004 2004 raise error.ProgrammingError("No such file or directory: %s" %
2005 2005 self._path)
2006 2006 return self._wrappedctx[path].size()
2007 2007
2008 2008 def tomemctx(self, text, branch=None, extra=None, date=None, parents=None,
2009 2009 user=None, editor=None):
2010 2010 """Converts this ``overlayworkingctx`` into a ``memctx`` ready to be
2011 2011 committed.
2012 2012
2013 2013 ``text`` is the commit message.
2014 2014 ``parents`` (optional) are rev numbers.
2015 2015 """
2016 2016 # Default parents to the wrapped contexts' if not passed.
2017 2017 if parents is None:
2018 2018 parents = self._wrappedctx.parents()
2019 2019 if len(parents) == 1:
2020 2020 parents = (parents[0], None)
2021 2021
2022 2022 # ``parents`` is passed as rev numbers; convert to ``commitctxs``.
2023 2023 if parents[1] is None:
2024 2024 parents = (self._repo[parents[0]], None)
2025 2025 else:
2026 2026 parents = (self._repo[parents[0]], self._repo[parents[1]])
2027 2027
2028 2028 files = self._cache.keys()
2029 2029 def getfile(repo, memctx, path):
2030 2030 if self._cache[path]['exists']:
2031 2031 return memfilectx(repo, memctx, path,
2032 2032 self._cache[path]['data'],
2033 2033 'l' in self._cache[path]['flags'],
2034 2034 'x' in self._cache[path]['flags'],
2035 2035 self._cache[path]['copied'])
2036 2036 else:
2037 2037 # Returning None, but including the path in `files`, is
2038 2038 # necessary for memctx to register a deletion.
2039 2039 return None
2040 2040 return memctx(self._repo, parents, text, files, getfile, date=date,
2041 2041 extra=extra, user=user, branch=branch, editor=editor)
2042 2042
2043 2043 def isdirty(self, path):
2044 2044 return path in self._cache
2045 2045
2046 2046 def isempty(self):
2047 2047 # We need to discard any keys that are actually clean before the empty
2048 2048 # commit check.
2049 2049 self._compact()
2050 2050 return len(self._cache) == 0
2051 2051
2052 2052 def clean(self):
2053 2053 self._cache = {}
2054 2054
2055 2055 def _compact(self):
2056 2056 """Removes keys from the cache that are actually clean, by comparing
2057 2057 them with the underlying context.
2058 2058
2059 2059 This can occur during the merge process, e.g. by passing --tool :local
2060 2060 to resolve a conflict.
2061 2061 """
2062 2062 keys = []
2063 2063 for path in self._cache.keys():
2064 2064 cache = self._cache[path]
2065 2065 try:
2066 2066 underlying = self._wrappedctx[path]
2067 2067 if (underlying.data() == cache['data'] and
2068 2068 underlying.flags() == cache['flags']):
2069 2069 keys.append(path)
2070 2070 except error.ManifestLookupError:
2071 2071 # Path not in the underlying manifest (created).
2072 2072 continue
2073 2073
2074 2074 for path in keys:
2075 2075 del self._cache[path]
2076 2076 return keys
2077 2077
2078 2078 def _markdirty(self, path, exists, data=None, date=None, flags=''):
2079 2079 self._cache[path] = {
2080 2080 'exists': exists,
2081 2081 'data': data,
2082 2082 'date': date,
2083 2083 'flags': flags,
2084 2084 'copied': None,
2085 2085 }
2086 2086
2087 2087 def filectx(self, path, filelog=None):
2088 2088 return overlayworkingfilectx(self._repo, path, parent=self,
2089 2089 filelog=filelog)
2090 2090
2091 2091 class overlayworkingfilectx(committablefilectx):
2092 2092 """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory
2093 2093 cache, which can be flushed through later by calling ``flush()``."""
2094 2094
2095 2095 def __init__(self, repo, path, filelog=None, parent=None):
2096 2096 super(overlayworkingfilectx, self).__init__(repo, path, filelog,
2097 2097 parent)
2098 2098 self._repo = repo
2099 2099 self._parent = parent
2100 2100 self._path = path
2101 2101
2102 2102 def cmp(self, fctx):
2103 2103 return self.data() != fctx.data()
2104 2104
2105 2105 def changectx(self):
2106 2106 return self._parent
2107 2107
2108 2108 def data(self):
2109 2109 return self._parent.data(self._path)
2110 2110
2111 2111 def date(self):
2112 2112 return self._parent.filedate(self._path)
2113 2113
2114 2114 def exists(self):
2115 2115 return self.lexists()
2116 2116
2117 2117 def lexists(self):
2118 2118 return self._parent.exists(self._path)
2119 2119
2120 2120 def renamed(self):
2121 2121 path = self._parent.copydata(self._path)
2122 2122 if not path:
2123 2123 return None
2124 2124 return path, self._changectx._parents[0]._manifest.get(path, nullid)
2125 2125
2126 2126 def size(self):
2127 2127 return self._parent.size(self._path)
2128 2128
2129 2129 def markcopied(self, origin):
2130 2130 self._parent.markcopied(self._path, origin)
2131 2131
2132 2132 def audit(self):
2133 2133 pass
2134 2134
2135 2135 def flags(self):
2136 2136 return self._parent.flags(self._path)
2137 2137
2138 2138 def setflags(self, islink, isexec):
2139 2139 return self._parent.setflags(self._path, islink, isexec)
2140 2140
2141 2141 def write(self, data, flags, backgroundclose=False, **kwargs):
2142 2142 return self._parent.write(self._path, data, flags, **kwargs)
2143 2143
2144 2144 def remove(self, ignoremissing=False):
2145 2145 return self._parent.remove(self._path)
2146 2146
2147 2147 def clearunknown(self):
2148 2148 pass
2149 2149
2150 2150 class workingcommitctx(workingctx):
2151 2151 """A workingcommitctx object makes access to data related to
2152 2152 the revision being committed convenient.
2153 2153
2154 2154 This hides changes in the working directory, if they aren't
2155 2155 committed in this context.
2156 2156 """
2157 2157 def __init__(self, repo, changes,
2158 2158 text="", user=None, date=None, extra=None):
2159 2159 super(workingctx, self).__init__(repo, text, user, date, extra,
2160 2160 changes)
2161 2161
2162 2162 def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
2163 2163 """Return matched files only in ``self._status``
2164 2164
2165 2165 Uncommitted files appear "clean" via this context, even if
2166 2166 they aren't actually so in the working directory.
2167 2167 """
2168 2168 if clean:
2169 2169 clean = [f for f in self._manifest if f not in self._changedset]
2170 2170 else:
2171 2171 clean = []
2172 2172 return scmutil.status([f for f in self._status.modified if match(f)],
2173 2173 [f for f in self._status.added if match(f)],
2174 2174 [f for f in self._status.removed if match(f)],
2175 2175 [], [], [], clean)
2176 2176
2177 2177 @propertycache
2178 2178 def _changedset(self):
2179 2179 """Return the set of files changed in this context
2180 2180 """
2181 2181 changed = set(self._status.modified)
2182 2182 changed.update(self._status.added)
2183 2183 changed.update(self._status.removed)
2184 2184 return changed
2185 2185
2186 2186 def makecachingfilectxfn(func):
2187 2187 """Create a filectxfn that caches based on the path.
2188 2188
2189 2189 We can't use util.cachefunc because it uses all arguments as the cache
2190 2190 key and this creates a cycle since the arguments include the repo and
2191 2191 memctx.
2192 2192 """
2193 2193 cache = {}
2194 2194
2195 2195 def getfilectx(repo, memctx, path):
2196 2196 if path not in cache:
2197 2197 cache[path] = func(repo, memctx, path)
2198 2198 return cache[path]
2199 2199
2200 2200 return getfilectx
2201 2201
2202 2202 def memfilefromctx(ctx):
2203 2203 """Given a context return a memfilectx for ctx[path]
2204 2204
2205 2205 This is a convenience method for building a memctx based on another
2206 2206 context.
2207 2207 """
2208 2208 def getfilectx(repo, memctx, path):
2209 2209 fctx = ctx[path]
2210 2210 # this is weird but apparently we only keep track of one parent
2211 2211 # (why not only store that instead of a tuple?)
2212 2212 copied = fctx.renamed()
2213 2213 if copied:
2214 2214 copied = copied[0]
2215 2215 return memfilectx(repo, memctx, path, fctx.data(),
2216 2216 islink=fctx.islink(), isexec=fctx.isexec(),
2217 2217 copied=copied)
2218 2218
2219 2219 return getfilectx
2220 2220
2221 2221 def memfilefrompatch(patchstore):
2222 2222 """Given a patch (e.g. patchstore object) return a memfilectx
2223 2223
2224 2224 This is a convenience method for building a memctx based on a patchstore.
2225 2225 """
2226 2226 def getfilectx(repo, memctx, path):
2227 2227 data, mode, copied = patchstore.getfile(path)
2228 2228 if data is None:
2229 2229 return None
2230 2230 islink, isexec = mode
2231 2231 return memfilectx(repo, memctx, path, data, islink=islink,
2232 2232 isexec=isexec, copied=copied)
2233 2233
2234 2234 return getfilectx
2235 2235
2236 2236 class memctx(committablectx):
2237 2237 """Use memctx to perform in-memory commits via localrepo.commitctx().
2238 2238
2239 2239 Revision information is supplied at initialization time while
2240 2240 related files data and is made available through a callback
2241 2241 mechanism. 'repo' is the current localrepo, 'parents' is a
2242 2242 sequence of two parent revisions identifiers (pass None for every
2243 2243 missing parent), 'text' is the commit message and 'files' lists
2244 2244 names of files touched by the revision (normalized and relative to
2245 2245 repository root).
2246 2246
2247 2247 filectxfn(repo, memctx, path) is a callable receiving the
2248 2248 repository, the current memctx object and the normalized path of
2249 2249 requested file, relative to repository root. It is fired by the
2250 2250 commit function for every file in 'files', but calls order is
2251 2251 undefined. If the file is available in the revision being
2252 2252 committed (updated or added), filectxfn returns a memfilectx
2253 2253 object. If the file was removed, filectxfn return None for recent
2254 2254 Mercurial. Moved files are represented by marking the source file
2255 2255 removed and the new file added with copy information (see
2256 2256 memfilectx).
2257 2257
2258 2258 user receives the committer name and defaults to current
2259 2259 repository username, date is the commit date in any format
2260 2260 supported by dateutil.parsedate() and defaults to current date, extra
2261 2261 is a dictionary of metadata or is left empty.
2262 2262 """
2263 2263
2264 2264 # Mercurial <= 3.1 expects the filectxfn to raise IOError for missing files.
2265 2265 # Extensions that need to retain compatibility across Mercurial 3.1 can use
2266 2266 # this field to determine what to do in filectxfn.
2267 2267 _returnnoneformissingfiles = True
2268 2268
2269 2269 def __init__(self, repo, parents, text, files, filectxfn, user=None,
2270 2270 date=None, extra=None, branch=None, editor=False):
2271 2271 super(memctx, self).__init__(repo, text, user, date, extra)
2272 2272 self._rev = None
2273 2273 self._node = None
2274 2274 parents = [(p or nullid) for p in parents]
2275 2275 p1, p2 = parents
2276 2276 self._parents = [self._repo[p] for p in (p1, p2)]
2277 2277 files = sorted(set(files))
2278 2278 self._files = files
2279 2279 if branch is not None:
2280 2280 self._extra['branch'] = encoding.fromlocal(branch)
2281 2281 self.substate = {}
2282 2282
2283 2283 if isinstance(filectxfn, patch.filestore):
2284 2284 filectxfn = memfilefrompatch(filectxfn)
2285 2285 elif not callable(filectxfn):
2286 2286 # if store is not callable, wrap it in a function
2287 2287 filectxfn = memfilefromctx(filectxfn)
2288 2288
2289 2289 # memoizing increases performance for e.g. vcs convert scenarios.
2290 2290 self._filectxfn = makecachingfilectxfn(filectxfn)
2291 2291
2292 2292 if editor:
2293 2293 self._text = editor(self._repo, self, [])
2294 2294 self._repo.savecommitmessage(self._text)
2295 2295
2296 2296 def filectx(self, path, filelog=None):
2297 2297 """get a file context from the working directory
2298 2298
2299 2299 Returns None if file doesn't exist and should be removed."""
2300 2300 return self._filectxfn(self._repo, self, path)
2301 2301
2302 2302 def commit(self):
2303 2303 """commit context to the repo"""
2304 2304 return self._repo.commitctx(self)
2305 2305
2306 2306 @propertycache
2307 2307 def _manifest(self):
2308 2308 """generate a manifest based on the return values of filectxfn"""
2309 2309
2310 2310 # keep this simple for now; just worry about p1
2311 2311 pctx = self._parents[0]
2312 2312 man = pctx.manifest().copy()
2313 2313
2314 2314 for f in self._status.modified:
2315 2315 p1node = nullid
2316 2316 p2node = nullid
2317 2317 p = pctx[f].parents() # if file isn't in pctx, check p2?
2318 2318 if len(p) > 0:
2319 2319 p1node = p[0].filenode()
2320 2320 if len(p) > 1:
2321 2321 p2node = p[1].filenode()
2322 2322 man[f] = revlog.hash(self[f].data(), p1node, p2node)
2323 2323
2324 2324 for f in self._status.added:
2325 2325 man[f] = revlog.hash(self[f].data(), nullid, nullid)
2326 2326
2327 2327 for f in self._status.removed:
2328 2328 if f in man:
2329 2329 del man[f]
2330 2330
2331 2331 return man
2332 2332
2333 2333 @propertycache
2334 2334 def _status(self):
2335 2335 """Calculate exact status from ``files`` specified at construction
2336 2336 """
2337 2337 man1 = self.p1().manifest()
2338 2338 p2 = self._parents[1]
2339 2339 # "1 < len(self._parents)" can't be used for checking
2340 2340 # existence of the 2nd parent, because "memctx._parents" is
2341 2341 # explicitly initialized by the list, of which length is 2.
2342 2342 if p2.node() != nullid:
2343 2343 man2 = p2.manifest()
2344 2344 managing = lambda f: f in man1 or f in man2
2345 2345 else:
2346 2346 managing = lambda f: f in man1
2347 2347
2348 2348 modified, added, removed = [], [], []
2349 2349 for f in self._files:
2350 2350 if not managing(f):
2351 2351 added.append(f)
2352 2352 elif self[f]:
2353 2353 modified.append(f)
2354 2354 else:
2355 2355 removed.append(f)
2356 2356
2357 2357 return scmutil.status(modified, added, removed, [], [], [], [])
2358 2358
2359 2359 class memfilectx(committablefilectx):
2360 2360 """memfilectx represents an in-memory file to commit.
2361 2361
2362 2362 See memctx and committablefilectx for more details.
2363 2363 """
2364 2364 def __init__(self, repo, changectx, path, data, islink=False,
2365 2365 isexec=False, copied=None):
2366 2366 """
2367 2367 path is the normalized file path relative to repository root.
2368 2368 data is the file content as a string.
2369 2369 islink is True if the file is a symbolic link.
2370 2370 isexec is True if the file is executable.
2371 2371 copied is the source file path if current file was copied in the
2372 2372 revision being committed, or None."""
2373 2373 super(memfilectx, self).__init__(repo, path, None, changectx)
2374 2374 self._data = data
2375 2375 self._flags = (islink and 'l' or '') + (isexec and 'x' or '')
2376 2376 self._copied = None
2377 2377 if copied:
2378 2378 self._copied = (copied, nullid)
2379 2379
2380 2380 def data(self):
2381 2381 return self._data
2382 2382
2383 2383 def remove(self, ignoremissing=False):
2384 2384 """wraps unlink for a repo's working directory"""
2385 2385 # need to figure out what to do here
2386 2386 del self._changectx[self._path]
2387 2387
2388 2388 def write(self, data, flags, **kwargs):
2389 2389 """wraps repo.wwrite"""
2390 2390 self._data = data
2391 2391
2392 2392 class overlayfilectx(committablefilectx):
2393 2393 """Like memfilectx but take an original filectx and optional parameters to
2394 2394 override parts of it. This is useful when fctx.data() is expensive (i.e.
2395 2395 flag processor is expensive) and raw data, flags, and filenode could be
2396 2396 reused (ex. rebase or mode-only amend a REVIDX_EXTSTORED file).
2397 2397 """
2398 2398
2399 2399 def __init__(self, originalfctx, datafunc=None, path=None, flags=None,
2400 2400 copied=None, ctx=None):
2401 2401 """originalfctx: filecontext to duplicate
2402 2402
2403 2403 datafunc: None or a function to override data (file content). It is a
2404 2404 function to be lazy. path, flags, copied, ctx: None or overridden value
2405 2405
2406 2406 copied could be (path, rev), or False. copied could also be just path,
2407 2407 and will be converted to (path, nullid). This simplifies some callers.
2408 2408 """
2409 2409
2410 2410 if path is None:
2411 2411 path = originalfctx.path()
2412 2412 if ctx is None:
2413 2413 ctx = originalfctx.changectx()
2414 2414 ctxmatch = lambda: True
2415 2415 else:
2416 2416 ctxmatch = lambda: ctx == originalfctx.changectx()
2417 2417
2418 2418 repo = originalfctx.repo()
2419 2419 flog = originalfctx.filelog()
2420 2420 super(overlayfilectx, self).__init__(repo, path, flog, ctx)
2421 2421
2422 2422 if copied is None:
2423 2423 copied = originalfctx.renamed()
2424 2424 copiedmatch = lambda: True
2425 2425 else:
2426 2426 if copied and not isinstance(copied, tuple):
2427 2427 # repo._filecommit will recalculate copyrev so nullid is okay
2428 2428 copied = (copied, nullid)
2429 2429 copiedmatch = lambda: copied == originalfctx.renamed()
2430 2430
2431 2431 # When data, copied (could affect data), ctx (could affect filelog
2432 2432 # parents) are not overridden, rawdata, rawflags, and filenode may be
2433 2433 # reused (repo._filecommit should double check filelog parents).
2434 2434 #
2435 2435 # path, flags are not hashed in filelog (but in manifestlog) so they do
2436 2436 # not affect reusable here.
2437 2437 #
2438 2438 # If ctx or copied is overridden to a same value with originalfctx,
2439 2439 # still consider it's reusable. originalfctx.renamed() may be a bit
2440 2440 # expensive so it's not called unless necessary. Assuming datafunc is
2441 2441 # always expensive, do not call it for this "reusable" test.
2442 2442 reusable = datafunc is None and ctxmatch() and copiedmatch()
2443 2443
2444 2444 if datafunc is None:
2445 2445 datafunc = originalfctx.data
2446 2446 if flags is None:
2447 2447 flags = originalfctx.flags()
2448 2448
2449 2449 self._datafunc = datafunc
2450 2450 self._flags = flags
2451 2451 self._copied = copied
2452 2452
2453 2453 if reusable:
2454 2454 # copy extra fields from originalfctx
2455 2455 attrs = ['rawdata', 'rawflags', '_filenode', '_filerev']
2456 2456 for attr_ in attrs:
2457 2457 if util.safehasattr(originalfctx, attr_):
2458 2458 setattr(self, attr_, getattr(originalfctx, attr_))
2459 2459
2460 2460 def data(self):
2461 2461 return self._datafunc()
2462 2462
2463 2463 class metadataonlyctx(committablectx):
2464 2464 """Like memctx but it's reusing the manifest of different commit.
2465 2465 Intended to be used by lightweight operations that are creating
2466 2466 metadata-only changes.
2467 2467
2468 2468 Revision information is supplied at initialization time. 'repo' is the
2469 2469 current localrepo, 'ctx' is original revision which manifest we're reuisng
2470 2470 'parents' is a sequence of two parent revisions identifiers (pass None for
2471 2471 every missing parent), 'text' is the commit.
2472 2472
2473 2473 user receives the committer name and defaults to current repository
2474 2474 username, date is the commit date in any format supported by
2475 2475 dateutil.parsedate() and defaults to current date, extra is a dictionary of
2476 2476 metadata or is left empty.
2477 2477 """
2478 2478 def __init__(self, repo, originalctx, parents=None, text=None, user=None,
2479 2479 date=None, extra=None, editor=False):
2480 2480 if text is None:
2481 2481 text = originalctx.description()
2482 2482 super(metadataonlyctx, self).__init__(repo, text, user, date, extra)
2483 2483 self._rev = None
2484 2484 self._node = None
2485 2485 self._originalctx = originalctx
2486 2486 self._manifestnode = originalctx.manifestnode()
2487 2487 if parents is None:
2488 2488 parents = originalctx.parents()
2489 2489 else:
2490 2490 parents = [repo[p] for p in parents if p is not None]
2491 2491 parents = parents[:]
2492 2492 while len(parents) < 2:
2493 2493 parents.append(repo[nullid])
2494 2494 p1, p2 = self._parents = parents
2495 2495
2496 2496 # sanity check to ensure that the reused manifest parents are
2497 2497 # manifests of our commit parents
2498 2498 mp1, mp2 = self.manifestctx().parents
2499 2499 if p1 != nullid and p1.manifestnode() != mp1:
2500 2500 raise RuntimeError('can\'t reuse the manifest: '
2501 2501 'its p1 doesn\'t match the new ctx p1')
2502 2502 if p2 != nullid and p2.manifestnode() != mp2:
2503 2503 raise RuntimeError('can\'t reuse the manifest: '
2504 2504 'its p2 doesn\'t match the new ctx p2')
2505 2505
2506 2506 self._files = originalctx.files()
2507 2507 self.substate = {}
2508 2508
2509 2509 if editor:
2510 2510 self._text = editor(self._repo, self, [])
2511 2511 self._repo.savecommitmessage(self._text)
2512 2512
2513 2513 def manifestnode(self):
2514 2514 return self._manifestnode
2515 2515
2516 2516 @property
2517 2517 def _manifestctx(self):
2518 2518 return self._repo.manifestlog[self._manifestnode]
2519 2519
2520 2520 def filectx(self, path, filelog=None):
2521 2521 return self._originalctx.filectx(path, filelog=filelog)
2522 2522
2523 2523 def commit(self):
2524 2524 """commit context to the repo"""
2525 2525 return self._repo.commitctx(self)
2526 2526
2527 2527 @property
2528 2528 def _manifest(self):
2529 2529 return self._originalctx.manifest()
2530 2530
2531 2531 @propertycache
2532 2532 def _status(self):
2533 2533 """Calculate exact status from ``files`` specified in the ``origctx``
2534 2534 and parents manifests.
2535 2535 """
2536 2536 man1 = self.p1().manifest()
2537 2537 p2 = self._parents[1]
2538 2538 # "1 < len(self._parents)" can't be used for checking
2539 2539 # existence of the 2nd parent, because "metadataonlyctx._parents" is
2540 2540 # explicitly initialized by the list, of which length is 2.
2541 2541 if p2.node() != nullid:
2542 2542 man2 = p2.manifest()
2543 2543 managing = lambda f: f in man1 or f in man2
2544 2544 else:
2545 2545 managing = lambda f: f in man1
2546 2546
2547 2547 modified, added, removed = [], [], []
2548 2548 for f in self._files:
2549 2549 if not managing(f):
2550 2550 added.append(f)
2551 2551 elif f in self:
2552 2552 modified.append(f)
2553 2553 else:
2554 2554 removed.append(f)
2555 2555
2556 2556 return scmutil.status(modified, added, removed, [], [], [], [])
2557 2557
2558 2558 class arbitraryfilectx(object):
2559 2559 """Allows you to use filectx-like functions on a file in an arbitrary
2560 2560 location on disk, possibly not in the working directory.
2561 2561 """
2562 2562 def __init__(self, path, repo=None):
2563 2563 # Repo is optional because contrib/simplemerge uses this class.
2564 2564 self._repo = repo
2565 2565 self._path = path
2566 2566
2567 2567 def cmp(self, fctx):
2568 2568 # filecmp follows symlinks whereas `cmp` should not, so skip the fast
2569 2569 # path if either side is a symlink.
2570 2570 symlinks = ('l' in self.flags() or 'l' in fctx.flags())
2571 2571 if not symlinks and isinstance(fctx, workingfilectx) and self._repo:
2572 2572 # Add a fast-path for merge if both sides are disk-backed.
2573 2573 # Note that filecmp uses the opposite return values (True if same)
2574 2574 # from our cmp functions (True if different).
2575 2575 return not filecmp.cmp(self.path(), self._repo.wjoin(fctx.path()))
2576 2576 return self.data() != fctx.data()
2577 2577
2578 2578 def path(self):
2579 2579 return self._path
2580 2580
2581 2581 def flags(self):
2582 2582 return ''
2583 2583
2584 2584 def data(self):
2585 2585 return util.readfile(self._path)
2586 2586
2587 2587 def decodeddata(self):
2588 2588 with open(self._path, "rb") as f:
2589 2589 return f.read()
2590 2590
2591 2591 def remove(self):
2592 2592 util.unlink(self._path)
2593 2593
2594 2594 def write(self, data, flags, **kwargs):
2595 2595 assert not flags
2596 2596 with open(self._path, "w") as f:
2597 2597 f.write(data)
General Comments 0
You need to be logged in to leave comments. Login now