search

gitbutlerapp / gitbutler

The GitButler version control client, backed by Git, powered by Tauri/Rust/Svelte
https://gitbutler.com
Other
11.48k stars 467 forks source link

Executing 'unapply' and 'app' will report an erro #4172

Open hanchao0606 opened 6 days ago

hanchao0606 commented 6 days ago

Version

0.5.555

Operating System

Windows

Distribution Method

dmg (Apple Silicon)

Describe the issue

Restart application

How to reproduce

No response

Expected behavior

No response

Relevant log output

'unapply' erro
2024-06-25T09:17:21.561924Z  INFO unapply_branch: crates\gitbutler-tauri\src\virtual_branches.rs:212: new project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba branch=4b11e8f2-d984-49d0-bef8-fa62b1b0483e
2024-06-25T09:17:21.563872Z  WARN unapply_branch: crates\gitbutler-core\src\project_repository\repository.rs:44: failed to get gitbutler.didSetPrune for repository at D:\project\agyj\AGYJ-Vue3; cannot disable gc: config value 'gitbutler.didSetPrune' was not found; class=Config (7); code=NotFound (-3) project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba branch=4b11e8f2-d984-49d0-bef8-fa62b1b0483e
2024-06-25T09:17:21.635359Z  INFO unapply_branch: crates\gitbutler-tauri\src\virtual_branches.rs:212: close time.busy=73.3ms time.idle=95.3�s project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba branch=4b11e8f2-d984-49d0-bef8-fa62b1b0483e
2024-06-25T09:17:21.635511Z  INFO handle: crates\gitbutler-watcher\src\handler.rs:54: new event=VirtualBranch(83cfc9b3-4a6c-47ad-8f83-88050b7264ba)
2024-06-25T09:17:21.635526Z  INFO handle:calculate_virtual_branches: crates\gitbutler-watcher\src\handler.rs:85: new event=VirtualBranch(83cfc9b3-4a6c-47ad-8f83-88050b7264ba)
2024-06-25T09:17:21.636954Z  WARN handle:calculate_virtual_branches: crates\gitbutler-core\src\project_repository\repository.rs:44: failed to get gitbutler.didSetPrune for repository at D:\project\agyj\AGYJ-Vue3; cannot disable gc: config value 'gitbutler.didSetPrune' was not found; class=Config (7); code=NotFound (-3) event=VirtualBranch(83cfc9b3-4a6c-47ad-8f83-88050b7264ba)
2024-06-25T09:17:21.640207Z  INFO handle:calculate_virtual_branches:workdir: crates\gitbutler-core\src\git\diff.rs:146: new event=VirtualBranch(83cfc9b3-4a6c-47ad-8f83-88050b7264ba) commit_oid=323c2b6e9de78ff426a23e9581f9c4a076edd028
2024-06-25T09:17:21.651118Z  INFO handle:calculate_virtual_branches:workdir: crates\gitbutler-core\src\git\diff.rs:146: close time.busy=10.9ms time.idle=44.8�s event=VirtualBranch(83cfc9b3-4a6c-47ad-8f83-88050b7264ba) commit_oid=323c2b6e9de78ff426a23e9581f9c4a076edd028
2024-06-25T09:17:21.651893Z  INFO handle:calculate_virtual_branches:create_snapshot: crates\gitbutler-core\src\ops\oplog.rs:224: new event=VirtualBranch(83cfc9b3-4a6c-47ad-8f83-88050b7264ba) self=Project { id: 83cfc9b3-4a6c-47ad-8f83-88050b7264ba, title: "AGYJ-Vue3", description: None, path: "D:\\project\\agyj\\AGYJ-Vue3", preferred_key: SystemExecutable, ok_with_force_push: true, api: None, gitbutler_data_last_fetch: None, gitbutler_code_push_state: None, project_data_last_fetch: Some(Fetched { timestamp: SystemTime { intervals: 133637804176294997 } }), omit_certificate_check: None, snapshot_lines_threshold: None, use_new_locking: false }
2024-06-25T09:17:21.680011Z  INFO handle:calculate_virtual_branches:create_snapshot: crates\gitbutler-core\src\ops\oplog.rs:224: close time.busy=28.1ms time.idle=45.4�s event=VirtualBranch(83cfc9b3-4a6c-47ad-8f83-88050b7264ba) self=Project { id: 83cfc9b3-4a6c-47ad-8f83-88050b7264ba, title: "AGYJ-Vue3", description: None, path: "D:\\project\\agyj\\AGYJ-Vue3", preferred_key: SystemExecutable, ok_with_force_push: true, api: None, gitbutler_data_last_fetch: None, gitbutler_code_push_state: None, project_data_last_fetch: Some(Fetched { timestamp: SystemTime { intervals: 133637804176294997 } }), omit_certificate_check: None, snapshot_lines_threshold: None, use_new_locking: false }
2024-06-25T09:17:22.054376Z  INFO set_project_active:watch:file monitor:handle debounced events: crates\gitbutler-watcher\src\file_monitor.rs:122: new id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba
2024-06-25T09:17:22.055182Z  INFO set_project_active:watch:file monitor:handle debounced events: crates\gitbutler-watcher\src\file_monitor.rs:122: close time.busy=749�s time.idle=60.1�s id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba fs_events=209 fs_events=209 ignored=0 ignored=0 git_noop=205 git_noop=205 git=0 git=0 project=0 project=0
2024-06-25T09:17:22.055288Z  INFO handle: crates\gitbutler-watcher\src\handler.rs:54: new event=GitButlerOplogChange(83cfc9b3-4a6c-47ad-8f83-88050b7264ba)
2024-06-25T09:17:22.055661Z  INFO handle: crates\gitbutler-watcher\src\handler.rs:54: close time.busy=346�s time.idle=28.1�s event=GitButlerOplogChange(83cfc9b3-4a6c-47ad-8f83-88050b7264ba)

