This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7806

graft: use revset for intersecting with ancestor set
ClosedPublic

Authored by martinvonz on Jan 6 2020, 7:58 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4322de8f7016: graft: use revset for intersecting with ancestor set
Summary

This addresses a TODO added in a1381eea7c7d (graft: do not use
.remove on a smart set (regression), 2014-04-28).

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 6 2020, 7:58 PM
pulkit accepted this revision.Jan 8 2020, 6:28 AM
This revision is now accepted and ready to land.Jan 8 2020, 6:28 AM
martinvonz added a commit: rHG4322de8f7016: graft: use revset for intersecting with ancestor set.Jan 9 2020, 9:57 AM
Closed by commit rHG4322de8f7016: graft: use revset for intersecting with ancestor set (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (14 lines)

Diff 19058

mercurial/commands.py

# Don't check in the --continue case, in effect retaining --force across # Don't check in the --continue case, in effect retaining --force across
# --continues. That's because without --force, any revisions we decided to # --continues. That's because without --force, any revisions we decided to
# skip would have been filtered out here, so they wouldn't have made their # skip would have been filtered out here, so they wouldn't have made their
# way to the graftstate. With --force, any revisions we would have otherwise # way to the graftstate. With --force, any revisions we would have otherwise
# skipped would not have been filtered out, and if they hadn't been applied # skipped would not have been filtered out, and if they hadn't been applied
# already, they'd have been in the graftstate. # already, they'd have been in the graftstate.
if not (cont or opts.get(b'force')) and basectx is None: if not (cont or opts.get(b'force')) and basectx is None:
# check for ancestors of dest branch # check for ancestors of dest branch
crev = repo[b'.'].rev() ancestors = repo.revs(b'%ld & (::.)', revs)
ancestors = repo.changelog.ancestors([crev], inclusive=True) for rev in ancestors:
# XXX make this lazy in the future ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
for rev in revs:
if rev in ancestors:
ui.warn(
_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])
)
revs = [r for r in revs if r not in ancestors] revs = [r for r in revs if r not in ancestors]
if not revs: if not revs:
return -1 return -1
# analyze revs for earlier grafts # analyze revs for earlier grafts
ids = {} ids = {}
for ctx in repo.set(b"%ld", revs): for ctx in repo.set(b"%ld", revs):
ids[ctx.hex()] = ctx.rev() ids[ctx.hex()] = ctx.rev()
n = ctx.extra().get(b'source') n = ctx.extra().get(b'source')
if n: if n:
ids[n] = ctx.rev() ids[n] = ctx.rev()
# check ancestors for earlier grafts # check ancestors for earlier grafts
ui.debug(b'scanning for duplicate grafts\n') ui.debug(b'scanning for duplicate grafts\n')
# The only changesets we can be sure doesn't contain grafts of any # The only changesets we can be sure doesn't contain grafts of any
# revs, are the ones that are common ancestors of *all* revs: # revs, are the ones that are common ancestors of *all* revs:
for rev in repo.revs(b'only(%d,ancestor(%ld))', crev, revs): for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
ctx = repo[rev] ctx = repo[rev]
n = ctx.extra().get(b'source') n = ctx.extra().get(b'source')
if n in ids: if n in ids:
try: try:
r = repo[n].rev() r = repo[n].rev()
except error.RepoLookupError: except error.RepoLookupError:
r = None r = None
if r in revs: if r in revs: