estib
84030ab03f
Track dependencies in Stack
...
Stack keeps a map of commit and uncommitted chanegs inter-dependencies
2024-11-13 18:46:21 +01:00
estib
f1b0dccbe6
Hunk locking: Remove the experimental flag
...
Move fully to the new Hunk Locking algorithm, remove the references to that flag and the settings UI
2024-11-13 18:46:21 +01:00
estib
ce87969c06
Move out dependency calculation to a dedicated module
2024-11-13 18:46:21 +01:00
Mattias Granlund
58cafba3db
Use hunk dependency code for computing inter-commit dependencies
2024-11-13 18:46:21 +01:00
Kiril Videlov
72598da978
remove unused code
2024-11-13 14:34:37 +01:00
Caleb Owens
765a967c60
Refactor initialized
2024-11-13 13:29:57 +01:00
Caleb Owens
30e6540a63
Removed unneeded instances of CommandContext passed about
2024-11-13 13:29:53 +01:00
estib
7bc2021bb6
Add method to unapply lines
...
Method to unapply ownership lines.
Adds the ability to determine a subset of hunk lines to be discarded.
2024-11-13 09:32:02 +01:00
Sebastian Thiel
9e080d299c
Use gix::Repository::virtual_merge_base() for better merge-bases.
...
Just like Git in merge-ORT, a virtual merge base helps to deal with multiple
merge bases which can happen more easily when more than two commits are involved.
2024-11-12 15:34:20 +01:00
Kiril Videlov
cabe9387aa
Chore: remove GC restriction
...
Previous the app used to disable Git GC. This is no longer needed since all git trees used by gitbutler are now referenced via the reflog hack used by the oplog. This change removes the 'prune never' config if it was previously set by the app.
2024-11-11 16:13:13 +01:00
Kiril Videlov
3546c9e5a2
Make pr numbers available for branch listing
2024-11-10 22:36:46 +01:00
Kiril Videlov
5bdb565884
Fix serialization bug: alias StackBranch head to target
2024-11-10 12:40:34 +01:00
Kiril Videlov
f404bca84a
Rename functions and vars referencing branch to stack if the type is Stack
2024-11-09 23:23:21 +01:00
Kiril Videlov
d45e7d874d
Rename fields named branch to stack where the type is Stack
2024-11-09 22:57:59 +01:00
Kiril Videlov
62a74107dc
Rename branch and branch_id function parameters to stack and stack_id
...
Internally only, skipping the API for now
2024-11-09 22:41:52 +01:00
Kiril Videlov
1c2871c907
rename Branch to StackBranch to remove ambiguity
2024-11-09 22:20:15 +01:00
Kiril Videlov
2559722db0
refactor: rename Branch target to head
...
Confusing name was a leftover from pre-refactor
2024-11-09 22:20:15 +01:00
Kiril Videlov
a4d4ec57a6
refactor: remove unused struct Series
2024-11-09 22:20:15 +01:00
Kiril Videlov
2b828cfa11
refactor: remove unused list_series method
2024-11-09 22:20:15 +01:00
Kiril Videlov
32c05ee726
refactor: remove list_series from unit tests
2024-11-09 22:20:15 +01:00
Kiril Videlov
629ff089df
refactor: integrate upstream uses stack.branches()
2024-11-09 22:20:15 +01:00
Kiril Videlov
49f6c8cfae
refactor: rename branch->stack in places
2024-11-09 22:20:15 +01:00
Kiril Videlov
e98dbd7ca9
refactor: listing commits now uses stack.branches()
2024-11-09 22:20:15 +01:00
Kiril Videlov
4e806156c9
refactor: reorder now uses stack.branches() istead of list_series()
2024-11-09 22:20:15 +01:00
Kiril Videlov
b04ee7e511
refactor: reorder integration tests now uses branch.commits()
2024-11-09 22:20:15 +01:00
Kiril Videlov
39a41a2194
refactor: stack push now uses stack.branches()
...
As opposed to stack.list_series() which does more unnecessary work
2024-11-09 22:20:15 +01:00
Kiril Videlov
1c49a9f5f6
add tree asertions for reorder conflict handling
2024-11-09 20:34:23 +01:00
Kiril Videlov
748f93ff2e
add assertion that commit timestamps are updated upon reorder
2024-11-09 11:54:53 +01:00
Kiril Videlov
0f47113f3a
test conflict handling when commir reordering
2024-11-08 23:37:17 +01:00
Kiril Videlov
c352a1abd3
Merge pull request #5502 from gitbutlerapp/refactor-extract-branch-trees-to-create
...
Move branch_trees modeule to workspace crate
2024-11-08 18:27:05 +01:00
Kiril Videlov
b61b73e820
Move branch_trees module to a new create
2024-11-08 16:26:44 +01:00
Caleb Owens
9da74da070
Update commiter when rebasing
2024-11-08 15:56:41 +01:00
Caleb Owens
de23e3c772
Push empty stacks, skip archived stacks.
2024-11-08 13:35:37 +01:00
Caleb Owens
3712410a85
Fix listing old branches
2024-11-07 19:24:15 +01:00
Caleb Owens
5ce2de20f4
update test case to assert the right identity
2024-11-07 15:21:41 +01:00
Caleb Owens
8b410a3b30
Unapply stacks to a unique uuid
2024-11-07 14:32:07 +01:00
Kiril Videlov
7fcb6102eb
Fixes a bug where stack listing fails if there is an archived branch
2024-11-07 11:09:19 +01:00
Kiril Videlov
077626c7bd
Merge pull request #5475 from gitbutlerapp/remove-forge-id-type
...
Replace ForgeIdentifier with string type
2024-11-07 10:01:34 +01:00
Mattias Granlund
54caba3951
Replace ForgeIdentifier with string type
...
- simplifying to keep things simple in the front end
2024-11-07 00:05:01 +01:00
Kiril Videlov
7b2b4244d8
Sidebar branch listing: exclude stack branches
...
We want branches that are part of a stack to not show up on their own
2024-11-06 19:13:27 +01:00
ndom91
2a988528ff
fix: update linux dependencies
2024-11-06 13:40:41 +01:00
estib
8f045dfb4f
CSP: Allow-list Anthropics API endpoint
2024-11-06 11:07:33 +01:00
estib
32e9e5d2e4
fix: Ollama message generation
...
Allow-list localhost to be fetched from.
Fix the ollama client message retrieval
2024-11-06 10:34:53 +01:00
estib
d1c42960a6
Branches: Add the gravatar URL to the author
...
The branch author shares the same gravatar as the one in the commits
Also:
- Share the logic behind creating the gravatar across commit and branch authors
2024-10-30 15:49:00 +01:00
Kiril Videlov
7fe5d0c85e
Merge pull request #5416 from gitbutlerapp/tree-merge
...
Replace `merge-tree` in more places
2024-11-05 22:36:04 +01:00
Sebastian Thiel
1031de1659
Update to gix with the latest improvements for nicer merge-related APIs
2024-11-05 20:05:41 +01:00
Kiril Videlov
25ff765955
Dont push dependent branches without own commits
...
When pushing a stack, a dependent branch may be empty (without commits) - those should not be pushed
2024-11-05 18:29:59 +01:00
Kiril Videlov
446ddf1ed4
Merge pull request #5443 from gitbutlerapp/add-ipc-to-csp
...
add missing csp entry for IPC
2024-11-05 16:41:00 +01:00
Caleb Owens
1eb7d02f5f
add missing csp entry for IPC
2024-11-05 15:46:58 +01:00
Kiril Videlov
0ebb6f6036
Expose stackBranches on VirtualBranchReference in the UI
...
To be used for rendering the updated design that shows the top-of-stack branch
2024-11-05 14:08:52 +01:00