'apply' erro

2024-06-25T09:18:51.061916Z  INFO apply_branch: crates\gitbutler-tauri\src\virtual_branches.rs:197: new project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba branch=6c5aadef-ce1c-4a72-92cd-66ef2c85c7cf
2024-06-25T09:18:51.063486Z  WARN apply_branch: crates\gitbutler-core\src\project_repository\repository.rs:44: failed to get gitbutler.didSetPrune for repository at D:\project\agyj\AGYJ-Vue3; cannot disable gc: config value 'gitbutler.didSetPrune' was not found; class=Config (7); code=NotFound (-3) project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba branch=6c5aadef-ce1c-4a72-92cd-66ef2c85c7cf
2024-06-25T09:18:51.138010Z ERROR apply_branch: crates\gitbutler-tauri\src\virtual_branches.rs:197: error=Error(<project-conflict>

Caused by:
    branch 6c5aadef-ce1c-4a72-92cd-66ef2c85c7cf is in a conflicting state) project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba branch=6c5aadef-ce1c-4a72-92cd-66ef2c85c7cf
2024-06-25T09:18:51.138044Z  INFO apply_branch: crates\gitbutler-tauri\src\virtual_branches.rs:197: close time.busy=76.1ms time.idle=44.8�s project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba branch=6c5aadef-ce1c-4a72-92cd-66ef2c85c7cf
2024-06-25T09:18:51.195439Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.195948Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=476�s time.idle=35.0�s key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.209517Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.210161Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=610�s time.idle=35.7�s key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.226288Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOpenAIKey"
2024-06-25T09:18:51.228874Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=2.48ms time.idle=111�s key="gitbutler.aiOpenAIKey"
2024-06-25T09:18:51.229114Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOpenAIKey"
2024-06-25T09:18:51.229872Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=734�s time.idle=24.8�s key="gitbutler.aiOpenAIKey"
2024-06-25T09:18:51.243642Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiAnthropicKey"
2024-06-25T09:18:51.243710Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiAnthropicKey"
2024-06-25T09:18:51.244633Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=902�s time.idle=21.2�s key="gitbutler.aiAnthropicKey"
2024-06-25T09:18:51.246502Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOllamaEndpoint"
2024-06-25T09:18:51.247689Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=1.13ms time.idle=53.7�s key="gitbutler.aiOllamaEndpoint"
2024-06-25T09:18:51.250414Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOllamaModelName"
2024-06-25T09:18:51.250898Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=460�s time.idle=25.3�s key="gitbutler.aiOllamaModelName"
2024-06-25T09:18:51.252142Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.252942Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=779�s time.idle=22.6�s key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.253913Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOpenAIKeyOption"
2024-06-25T09:18:51.254393Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=459�s time.idle=21.8�s key="gitbutler.aiOpenAIKeyOption"
2024-06-25T09:18:51.255233Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiAnthropicKeyOption"
2024-06-25T09:18:51.257021Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=1.77ms time.idle=20.6�s key="gitbutler.aiAnthropicKeyOption"
2024-06-25T09:18:51.262813Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=19.1ms time.idle=38.5�s key="gitbutler.aiAnthropicKey"
2024-06-25T09:18:51.266139Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOllamaEndpoint"
2024-06-25T09:18:51.266765Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=595�s time.idle=33.3�s key="gitbutler.aiOllamaEndpoint"
2024-06-25T09:18:51.270565Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOllamaModelName"
2024-06-25T09:18:51.271281Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=657�s time.idle=59.7�s key="gitbutler.aiOllamaModelName"
2024-06-25T09:18:51.272541Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.273627Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=1.03ms time.idle=61.6�s key="gitbutler.aiModelProvider"
2024-06-25T09:18:51.277655Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiOpenAIKeyOption"
2024-06-25T09:18:51.278204Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=525�s time.idle=24.6�s key="gitbutler.aiOpenAIKeyOption"
2024-06-25T09:18:51.279076Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: new key="gitbutler.aiAnthropicKeyOption"
2024-06-25T09:18:51.281767Z  INFO git_get_global_config: crates\gitbutler-tauri\src\commands.rs:107: close time.busy=2.67ms time.idle=21.3�s key="gitbutler.aiAnthropicKeyOption"
2024-06-25T09:18:51.417480Z  INFO set_project_active:watch:file monitor:handle debounced events: crates\gitbutler-watcher\src\file_monitor.rs:122: new id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba
2024-06-25T09:18:51.417892Z  INFO set_project_active:watch:file monitor:handle debounced events: crates\gitbutler-watcher\src\file_monitor.rs:122: close time.busy=354�s time.idle=61.1�s id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba project_id=83cfc9b3-4a6c-47ad-8f83-88050b7264ba fs_events=107 fs_events=107 ignored=0 ignored=0 git_noop=103 git_noop=103 git=0 git=0 project=0 project=0
2024-06-25T09:18:51.418363Z  INFO handle: crates\gitbutler-watcher\src\handler.rs:54: new event=GitButlerOplogChange(83cfc9b3-4a6c-47ad-8f83-88050b7264ba)
2024-06-25T09:18:51.418869Z  INFO handle: crates\gitbutler-watcher\src\handler.rs:54: close time.busy=470�s time.idle=37.4�s event=GitButlerOplogChange(83cfc9b3-4a6c-47ad-8f83-88050b7264ba)
Byron commented 5 days ago

Thanks for reporting.

Not every error is a bug and in this case, I wonder what the expected behaviour is? Conflicting states should be indicated in the UI accordingly, and maybe this is a UX problem as it's not clear what's happening.

And I am sorry to see some operations take 470s for you :/!!

 INFO handle: crates\gitbutler-watcher\src\handler.rs:54: close time.busy=470�s time.idle=3 [..]
hanchao0606 commented 4 days ago

I'm very sorry I didn't describe it clearly. When I create a new branch and push it to the remote repository, and then do "unapply" or "app" nothing happens. I can only delete the entire project and re-download it. I thought these logs could help analyze errors.