# HG changeset patch # User Anton Shestakov # Date 1580047040 -25200 # Node ID 5a2e7c6f9174226338be08a0a9ed5e257b70c652 # Parent 814083e5f7e862a97dd0cc0810dbb23ef8ea0295 touch: use repo.setparents() instead of repo.dirstate.setparents() setparents() was added to localrepository class in 2012, and now we finally have some differences between calling repo.setparents() vs repo.dirstate.setparents(): _quick_access_* things, introduced in hg 5.3. This patch fixes potential quick-access desync problems where repo[b'.'] would be different from repo.dirstate.p1(). diff -r 814083e5f7e8 -r 5a2e7c6f9174 hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py Sun Jan 26 20:57:39 2020 +0700 +++ b/hgext3rd/evolve/cmdrewrite.py Sun Jan 26 20:57:20 2020 +0700 @@ -1451,7 +1451,7 @@ phases.retractboundary(repo, tr, ctx.phase(), [new]) if ctx in repo[None].parents(): with repo.dirstate.parentchange(): - repo.dirstate.setparents(new, node.nullid) + repo.setparents(new, node.nullid) @eh.command( b'pick|grab',