##// END OF EJS Templates
histedit: directly use repo.vfs.join...
Pierre-Yves David -
r31329:6ce67d39 default
parent child Browse files
Show More
@@ -1171,7 +1171,7 b' def _aborthistedit(ui, repo, state):'
1171
1171
1172 # Recover our old commits if necessary
1172 # Recover our old commits if necessary
1173 if not state.topmost in repo and state.backupfile:
1173 if not state.topmost in repo and state.backupfile:
1174 backupfile = repo.join(state.backupfile)
1174 backupfile = repo.vfs.join(state.backupfile)
1175 f = hg.openpath(ui, backupfile)
1175 f = hg.openpath(ui, backupfile)
1176 gen = exchange.readbundle(ui, f, backupfile)
1176 gen = exchange.readbundle(ui, f, backupfile)
1177 with repo.transaction('histedit.abort') as tr:
1177 with repo.transaction('histedit.abort') as tr:
@@ -1357,7 +1357,7 b' def ruleeditor(repo, ui, actions, editco'
1357 # Save edit rules in .hg/histedit-last-edit.txt in case
1357 # Save edit rules in .hg/histedit-last-edit.txt in case
1358 # the user needs to ask for help after something
1358 # the user needs to ask for help after something
1359 # surprising happens.
1359 # surprising happens.
1360 f = open(repo.join('histedit-last-edit.txt'), 'w')
1360 f = open(repo.vfs.join('histedit-last-edit.txt'), 'w')
1361 f.write(rules)
1361 f.write(rules)
1362 f.close()
1362 f.close()
1363
1363
@@ -1598,7 +1598,7 b' def stripwrapper(orig, ui, repo, nodelis'
1598 extensions.wrapfunction(repair, 'strip', stripwrapper)
1598 extensions.wrapfunction(repair, 'strip', stripwrapper)
1599
1599
1600 def summaryhook(ui, repo):
1600 def summaryhook(ui, repo):
1601 if not os.path.exists(repo.join('histedit-state')):
1601 if not os.path.exists(repo.vfs.join('histedit-state')):
1602 return
1602 return
1603 state = histeditstate(repo)
1603 state = histeditstate(repo)
1604 state.read()
1604 state.read()
General Comments 0
You need to be logged in to leave comments. Login now