This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8285

fix: refactor getrevstofix() to define revisions first, then validate them
ClosedPublic

Authored by martinvonz on Mar 13 2020, 3:33 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG368f85c5dfc0: fix: refactor getrevstofix() to define revisions first, then validate them
Summary

This refactoring makes it easier to add a new way of specifying
revisions (I'm about to add a --source, which adds the specified
revisions and their descendants).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 13 2020, 3:33 PM
mharbison72 accepted this revision.Mar 13 2020, 6:16 PM
martinvonz added a commit: rHG368f85c5dfc0: fix: refactor getrevstofix() to define revisions first, then validate them.Mar 16 2020, 11:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG368f85c5dfc0: fix: refactor getrevstofix() to define revisions first, then validate them (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (11 lines)

Diff 20804

hgext/fix.py

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"""
revs = set(scmutil.revrange(repo, opts[b'rev'])) revs = set(scmutil.revrange(repo, opts[b'rev']))
if opts.get(b'working_dir'):
revs.add(wdirrev)
for rev in revs: for rev in revs:
checkfixablectx(ui, repo, repo[rev]) checkfixablectx(ui, repo, repo[rev])
if revs: # Allow fixing only wdir() even if there's an unfinished operation
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 opts.get(b'working_dir'): if wdirrev in revs and list(merge.mergestate.read(repo).unresolved()):
revs.add(wdirrev)
if 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'")
if not revs: if not revs:
raise error.Abort( raise error.Abort(
b'no changesets specified', hint=b'use --rev or --working-dir' b'no changesets specified', hint=b'use --rev or --working-dir'
) )
return revs return revs
def checkfixablectx(ui, repo, ctx): def checkfixablectx(ui, repo, ctx):