1216436 - Push-to-try should handle interrupt gracefully

Status: RESOLVED FIXED

(Developer Services :: Mercurial: mozext, defect)

Description

[Xidorn Quan [:xidorn] UTC+11]

It sometimes happen that after you press enter for "hg push-to-try" command, you change your mind and decide to stop it, e.g. for picking a different try string.

However, currently, the push-to-try extension cannot handle that gracefully, and it left a abandoned transition in that case, which makes mercurial require an "hg recover" before doing anything else, which is time-consuming.

I think this should be fixed, so that we are free to interrupt this operation at any time, and able to redo that immediately afterwards.

Comment 1

[Gregory Szorc [:gps]]

Attachment: MozReview Request: push-to-try: always release transaction object (bug 1216436); r?chmanchester

push-to-try: always release transaction object (bug 1216436); r?chmanchester

The proper pattern for transactions is:

tr = repo.transaction(...)
try:
   ...
   tr.close() # or tr.abort()
finally:
   tr.release()

We were forgetting the tr.release() in the finally block, meaning that
the transaction could have not been rolled back.

Surprisingly, I was unable to reproduce the reported bug. But I've added
an explicit test just so we have test coverage.

Comment 2

[Chris Manchester (limited bugmail, email directly)]

Comment on attachment 8676348 [details]
MozReview Request: push-to-try: always release transaction object (bug 1216436); r?chmanchester

https://reviewboard.mozilla.org/r/22673/#review20141

Thanks for the fix!

::: hgext/push-to-try/__init__.py:76
(Diff revision 1)
> +        tr.release()

We might want to guard ```if tr:```.

Comment 3

[Gregory Szorc [:gps]]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/b0bd5f598d08e0701edf63cf69a51e6605d24b52
push-to-try: always release transaction object (bug 1216436); r=chmanchester

Comment 4

[Xidorn Quan [:xidorn] UTC+11]

It still happens for me:
> $ hg push-to-try -m "try: -b do -p all -u mochitests -t none"
> The following will be pushed to ssh://hg.mozilla.org/try:
> M dom/devicestorage/nsDeviceStorage.h
> Creating temporary commit for remote...
> pushing to ssh://hg.mozilla.org/try
> searching for changes
(Ctrl-C here, it stops)

Then:
> $ hg commit --amend
> abort: abandoned transaction found!
> (run 'hg recover' to clean up transaction)

Comment 5

[Gregory Szorc [:gps]]

Windows?

Comment 6

[Xidorn Quan [:xidorn] UTC+11]

Yes, Windows.

Comment 7

[Gregory Szorc [:gps]]

The Windows issue this bug was reopened for is bug 1230790.