Commit Graph

10174 Commits

Author SHA1 Message Date
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
541a5cf0da
Merge pull request #5540 from gitbutlerapp/remove-unused-code
remove unused code
2024-11-13 17:38:41 +01:00
estib
f07cc58e2d Improvement: Don't rerender blocks unnecessarily
Don't use the svelte transition when mounting the dropzone overlay.
This mitigates the issue of jankyness for all Dropzones, and not just the ones that were observed as janky
2024-11-13 14:53:51 +01:00
Kiril Videlov
72598da978 remove unused code 2024-11-13 14:34:37 +01:00
Caleb Owens
998885c242
Merge pull request #5528 from gitbutlerapp/refactoring-stack-stuff
Refactor CommandContext out of various stack functions
2024-11-13 13:35:43 +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
Kiril Videlov
06f5743031
Merge pull request #5535 from gitbutlerapp/e-branch-4
Address janky stacky
2024-11-13 11:54:08 +01:00
Mattias Granlund
2291e38a82 Include repo domain and hash in posthog events
- so we can understand and prioritise forge support
2024-11-13 11:45:09 +01:00
estib
4c48a239f9 Series list: Rerender the list when changed
In order to avoid the janky layout shift, re-render the whole list whenever it changes.
2024-11-13 11:41:02 +01:00
estib
4fbb444cbf Stack: Address jank
Depending on the state of the stack (has uncommited files, has no commits, etc) correctly re-render the file list component.
Also:
Extract the components for uncommited stack files to a dedicated component.
2024-11-13 11:39:52 +01:00
Esteban Vega
205f335ec9
Merge pull request #5533 from gitbutlerapp/e-branch-3
Ability to discard single lines
2024-11-13 11:13:53 +01:00
Kiril Videlov
cdce2fdaf2
Merge pull request #5532 from gitbutlerapp/fix-checks-poll
Fix stale checks results
2024-11-13 10:23:15 +01:00
estib
23df21dad7 Add the option to discard single lines
The file hunk context menu offers the option to discard a single line.
2024-11-13 10:19:41 +01:00
Mattias Granlund
6d46cfc3fe Refetch pr status & checks after push 2024-11-13 10:09:05 +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
ndom91
4005d68f2b fix: bug renaming series 2024-11-12 16:30:43 +01:00
Pavel Laptev
b34f6fd7a9 feat(context-menu): enhance SeriesHeaderContextMenu with new items
- Added a condition to check if the branch was pushed to "Open in browser"
- Add "Copy branch name"
- Separated context items into groups
2024-11-12 16:30:43 +01:00
Sebastian Thiel
4e1f17d41f
Merge pull request #5490 from Byron/tree-merge
use `merge_base_octopus()`
2024-11-12 15:45:24 +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
Sebastian Thiel
f0d7d4c02e
update gitoxide to the latest version for gix::Repository::virtual_merge_base(). 2024-11-12 15:32:03 +01:00
Pavel Laptev
b0848c30f9
Fix: Series description field (#5526)
* fix: `Escape` to blur the input

* fix: update placeholder text for consistency
2024-11-12 14:19:05 +01:00
Pavel Laptev
229c9b8fe3
remove-unused-icons (#5524)
* refactor(icons): icons rename, remove unused

* feat(icons): update small AI icon

* refactor: make icon optional in snapshot operation mapping
2024-11-12 12:30:01 +01:00
Mattias Granlund
ee04556008 Fix "load failed" on pr creation
- rust returns null for optional values rather than undefined
- add missing $derived
2024-11-12 11:10:24 +01:00
Kiril Videlov
3c3fe9ad8b
Merge pull request #5520 from gitbutlerapp/gc-something-something
Chore: remove GC restriction
2024-11-11 17:01:32 +01:00
Esteban Vega
d91a35fc49
Merge pull request #5517 from gitbutlerapp/fix-swallow-no-default-target-error
Update branch listing: Swallow the 'DefaultTargetNotFound' error
2024-11-11 16:56:11 +01:00
Kiril Videlov
7c064039e2
Merge pull request #5519 from gitbutlerapp/fix-lost-prs
Fix lost PRs
2024-11-11 16:50:22 +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
Caleb Owens
4f6cef393e Improve filtering of PR tab to consider stacks 2024-11-11 16:03:15 +01:00
Caleb Owens
646ea36131 Fix lost PRs 2024-11-11 15:53:15 +01:00
Pavel Laptev
cf73b39fc8
UI improve context menu (#5498)
* Add stack footer

* add `Toggle` story

* refactor styles and copy: update context menu components

* feat(prFooter): update footer format to enhance clarity

* remove extra `PR` word from the PR card context menu

* simplify labels in SeriesHeaderContextMenu + add a section title

* refactor: replace StackingCommitCard with CommitCard component

* refactor: replace parent.close() with menu.close() in context menu

* refactor: replace onopen/onclose with ontoggle in context menus

* refactor(contextmenu): streamline toggle event handling

* refactor: update context menu to support right- and left-click triggers

* Update DropDownButton.svelte

* copy and title style update

* added series header right click menu

* do not allow interactions until the animation ends

* fix typo

* improve `setTransformOrigin` function readability

* simplify `setHorizontalAlign`

* remove "title" from the PR context menu

* copy fix

* remove commented out code

* leave the "Reload PR" action only on the PR card

* do not show the rename action if it is no longer available

---------

Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
2024-11-11 14:35:47 +00:00
Pavel Laptev
784e380892
UI smaller empty branch state (#5516)
* rename category "Elements" to "Basic"

* fix import typo

* UI: Smaller "new branch" empty state

* discard files styles update
2024-11-11 13:59:58 +01:00
estib
35cfd01504 Update branch listing: Swallow the 'DefaultTargetNotFound' error
Don't raise the error regarding missing default target while updating the branch listing details.
2024-11-11 11:19:52 +01:00
Kiril Videlov
aa28ade188
Merge pull request #5512 from gitbutlerapp/kv-branch-1
Make pr numbers available for branch listing
2024-11-11 00:16:47 +01:00
Kiril Videlov
3546c9e5a2 Make pr numbers available for branch listing 2024-11-10 22:36:46 +01:00
Kiril Videlov
04655cda39
Merge pull request #5509 from gitbutlerapp/kv-branch-2
Fix serialization bug: alias StackBranch head to target
2024-11-10 12:48:50 +01:00
Kiril Videlov
5bdb565884 Fix serialization bug: alias StackBranch head to target 2024-11-10 12:40:34 +01:00
Kiril Videlov
1834815b83
Merge pull request #5507 from gitbutlerapp/kv-branch-3
Stack: some refactoring
2024-11-09 23:32:42 +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