--- a/hgext/rebase.py Wed Jan 14 01:15:26 2015 +0100
+++ b/hgext/rebase.py Sat Mar 11 11:02:25 2017 -0800
@@ -1099,7 +1099,7 @@
def clearcollapsemsg(repo):
'Remove collapse message file'
- util.unlinkpath(repo.join("last-message.txt"), ignoremissing=True)
+ repo.vfs.unlinkpath("last-message.txt", ignoremissing=True)
def restorecollapsemsg(repo, isabort):
'Restore previously stored collapse message'
@@ -1120,7 +1120,7 @@
def clearstatus(repo):
'Remove the status files'
_clearrebasesetvisibiliy(repo)
- util.unlinkpath(repo.join("rebasestate"), ignoremissing=True)
+ repo.vfs.unlinkpath("rebasestate", ignoremissing=True)
def needupdate(repo, state):
'''check whether we should `update --clean` away from a merge, or if