changeset 31624:91ddb33deea5

rebase: move state serialization to use unfiltered repo Now that rebasestate is serialized as part of the transaction, the repo state it sees is the version at the end of the transaction, which may have hidden nodes. Therefore, it's possible parts of the rebase commit set are no longer visible by the time the transaction is closing, which causes a filtered revision error in this code. I don't think state serialization should be blocked from accessing commits it knows exist, especially if all it's trying to do is get the hex of them, so let's use an unfiltered repo here. Unfortunately, the only known repro is with the fbamend Facebook extension, so I'm not sure how to repro it in core Mercurial for a test.
author Durham Goode <durham@fb.com>
date Sun, 12 Mar 2017 12:33:35 -0700
parents 8228bc8fed8c
children 5b1461de2fbe
files hgext/rebase.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Fri Mar 24 22:29:22 2017 +0900
+++ b/hgext/rebase.py	Sun Mar 12 12:33:35 2017 -0700
@@ -169,7 +169,7 @@
                 self._writestatus(f)
 
     def _writestatus(self, f):
-        repo = self.repo
+        repo = self.repo.unfiltered()
         f.write(repo[self.originalwd].hex() + '\n')
         f.write(repo[self.target].hex() + '\n')
         f.write(repo[self.external].hex() + '\n')