Branch isn't unlocked on error

[Levi Bard]

If an error occurs during a rebase operation, the branch isn't unlocked, and it's necessary to break-lock in order to proceed.

Steps to reproduce:
 * Unplug network cable.
 * Attempt to rebase from remote branch.
 * Wait for timeout exception.
 * Replug network cable.
 * Attempt to rebase from remote branch.

Expected result: Rebase will work (or fail normally)
Actual result: Branch is locked, break-lock is necessary.

This happened while rebasing from a svn repo to an unbound branch on win32, bzr 2.0.0, bzr-rebase 0.5.3.

[Jelmer Vernooij (jelmer)]

I can't reproduce this, please provide a backtrace of the original timeout exception (you should be able to find it in ~/.bzr.log) so we can find the place where the unlock is missing.

[Levi Bard (taktaktaktaktaktaktaktaktaktak)]

Relevant portion from .bzr.log follows:

Mon 2010-01-04 11:16:23 -0500
0.110 bzr arguments: [u'rebase']
0.125 looking for plugins in C:/Documents and Settings/lbar4/Application Data/bazaar/2.0/plugins
0.188 looking for plugins in C:/Program Files/Bazaar/plugins
0.438 encoding stdout as sys.stdout encoding 'cp437'
0.625 opening working tree 'C:/Data/MyProject'
[ 3644] 2010-01-04 11:16:24.115 INFO: Rebasing on svn://myhost/Development/Projects/MyProject
1.359 Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 842, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1037, in run_bzr
  File "bzrlib\commands.pyo", line 654, in run_argv_aliases
  File "bzrlib\commands.pyo", line 1052, in ignore_pipe
  File "C:/Program Files/Bazaar/plugins\rebase\commands.py", line 114, in run
  File "bzrlib\branch.pyo", line 190, in open_containing
  File "bzrlib\bzrdir.pyo", line 898, in open_containing
  File "bzrlib\transport\__init__.pyo", line 1587, in get_transport
  File "bzrlib\transport\__init__.pyo", line 1610, in _try_transport_factories
  File "C:/Program Files/Bazaar/plugins\svn\errors.py", line 139, in convert
SubversionException: ("Can't connect to host 'myhost': An established connection was aborted by the software in your host machine. ", 730053)

1.406 couldn't find apport bug-reporting library: No module named apport
1.469 Traceback (most recent call last):
  File "bzrlib\plugin.pyo", line 407, in _get__version__
  File "bzrlib\__init__.pyo", line 112, in _format_version_tuple
ValueError: version_info (0, 95, 0, 'final', 1) not valid

1.469 return code 4

Mon 2010-01-04 11:16:50 -0500
2.172 bzr arguments: [u'rebase']
2.188 looking for plugins in C:/Documents and Settings/lbar4/Application Data/bazaar/2.0/plugins
2.250 looking for plugins in C:/Program Files/Bazaar/plugins
2.375 encoding stdout as sys.stdout encoding 'cp437'
2.453 opening working tree 'C:/Data/MyProject'
[ 6004] 2010-01-04 11:16:52.676 INFO: Unable to obtain lock file:///C:/Data/MyProject/.bzr/branch/lock
held by <email address hidden> on host workstation [process #3644]
locked 28 seconds ago
Will continue to try until 11:21:52, unless you press Ctrl-C
If you're sure that it's not being modified, use bzr break-lock file:///C:/Data/MyProject/.bzr/branch/lock
6.422 return code 0