equal
deleted
inserted
replaced
431 checkfixablectx(ui, repo, repo[rev]) |
431 checkfixablectx(ui, repo, repo[rev]) |
432 # Allow fixing only wdir() even if there's an unfinished operation |
432 # Allow fixing only wdir() even if there's an unfinished operation |
433 if not (len(revs) == 1 and wdirrev in revs): |
433 if not (len(revs) == 1 and wdirrev in revs): |
434 cmdutil.checkunfinished(repo) |
434 cmdutil.checkunfinished(repo) |
435 rewriteutil.precheck(repo, revs, b'fix') |
435 rewriteutil.precheck(repo, revs, b'fix') |
436 if wdirrev in revs and list( |
436 if ( |
437 mergestatemod.mergestate.read(repo).unresolved() |
437 wdirrev in revs |
|
438 and mergestatemod.mergestate.read(repo).unresolvedcount() |
438 ): |
439 ): |
439 raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") |
440 raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") |
440 if not revs: |
441 if not revs: |
441 raise error.Abort( |
442 raise error.Abort( |
442 b'no changesets specified', hint=b'use --source or --working-dir' |
443 b'no changesets specified', hint=b'use --source or --working-dir' |