Commit Graph

9156 Commits

Author SHA1 Message Date
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
Caleb Owens
bbbf81c4c1 Start to introduce index resolution tests 2024-09-24 17:01:38 +02:00
Caleb Owens
9802afe8bf
Merge pull request #4968 from gitbutlerapp/Refactor-rebase.rs
Refactor some of rebase.rs
2024-09-24 17:00:10 +02:00
Esteban Vega
60c33f135e
Merge pull request #4970 from gitbutlerapp/clean-up-update-base-button
clean-up: Remove unnecessary function declaration
2024-09-24 16:55:12 +02:00
Nico Domino
a7325e4d2d
fix: log and show toast (#4965) 2024-09-24 16:03:02 +02:00
Sebastian Thiel
0e63323456
remove commit-buffer as it's not needed anymore for dealing with headers. 2024-09-24 15:57:58 +02:00
Sebastian Thiel
fe7d5d92e7
add crate to keep gitoxide conversions to prevent duplication 2024-09-24 15:54:07 +02:00
estib
9f6672b4e3 clean-up: Remove unnecessary function declaration 2024-09-24 14:19:50 +02:00
Esteban Vega
3bed869ded
Merge pull request #4963 from gitbutlerapp/factor-out-integrate-upstream-modal
IntegrateUpstreamModal: Factor out the modal
2024-09-24 13:52:14 +02:00
estib
adc6357a80 Use the exposed state of the integrate upstream modal
Export the state of whether the modal is open or not.
Use it in the base branch page and the update base button.
2024-09-24 13:37:58 +02:00
estib
6ce77554fe Modal: Expose the open or closed state
Expose the state of whether the modal is open or not.

[Some more info about this pattern.](https://github.com/sveltejs/svelte/issues/11974#issuecomment-2157837477)
2024-09-24 13:36:25 +02:00
Caleb Owens
a395dab091 Refactor some of rebase.rs 2024-09-24 13:20:02 +02:00
Sebastian Thiel
d16656816d
Use gix to create signed commits with multiple headers. 2024-09-24 13:02:34 +02:00
Caleb Owens
20fa6cb6b6
Merge pull request #4967 from gitbutlerapp/Update-shell-scripts-for-dinosaurs-who-are-affraid-of-pnpm
Update shell scripts for dinosaurs who are affraid of pnpm
2024-09-24 12:50:16 +02:00
Caleb Owens
1b6945c236 Update shell scripts for dinosaurs who are affraid of pnpm 2024-09-24 12:41:42 +02:00
Caleb Owens
7c9401dd49
Merge pull request #4781 from gitbutlerapp/Fix-snapshot-details-transformer
Fix snapshot details transformer
2024-09-24 12:34:08 +02:00
Caleb Owens
2d52e3737f
Merge pull request #4959 from gitbutlerapp/sc-patch-stacks-2
Add basic views into stacks
2024-09-24 12:07:22 +02:00
Caleb Owens
e5115aa559 *throws corkscrew over sholder* 2024-09-24 12:05:36 +02:00
Sebastian Thiel
ada4b17c47
Make sure test doesn't fail if the default branch isn't master.
Ideally repository creation is standardized to avoid these issues,
but for now this is just the minimal fix to make the test suite
work for me.
2024-09-24 11:08:10 +02:00
Sebastian Thiel
9f6c01c5ab
make tests work under more conditions
Currently tests rely to be run globally so `branch-actions` can set
the required feature flags.

Now more crates that need it will set it so that their tests can be
run individually.
2024-09-24 11:01:13 +02:00
estib
536dfac6e4 IntegrateUpstreamModal: Factor out the modal
Factor out the modal for upstream integration into a dedicated component so that it can be shared easily
2024-09-24 09:54:13 +02:00
Kiril Videlov
4c11a96456
Merge pull request #4962 from gitbutlerapp/Fix-state-for-file-selections-not-propagating
Fix state for file selections not propagating
2024-09-24 09:33:19 +02:00
Esteban Vega
8fc1e0d77f
Merge pull request #4928 from gitbutlerapp/fix-use-correct-branch-name 2024-09-24 00:36:47 +02:00
Caleb Owens
9c23e577ba Constrain FilIdSelection API 2024-09-23 21:00:53 +02:00
Caleb Owens
edc0bd1a1d Fix state for selections not propagating 2024-09-23 20:26:34 +02:00
Scott Chacon
d2444de8c5 add basic views into stacks
this adds a way to view the timeline, branches and stacks, create stacks and more. none of this is pretty, but we're just exercising the server APIs
2024-09-23 16:26:25 +02:00
Nico Domino
82099fe43e
fix: submit commit title/desc with ctrl+Enter everywhere (#4958) 2024-09-23 16:16:30 +02:00
Esteban Vega
69b304bc33
Merge pull request #4948 from gitbutlerapp/conflict-fix-commit-info
Display the author and commit title in the edit mode
2024-09-23 14:43:18 +02:00
Esteban Vega
48c5e18db1
Merge pull request #4956 from gitbutlerapp/remove-unnecessary-object-utils
refactor: replace custom entries with Object.entries
2024-09-23 13:37:06 +02:00
estib
22e7f46950 refactor: replace custom entries with Object.entries
Remove custom entries utility and replace its usage with 
Object.entries across hotkeys and branch utility files.
2024-09-23 12:21:18 +02:00
Nico Domino
992496f6a5
fix: protect read file from path traversal (#4943) 2024-09-22 17:12:45 +00:00
Pavel Laptev
edbc8eb3a3
Small UI fixes (#4950)
* fix the hunk header font-weight

* Text case fix

* Update sections order

* Fix "Full data synchronization" layout and toggles
2024-09-19 14:09:29 +02:00
estib
c15dbbf083 Edit Mode page: Display commit info
Display information about the commit in the edit mode page
2024-09-19 14:02:05 +02:00
estib
838002fa06 Commit service
Create a service that enables searching inside a project for a commit information by its ID
2024-09-19 14:01:03 +02:00
estib
184629d1d4 Create a method to find a commit by its ID
Find a commit in the repository by its ID
2024-09-18 16:46:16 +02:00
Esteban Vega
ed85637ce1
Merge pull request #4947 from gitbutlerapp/edit-branch-poping-up
The edit branch should not be listed in the side bar
2024-09-18 15:07:08 +02:00
estib
d1c71898cc The edit branch should not be listed in the side bar
The `gitbutler/edit` branch should not be listed in the side bar of the application
2024-09-18 14:28:25 +02:00
Caleb Owens
f34d901c87
Merge pull request #4945 from gitbutlerapp/Fix-wrong-files-displaying-in-edit-mode
Fix wrong files displaying in edit mode
2024-09-18 12:18:27 +02:00
Caleb Owens
5e48159a83
Merge pull request #4944 from gitbutlerapp/Fix-line-manager-forkpoint-integrated
fix: Correct condition for removing right column
2024-09-18 12:18:06 +02:00
Nico Domino
cdae30d1a9
fix: use pull request template form (#4946) 2024-09-18 10:01:34 +00:00
Caleb Owens
9ed21936f5 fix: Correct condition for removing right column 2024-09-18 11:51:44 +02:00
Caleb Owens
224c03528b Improve index resolution 2024-09-18 11:45:38 +02:00
Caleb Owens
c991ec48a8
Merge pull request #4941 from gitbutlerapp/conflict-resolution-fix
fix: Calculate the right file tree when resolving
2024-09-18 11:29:42 +02:00
estib
4dca18ff3e fix: Calculate the right file tree when resolving
Get the correct file tree when resolving a conflict
2024-09-18 11:11:00 +02:00
Esteban Vega
7edaaa7db3
Merge pull request #4940 from gitbutlerapp/hunk-locking
Update the hunk locking style
2024-09-18 09:55:18 +02:00
estib
ccf7106f49 Update the hunk locking style
Update it following the feedback from Discord: https://discord.com/channels/1060193121130000425/1224366824305463337/1285608946870124617
2024-09-18 09:18:49 +02:00
Kiril Videlov
a01cac1baa
Merge pull request #4938 from gitbutlerapp/hunk-column-changes
fix: File section max line number & simplify hunk header calculation
2024-09-18 08:34:01 +02:00
Kiril Videlov
089af8e111
Merge pull request #4933 from gitbutlerapp/hunk-locking-design
HunkDiff: Display a lock if needed
2024-09-18 08:33:06 +02:00