equal
deleted
inserted
replaced
376 |
376 |
377 |
377 |
378 def _aborttransaction(repo, tr): |
378 def _aborttransaction(repo, tr): |
379 """Abort current transaction for shelve/unshelve, but keep dirstate""" |
379 """Abort current transaction for shelve/unshelve, but keep dirstate""" |
380 dirstatebackupname = b'dirstate.shelve' |
380 dirstatebackupname = b'dirstate.shelve' |
381 repo.dirstate.savebackup(tr, dirstatebackupname) |
381 repo.dirstate.savebackup(None, dirstatebackupname) |
382 tr.abort() |
382 tr.abort() |
383 repo.dirstate.restorebackup(None, dirstatebackupname) |
383 repo.dirstate.restorebackup(None, dirstatebackupname) |
384 |
384 |
385 |
385 |
386 def getshelvename(repo, parent, opts): |
386 def getshelvename(repo, parent, opts): |