Show More
@@ -300,6 +300,7 b' class localrepository(object):' | |||||
300 | if create: |
|
300 | if create: | |
301 | self._writerequirements() |
|
301 | self._writerequirements() | |
302 |
|
302 | |||
|
303 | self._dirstatevalidatewarned = False | |||
303 |
|
304 | |||
304 | self._branchcaches = {} |
|
305 | self._branchcaches = {} | |
305 | self._revbranchcache = None |
|
306 | self._revbranchcache = None | |
@@ -473,19 +474,19 b' class localrepository(object):' | |||||
473 |
|
474 | |||
474 | @repofilecache('dirstate') |
|
475 | @repofilecache('dirstate') | |
475 | def dirstate(self): |
|
476 | def dirstate(self): | |
476 | warned = [0] |
|
477 | return dirstate.dirstate(self.vfs, self.ui, self.root, | |
477 | def validate(node): |
|
478 | self._dirstatevalidate) | |
478 | try: |
|
|||
479 | self.changelog.rev(node) |
|
|||
480 | return node |
|
|||
481 | except error.LookupError: |
|
|||
482 | if not warned[0]: |
|
|||
483 | warned[0] = True |
|
|||
484 | self.ui.warn(_("warning: ignoring unknown" |
|
|||
485 | " working parent %s!\n") % short(node)) |
|
|||
486 | return nullid |
|
|||
487 |
|
479 | |||
488 | return dirstate.dirstate(self.vfs, self.ui, self.root, validate) |
|
480 | def _dirstatevalidate(self, node): | |
|
481 | try: | |||
|
482 | self.changelog.rev(node) | |||
|
483 | return node | |||
|
484 | except error.LookupError: | |||
|
485 | if not self._dirstatevalidatewarned: | |||
|
486 | self._dirstatevalidatewarned = True | |||
|
487 | self.ui.warn(_("warning: ignoring unknown" | |||
|
488 | " working parent %s!\n") % short(node)) | |||
|
489 | return nullid | |||
489 |
|
490 | |||
490 | def __getitem__(self, changeid): |
|
491 | def __getitem__(self, changeid): | |
491 | if changeid is None or changeid == wdirrev: |
|
492 | if changeid is None or changeid == wdirrev: |
General Comments 0
You need to be logged in to leave comments.
Login now