This instance will be upgraded to Heptapod 0.21.0rc2 on 2021-04-16 at 11:00 UTC+2 (a few minutes of down time)

Commit ca2aadeb authored by Matt Harbison's avatar Matt Harbison

graft: delegate `--abort` to core Mercurial

Now that there's a proper command option, use that instead of manual cleanup and
a clean update.
parent 2f3fde3d3c54
......@@ -215,10 +215,7 @@ class GraftDialog(QDialog):
def abort(self):
self.abortbtn.setDisabled(True)
if os.path.exists(self._graftstatefile):
# Remove the existing graftstate file!
os.remove(self._graftstatefile)
cmdline = hglib.buildcmdargs('update', clean=True, rev='p1()')
cmdline = hglib.buildcmdargs('graft', abort=True)
sess = self._runCommand(cmdline)
sess.commandFinished.connect(self._abortFinished)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment