Pavel Laptev
4fd1712994
Small UI updates ( #5006 )
...
* design tokens update
* update "update" icon
* increase button icons contrast
* Fix: button layout
* made "fast" transition variable even faster
* update "virtual-branch-small" icon
* bigger file icons, remove "fileName" property
- Larger file icons.
- The file path label in the "FileListItem" included the file name, but it should only contain the folder path.
- Since the "filePath" string already includes the file name, it's easier to split it within the "FileListItem" component, rather than passing the file name as a separate prop.
2024-10-01 16:08:03 +02:00
Caleb Owens
51d09e1bcd
Merge pull request #5004 from gitbutlerapp/Fix-applying-mergable-branch
...
Fix applying mergable branch
2024-10-01 13:40:14 +02:00
estib
876817eaba
Factor out the move_commit function
...
Move the `move_commit` function to a separate module.
Add some unit tests for testing whether the commit is locked.
2024-10-01 13:35:49 +02:00
Caleb Owens
d571ee2ddb
Fix applying mergable branch
2024-10-01 13:32:48 +02:00
Esteban Vega
31def64c0b
Merge pull request #5003 from gitbutlerapp/open-conflicted-files
...
Edit mode: Open the conflicted files in the IDE
2024-10-01 10:15:04 +02:00
estib
945f991ad3
Edit mode: Open the conflicted files in the IDE
...
Add the ability to right-click a file in the list to open it in the selected IDE.
Also add a button that opens all the conflicted files automatically.
2024-09-30 19:11:51 +02:00
Kiril Videlov
3742349a22
Merge pull request #4999 from icorbrey-contrib/master
...
chore: Bump `git2-hooks`
2024-09-30 19:00:56 +02:00
Esteban Vega
ba9cf07ce5
Merge pull request #5002 from gitbutlerapp/fix-conflicted
...
fix: Correctly detect conflicted files
2024-09-30 18:59:06 +02:00
estib
a169b41594
fix: Correctly detect conflicted files
...
Correctly detect and display whether the commit file is conflicted in the edit mode page
2024-09-30 18:38:20 +02:00
Caleb Owens
3e2a29b6e7
Merge pull request #4998 from gitbutlerapp/Create-wd-tree-improvements
...
Create wd tree improvements
2024-09-30 18:28:45 +02:00
Caleb Owens
3a921031d3
Remove erroniously preserved dbg statements
2024-09-30 18:08:23 +02:00
Caleb Owens
c7d2bfa025
Support symlinks in create_wd_tree
2024-09-30 18:02:46 +02:00
Isaac Corbrey
7045f1c365
chore: Bump git2-hooks
2024-09-30 11:54:34 -04:00
Caleb Owens
511ca5212e
Support executable blobs
2024-09-30 17:34:20 +02:00
estib
adf33ac445
Upstream integration: Add some tests related to divergence resolution
...
Add tests regarding resolving divergence of the base branch with upstream
2024-09-30 16:26:19 +02:00
Pavel Laptev
85e32fd4e2
Custom font support for displaying diffs ( #4991 )
...
* replace hardcoded "font-family"
* "Diff font" option in User Settings
* Update +page.svelte
* Update +page.svelte
* added "allow font ligatures" option
* copy update
* Update +page.svelte
* remove console.log
* Appearance settings: Reorder the settings
Move down the font family the input into its dedicated section
* Graduate inline diffs to standard setting
The option to display inline integrated diffs in the hunk viewer is no longer an experimental option, but an 'stable' appearance setting option.
---------
Co-authored-by: estib <stron@me.com>
2024-09-30 12:58:39 +02:00
Caleb Owens
6d52977202
Remove worktree_path and use workdir function in create_wd_tree
2024-09-30 12:27:34 +02:00
Caleb Owens
e4ecddc690
Extract create_wd_tree test into test directory
2024-09-30 12:26:31 +02:00
Kiril Videlov
9dde8e7f7e
Merge pull request #4995 from gitbutlerapp/Use-new-checkout_combined_trees-in-upstream-integration
...
Use the new checkout_combined_trees in upstream integration
2024-09-30 11:36:28 +02:00
Kiril Videlov
9910347528
Merge pull request #4994 from gitbutlerapp/Better-test-undo-commit-logic
...
Add more tests to undo commit
2024-09-30 11:36:13 +02:00
estib
494a87bd5a
ai: Generate or edit the PR description
...
Add the ability to generate the PR description out of the commit descriptions + an optional user prompt
2024-09-30 10:09:54 +02:00
Caleb Owens
dc45ab2aac
Use the new checkout_combined_trees in upstream integration
2024-09-30 02:01:11 +02:00
Caleb Owens
c3f6db382a
Add more tests to undo commit
2024-09-30 01:53:21 +02:00
Kiril Videlov
3ba6f7238a
Tests for Stack trait implementation
2024-09-30 00:22:35 +02:00
Caleb Owens
7422110a6d
Merge pull request #4993 from gitbutlerapp/fix-create-wd-tree
...
Use new git2 implementation
2024-09-30 00:12:17 +02:00
Caleb Owens
87663bea2d
Remove instances where add_all was used to get a tree of the current working directory
2024-09-29 23:39:23 +02:00
Caleb Owens
06af1c5fe9
Ensure that the index indeed remains unchanged
2024-09-29 23:23:50 +02:00
Caleb Owens
102b941d3e
Use new git2 implementation
2024-09-29 23:18:07 +02:00
Kiril Videlov
d0c1679b68
Adds a "list_branches" (series) method to the Stack trait
...
This pre-computes a list of which commits/patches belong to which series in the stack
2024-09-29 22:18:15 +02:00
Caleb Owens
d486308743
Merge pull request #4987 from gitbutlerapp/Reorder-commits-with-tests
...
Add tests for reordering commits
2024-09-29 20:30:25 +02:00
Caleb Owens
47a4fc03c7
Update testing framework
2024-09-29 20:23:23 +02:00
Kiril Videlov
f6ec80d8ce
Adds a trait Stack with an implementation for Branch
...
This provides a well defined interface for interacting with Stacks. It is implemented for gitbutler_branch::Branch, and it is specifically meant to operate on and update the `heads` field of Branch
This facilitates creating, updating, removing, pushing and listing of "stacked branches" within the Stack (formerly the virtual branch).
2024-09-29 19:26:39 +02:00
Caleb Owens
be1fc2cf7e
Checkout trees after reordering (and make generic function for it)
2024-09-28 18:46:41 +02:00
Caleb Owens
947a9c7ff1
Fix branch.tree properties getting set to conflicted trees.
2024-09-28 18:45:11 +02:00
Caleb Owens
7f348d8a6d
Add tests for reordering commits
2024-09-28 17:50:32 +02:00
Nico Domino
216fca1cec
fix: simplify crates/package.json setup ( #4986 )
2024-09-28 15:29:48 +00:00
Nico Domino
d10bbcf515
feat: new stacking ui commit lines ( #4972 )
...
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-09-28 16:59:29 +02:00
estib
924706092b
ai: Enable streaming
...
Ability to stream the LLM responses into the UI.
2024-09-28 13:17:37 +02:00
estib
0f05b435ba
Result: Add async transformer
2024-09-28 13:15:44 +02:00
estib
76dd98b982
Add Anthropic SDK
2024-09-28 13:13:43 +02:00
Kiril Videlov
a2aafd919b
Introduce PatchReference and a heads field on Branch
...
- The PatchReference type represents a "reference" that is entirely managed by GitButler. It can either point to a commit or a GitButler change (which itself points to a commit)
- The Branch type (as persisted in virtual_branches.toml) now has a `heads` fields with a list of PatchReferences. This list is not to be meant to be manipulated directly, but with the `Stack` trait
2024-09-28 12:34:29 +02:00
Nico Domino
8b84f46df1
fix: add crates to pnpm-workspace to avoid Vercel CI ( #4855 )
2024-09-28 12:19:25 +02:00
Esteban Vega
4b9421a851
Merge pull request #4985 from gitbutlerapp/fix-base-branch-blank-page
2024-09-28 11:15:28 +02:00
estib
0f6a78e1b6
fix: Test for integrateUpstreamModal being undefined
...
Don't try to read a property from the integration modal if it's undefined
2024-09-28 11:00:33 +02:00
Sebastian Thiel
adf43a59dc
Merge pull request #4984 from navtoj/Branch-Search-Hidden-Input
...
fix: Branch Search Hidden Input
2024-09-27 15:41:05 +02:00
Navtoj Chahal
26b99e217e
Disable Hidden Input Interaction
2024-09-26 19:39:02 -07:00
estib
3424f7781b
ai: Add PR description method
...
Add a method to the AI service that takes in some context about a PR and creates a description body out of it
2024-09-26 15:25:41 +02:00
Caleb Owens
01584fcfa9
Merge pull request #4981 from gitbutlerapp/rebase-tests
...
Add helper function for matching trees, and start testing rebasing.
2024-09-26 15:25:40 +02:00
Caleb Owens
31242dbe2b
Add helper function for matching trees, and start testing rebasing.
...
Basic rebasing tests
2024-09-26 14:42:14 +02:00
estib
f442195769
Create PR preview: Edit the PR contents
...
Add the ability to edit the text contents of a PR before creating it.
Also, integrate the variants into one component
2024-09-26 13:33:21 +02:00
