equal
deleted
inserted
replaced
479 state = repo.dirstate[f] |
479 state = repo.dirstate[f] |
480 if state not in b"nrm": |
480 if state not in b"nrm": |
481 ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state)) |
481 ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state)) |
482 errors += 1 |
482 errors += 1 |
483 if errors: |
483 if errors: |
484 error = _(b".hg/dirstate inconsistent with current parent's manifest") |
484 errstr = _(b".hg/dirstate inconsistent with current parent's manifest") |
485 raise error.Abort(error) |
485 raise error.Abort(errstr) |
486 |
486 |
487 |
487 |
488 @command( |
488 @command( |
489 b'debugcolor', |
489 b'debugcolor', |
490 [(b'', b'style', None, _(b'show all configured styles'))], |
490 [(b'', b'style', None, _(b'show all configured styles'))], |