This is only for locking namejournal.lock and not for working directory lock and store lock. We need to improve message there too.
remove which file manually to continue?
I think we should delete the If it still fails, ..... remove the file manually to continue part.
unrelated changes in the test file here and below.
I am not sure the new message is much helpful. As JordiGH and others pointed out on IRC, it will definitely be helpful if we can show which operation has the lock right now.
waiting for lock on working directory of b held by process '*' running <cmd-name> on host '*'
still here are unrealted changes.
The output is not correctly aligned.