Show More
@@ -412,7 +412,14 class changectx(basectx): | |||||
412 | except error.FilteredLookupError: |
|
412 | except error.FilteredLookupError: | |
413 | raise |
|
413 | raise | |
414 | except LookupError: |
|
414 | except LookupError: | |
415 | pass |
|
415 | # check if it might have come from damaged dirstate | |
|
416 | # | |||
|
417 | # XXX we could avoid the unfiltered if we had a recognizable | |||
|
418 | # exception for filtered changeset access | |||
|
419 | if (repo.local() | |||
|
420 | and changeid in repo.unfiltered().dirstate.parents()): | |||
|
421 | msg = _("working directory has unknown parent '%s'!") | |||
|
422 | raise error.Abort(msg % short(changeid)) | |||
416 |
|
423 | |||
417 | if len(changeid) == 40: |
|
424 | if len(changeid) == 40: | |
418 | try: |
|
425 | try: | |
@@ -425,14 +432,6 class changectx(basectx): | |||||
425 | pass |
|
432 | pass | |
426 |
|
433 | |||
427 | # lookup failed |
|
434 | # lookup failed | |
428 | # check if it might have come from damaged dirstate |
|
|||
429 | # |
|
|||
430 | # XXX we could avoid the unfiltered if we had a recognizable |
|
|||
431 | # exception for filtered changeset access |
|
|||
432 | if (repo.local() |
|
|||
433 | and changeid in repo.unfiltered().dirstate.parents()): |
|
|||
434 | msg = _("working directory has unknown parent '%s'!") |
|
|||
435 | raise error.Abort(msg % short(changeid)) |
|
|||
436 | try: |
|
435 | try: | |
437 | if len(changeid) == 20 and nonascii(changeid): |
|
436 | if len(changeid) == 20 and nonascii(changeid): | |
438 | changeid = hex(changeid) |
|
437 | changeid = hex(changeid) |
General Comments 0
You need to be logged in to leave comments.
Login now