ndom91
6e54b2389b
fix: branchController jsdoc
2024-10-31 10:30:24 +01:00
Nico Domino
b4bdbdcfb6
fix: StackingSeriesHeader merge conflicts
...
Discard changes to apps/desktop/src/lib/branch/BranchLabel.svelte
2024-10-31 10:30:24 +01:00
ndom91
3884c96ddf
feat: double input handling and blur clear
2024-10-31 10:30:24 +01:00
Pavel Laptev
fb0fa7eb9a
fix styles and words wrap
2024-10-31 10:30:24 +01:00
Pavel Laptev
de50077ebb
styles update
2024-10-31 10:30:24 +01:00
Pavel Laptev
ecbed20789
replace components
2024-10-31 10:30:24 +01:00
ndom91
4f40390641
fix: StackingSeriesHeader merge conflict issues
2024-10-31 10:30:24 +01:00
ndom91
6ea3a72c4a
feat: if description has been added, use it in createPr modal
...
fix: prDetailsModal props
2024-10-31 10:30:24 +01:00
Nico Domino
862cb347a3
feat: add seriesHeaderDescription input and enable its use in contextMenu
...
Discard changes to flake.lock
2024-10-31 10:30:24 +01:00
ndom91
ca1987f08b
feat: add 'updateSeriesDescription' branchController method exposing tauri cmd of same name
2024-10-31 10:30:24 +01:00
ndom91
b407985154
feat: split BranchLabel into component parts (no pun)
2024-10-31 10:30:24 +01:00
Kiril Videlov
df61676ed0
Merge pull request #5378 from gitbutlerapp/kv-branch-1
...
Updating series name resets forge_id to None
2024-10-31 10:05:10 +01:00
Kiril Videlov
5e1766e47d
Rename API update_series_forge_ids to singular
...
This was previously forgotten
2024-10-31 09:52:38 +01:00
Kiril Videlov
0b6bcab859
Updating series name resets forge_id to None
2024-10-31 09:50:28 +01:00
Kiril Videlov
a9423e607a
Merge pull request #5375 from gitbutlerapp/kv-branch-1
...
feat: Add write permission parameter to amend function
2024-10-30 22:38:36 +01:00
Kiril Videlov
742f5808bf
feat: Add write permission parameter to amend function
2024-10-30 22:28:24 +01:00
Kiril Videlov
89440a1a08
Merge pull request #5374 from gitbutlerapp/kv-branch-1
...
feat(stack): implement capturing a snapshot before operations
2024-10-30 20:28:30 +01:00
Kiril Videlov
b6386bdccf
feat(stack): implement capturing a snapshot before operations
2024-10-30 20:13:25 +01:00
Kiril Videlov
25a2a4f5b5
Merge pull request #5371 from gitbutlerapp/kv-branch-1
...
fix adding a branch on the stack when there is an archived (below the merge base) branch
2024-10-30 18:39:59 +01:00
Caleb Owens
e605fb0ffe
Merge pull request #5370 from gitbutlerapp/remove-unused-flags
...
Remove old and unrequired feature flags
2024-10-30 17:39:41 +00:00
Kiril Videlov
2ee3e2dcef
fix adding a branch on the stack when there is an archived branch
2024-10-30 18:32:34 +01:00
Caleb Owens
e58dbd9d1f
Remove old and unrequired feature flags
2024-10-30 17:23:55 +00:00
Sebastian Thiel
77a99aa47d
Merge pull request #5366 from Byron/fix-1650
...
fix: do not cutoff traversals by date for branch details (#1650 ).
2024-10-30 16:28:11 +01:00
Mattias Granlund
cd397bca5f
rename all variables gitHost -> forge
2024-10-30 16:23:45 +01:00
Mattias Granlund
3a76156d99
rename directory/files gitHost -> forge
...
rename file gitHost.ts -> forge.ts
rename file gitHostBranch.ts -> forgeBranch.ts
rename file gitHostChecksMonitor.ts -> forgeChecksMonitor.ts
rename file gitHostIssueService.ts -> forgeIssueService.ts
rename file gitHostListingService.ts -> forgeListingService.ts
rename file gitHostPrMonitor.ts -> forgePrMonitor.ts
rename file gitHostPrService.ts -> forgePrService.ts
rename file gitHostFactory.ts -> forgeFactory.ts
2024-10-30 16:23:45 +01:00
Esteban Vega
6ceea63bfe
Merge pull request #5354 from gitbutlerapp/e-branch-2
...
Undo commit: Files stay in the branch that owned the undone commit
2024-10-30 15:54:23 +01:00
Sebastian Thiel
b38d736685
Use version without cutoff as last-resort only.
...
The implementation is a bit more complex to be sure that
the cutoff is still used where possible.
The GitLab repository for instance has such complex
graphs that somehow... the first mergebase often isn't
enough to stop the traversal in time, leading to 100k commits to be traversed.
2024-10-30 15:49:28 +01:00
Sebastian Thiel
14ab092adc
fix: do not cutoff traversals by date for branch details ( #1650 ).
...
We already found the merge-base and know that this will naturally
be the end of the traversal. Thus there is no need to additionally
set a cut-off date, which is the documented default.
With such a cutoff, it's very possible that certain operations on the branches
change the date of the base to lie in the future, which is when no traversal
would be able to happen anymore.
2024-10-30 15:38:41 +01:00
ndom91
aba906e241
fix: dont allow dbl-click rename on integrated branches
...
fix: import CommitStatus type
2024-10-30 15:28:57 +01:00
ndom91
cc45c71a35
feat: show RenameSeries modal on BranchLabel dblClick
2024-10-30 15:28:57 +01:00
ndom91
291cd0983d
feat: normalize branch name on series creation
2024-10-30 15:20:04 +01:00
ndom91
a99eea1cb0
fix: ensure new series name is normalized on the rust side via gix normalization fn
2024-10-30 15:20:04 +01:00
ndom91
5b355935a0
fix: allow periods in git refs through slugify()
2024-10-30 15:20:04 +01:00
Nico Domino
ef3511c8c7
Build with libwebkit2gtk-4.1=2.44.0 and Ubuntu 24.04
2024-10-30 14:23:32 +01:00
Mattias Granlund
e2ae098aa1
Change gh actions rust cache key
...
- different dependencies -> different cache
2024-10-30 14:23:32 +01:00
ndom91
f32ab4d95c
fix: add webkitgtk_4_1 to flake.nix deps
2024-10-30 14:23:32 +01:00
ndom91
3d8b92c76c
fix: more tauri.conf migrations
2024-10-30 14:23:32 +01:00
Mattias Granlund
2d2e265ea5
Update E2E testing to Tauri v2
2024-10-30 14:23:32 +01:00
Mattias Granlund
2ef866baa6
Tauri v1 -> v2
...
Refactor appSettings to accommodate new Tauri v2 API
- creates AppSettings class and injects it where needed
- avoids `window` undeclared variable during vite build process
2024-10-30 14:23:32 +01:00
Kiril Videlov
7be3e7a6e7
Merge pull request #5362 from gitbutlerapp/kv-branch-1
...
Retain fully integrated braches on the stack but flag them as archived
2024-10-30 13:51:19 +01:00
Kiril Videlov
bd10692afb
Only show non-archived branches in the UI
2024-10-30 12:52:55 +01:00
Kiril Videlov
94e345aeb0
Change pruning of integrated heads in the stack to just flag them as archived
2024-10-30 12:26:34 +01:00
Kiril Videlov
ad0a0a20d0
Merge pull request #5357 from gitbutlerapp/persist-forge-ids-on-series
...
Persist ForgeIdentifier on series (branches)
2024-10-30 10:41:54 +01:00
Kiril Videlov
8f4cb6160f
replace a Vec of Forge Identifers with an Option instead
...
Likely we wont need multiple
2024-10-30 10:32:44 +01:00
Kiril Videlov
1384e90345
Integration test asserting setting and reading forge ids
2024-10-29 23:44:07 +01:00
Kiril Videlov
6d0f9fe141
When creating a vbranch from PR pass the forge id
2024-10-29 23:25:58 +01:00
Kiril Videlov
70f7d82f14
Update create_virtual_branch_from_branch to take forge_id
2024-10-29 23:25:14 +01:00
Kiril Videlov
88729a858c
Add API endpoint for setting the forge ids
...
Plus frontend medthod in branchController for calling it
2024-10-29 22:54:54 +01:00
Kiril Videlov
4bba0dd2b9
expose forge ids on the branches stream api
2024-10-29 21:52:57 +01:00
Kiril Videlov
3844da2ac6
add tests for setting forge ids
2024-10-29 21:49:25 +01:00
