1962245 - Jujutsu: Internal error: Failed to access working copy state

Status: RESOLVED FIXED

(Firefox Build System :: Mach Core, defect, P3)

Description

[Alex Hochheiden [:ahochheiden]]

I regularly CTRL+C to cancel a running ./mach process. When using jj and doing that, the following regularly happens:

KeyboardInterrupt
mach interrupted by signal or user action. Stopping.

ahochheiden@Alex-Mozilla-P620 /d/mozilla-source/mozilla-unified
$ ^C

ahochheiden@Alex-Mozilla-P620 /d/mozilla-source/mozilla-unified
$ jj log
Internal error: Failed to access working copy state
Caused by:
1: Failed to lock working copy
2: Timed out while trying to create lock file: D:\mozilla-source\mozilla-unified\.jj\working_copy\working_copy.lock
3: The file exists. (os error 80)

And I have to manually delete the working_copy.lock before I can use jj again.

My naive solution would be to add something like the following to the JujutsuRepository class:

    def _run(self, *args, **kwargs):
        try:
            return super()._run(*args, **kwargs)
        except KeyboardInterrupt as error:
            working_copy_lock = self.jj_ws_root / ".jj" / "working_copy" / "working_copy.lock"
            working_copy_lock.unlink()
            print(f"\nRemoved: {working_copy_lock}")
            raise error
        except Exception as error:
            raise error

But I'm not sure if that's wise.

:beth mentioned that adding --ignore-working-copy to the jj commands that don't modify the repo state would prevent the lock, but I'm not sure I fully understand the implications, since the description for that flag doesn't quite line up with what I think we need.

:sfink what do you think?

Comment 1

[Alex Hochheiden [:ahochheiden]]

Attachment: Bug 1962245: Add a `_run_read_only` function to `JujutsuRepository` r?sfink

Comment 2

[Steve Fink [:sfink] [:s:]]

(answered in the form of an r+)

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/c85afcf62f3b
Add a `_run_read_only` function to `JujutsuRepository` r=sfink

Comment 4

[Cristian Tuns]

https://hg.mozilla.org/mozilla-central/rev/c85afcf62f3b