Mercurial > hg
comparison hgext/rebase.py @ 38666:a06b2b032557
revlog: introduce a isancestorrev() and use it in rebase
Differential Revision: https://phab.mercurial-scm.org/D3931
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 11 Jul 2018 16:29:23 -0700 |
parents | 731debab233f |
children | 572dff5c946e |
comparison
equal
deleted
inserted
replaced
38665:6afa928033bd | 38666:a06b2b032557 |
---|---|
1289 block below. | 1289 block below. |
1290 """ | 1290 """ |
1291 # use unfiltered changelog since successorrevs may return filtered nodes | 1291 # use unfiltered changelog since successorrevs may return filtered nodes |
1292 assert repo.filtername is None | 1292 assert repo.filtername is None |
1293 cl = repo.changelog | 1293 cl = repo.changelog |
1294 def isancestor(a, b): | 1294 isancestor = cl.isancestorrev |
1295 # take revision numbers instead of nodes | |
1296 if a == b: | |
1297 return True | |
1298 elif a > b: | |
1299 return False | |
1300 return cl.isancestor(cl.node(a), cl.node(b)) | |
1301 | 1295 |
1302 dest = destmap[rev] | 1296 dest = destmap[rev] |
1303 oldps = repo.changelog.parentrevs(rev) # old parents | 1297 oldps = repo.changelog.parentrevs(rev) # old parents |
1304 newps = [nullrev, nullrev] # new parents | 1298 newps = [nullrev, nullrev] # new parents |
1305 dests = adjustdest(repo, rev, destmap, state, skipped) | 1299 dests = adjustdest(repo, rev, destmap, state, skipped) |