| mharbison72 | |
| durin42 | |
| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/fix.py (13 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | D8288 fix: mark -r as advanced | |
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Abandoned | martinvonz |
| When determining what lines of each file to fix at each revision, the whole | When determining what lines of each file to fix at each revision, the whole | ||||
| set of revisions being fixed is considered, so that fixes to earlier | set of revisions being fixed is considered, so that fixes to earlier | ||||
| revisions are not forgotten in later ones. The --base flag can be used to | revisions are not forgotten in later ones. The --base flag can be used to | ||||
| override this default behavior, though it is not usually desirable to do so. | override this default behavior, though it is not usually desirable to do so. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| cmdutil.check_at_most_one_arg(opts, b'all', b'rev') | cmdutil.check_at_most_one_arg(opts, b'all', b'rev') | ||||
| cmdutil.check_incompatible_arguments(opts, b'working_dir', [b'all']) | cmdutil.check_incompatible_arguments(opts, b'working_dir', [b'all']) | ||||
| if opts[b'all']: | |||||
| opts[b'rev'] = [b'not public() and not obsolete()'] | |||||
| opts[b'working_dir'] = True | |||||
| with repo.wlock(), repo.lock(), repo.transaction(b'fix'): | with repo.wlock(), repo.lock(), repo.transaction(b'fix'): | ||||
| revstofix = getrevstofix(ui, repo, opts) | revstofix = getrevstofix(ui, repo, opts) | ||||
| basectxs = getbasectxs(repo, opts, revstofix) | basectxs = getbasectxs(repo, opts, revstofix) | ||||
| workqueue, numitems = getworkqueue( | workqueue, numitems = getworkqueue( | ||||
| ui, repo, pats, opts, revstofix, basectxs | ui, repo, pats, opts, revstofix, basectxs | ||||
| ) | ) | ||||
| fixers = getfixers(ui) | fixers = getfixers(ui) | ||||
| continue | continue | ||||
| workqueue.append((rev, path)) | workqueue.append((rev, path)) | ||||
| numitems[rev] += 1 | numitems[rev] += 1 | ||||
| return workqueue, numitems | return workqueue, numitems | ||||
| def getrevstofix(ui, repo, opts): | def getrevstofix(ui, repo, opts): | ||||
| """Returns the set of revision numbers that should be fixed""" | """Returns the set of revision numbers that should be fixed""" | ||||
| if opts[b'all']: | |||||
| revs = repo.revs(b'(not public() and not obsolete()) or wdir()') | |||||
| else: | |||||
| revs = set(scmutil.revrange(repo, opts[b'rev'])) | revs = set(scmutil.revrange(repo, opts[b'rev'])) | ||||
| if opts.get(b'working_dir'): | if opts.get(b'working_dir'): | ||||
| revs.add(wdirrev) | revs.add(wdirrev) | ||||
| for rev in revs: | for rev in revs: | ||||
| checkfixablectx(ui, repo, repo[rev]) | checkfixablectx(ui, repo, repo[rev]) | ||||
| # Allow fixing only wdir() even if there's an unfinished operation | # Allow fixing only wdir() even if there's an unfinished operation | ||||
| if not (len(revs) == 1 and wdirrev in revs): | if not (len(revs) == 1 and wdirrev in revs): | ||||
| cmdutil.checkunfinished(repo) | cmdutil.checkunfinished(repo) | ||||
| rewriteutil.precheck(repo, revs, b'fix') | rewriteutil.precheck(repo, revs, b'fix') | ||||
| if wdirrev in revs and list(merge.mergestate.read(repo).unresolved()): | if wdirrev in revs and list(merge.mergestate.read(repo).unresolved()): | ||||
| raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") | raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") | ||||