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
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
Caleb Owens
201aa55f12
Merge pull request #4980 from gitbutlerapp/Merging-commits
...
Fix merge commit unconflicted state
2024-09-26 13:24:16 +02:00
Caleb Owens
8402b78e64
Merge pull request #4802 from JReinhold/storybook-8-3
...
UI: Upgrade to Storybook `8.3.0-beta.0`, add Vitest to UI package
2024-09-26 00:49:27 +02:00
Caleb Owens
dfb8eef044
Align changes with formatting; install browser deps
2024-09-26 00:36:46 +02:00
Caleb Owens
a0ed2bb3c8
Add playwright install as a test prerequisite
2024-09-26 00:27:47 +02:00
Caleb Owens
3c4cda739f
Update imports in relation to the 8.3 release
2024-09-26 00:24:21 +02:00
Caleb Owens
46fa53a878
Fix merge commit unconflicted state
...
more tests
2024-09-25 23:37:37 +02:00
Caleb Owens
50086f0d84
Merge pull request #4973 from gitbutlerapp/Testing-rebase
...
Add tests for resolving indexes
2024-09-25 15:25:58 +02:00
Caleb Owens
9cbebba5cf
Fix testcase for merge_vbranch_upstream_clean_rebase
2024-09-25 15:15:29 +02:00
estib
9834627a20
Base: Propagate the conflicting status to the commits
2024-09-25 14:34:10 +02:00
estib
1368d87ed0
Base branch divergence resolution
...
Allow the user to choose how to resolve the base-branch divergence
2024-09-25 14:05:04 +02:00
Caleb Owens
b76baaf106
Merge
2024-09-25 13:06:06 +02:00
Caleb Owens
a0359486ad
Remove unrequired utils package
...
* Ref https://github.com/storybookjs/storybook/pull/29008
2024-09-25 00:17:59 +02:00
Caleb Owens
2793bc4f13
Bump to release versions
2024-09-25 00:17:45 +02:00
Jeppe Reinhold
f27050018a
Upgrade to Storybook 8.3.0-beta.0, introduce VItest testing to UI package
2024-09-25 00:09:06 +02:00
Esteban Vega
598d60fbed
Merge pull request #4971 from gitbutlerapp/make-select-generic
2024-09-24 20:06:00 +02:00
Caleb Owens
8a84753e92
Merge branch 'master' into Testing-rebase
2024-09-24 20:00:38 +02:00
Caleb Owens
f74f2dcf26
More tests!
2024-09-24 19:52:21 +02:00
Kiril Videlov
86460fb675
Merge pull request #4964 from Byron/commit-with-headers
...
`gitoxide` for commit with headers
2024-09-24 18:47:29 +02:00
