gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 14:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,410 Commits 151 Branches 1,064 Tags 60 MiB
f2d2a7ae14
Commit Graph

9410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kiril Videlov
f2d2a7ae14
Merge pull request #5071 from gitbutlerapp/Add-extra-info-on-patch-series-remote_commit_id 
Add an extra field `remote_commit_id` on the API type `VirtualBranchCommit`
 2024-10-09 18:25:50 +02:00
Kiril Videlov
3978476b78 Add an extra field remote_commit_id on the API type VirtualBranchCommit 
This makes it possibe (and easy) for the UI to determine if there is another (different) commit on the remote for the same patch
 2024-10-09 18:15:10 +02:00
Kiril Videlov
f8c702cf03
Merge pull request #5070 from gitbutlerapp/switch-local-and-local-remote-colors 
switch "local" and "local-remote" colors
 2024-10-09 17:22:50 +02:00
Pavel Laptev
e05c1a4a08
Move dummy UI and minor code refactor (#5061) 
* update: storybook styles

* fix: Link button prop

* move borderless textarea to UI

* add: BorderlessTextarea story

* remove unused `autoHeight`

* simplify "Props" names

* migrate to Svelte 5: EmptyState component

* fix: autofocus when open the branches search

* eslint

* lint fixes

* lint fixes

---------

Co-authored-by: estib <stron@me.com>
 2024-10-09 17:00:35 +02:00
Nico Domino
531cbde1ff
fix: stackingCommitList reorder-dropzone and "add empty commit" btn rendering (#5066) 2024-10-09 16:59:37 +02:00
Pavel Laptev
488e6d2597 switch "local" and "local-remote" colors 2024-10-09 16:48:32 +02:00
ndom91
7858230812 fix: disable deleting series if there is only 1 2024-10-09 15:39:58 +02:00
ndom91
e5fbb18883 fix: reorient new series name modal action btns 2024-10-09 15:39:58 +02:00
Caleb Owens
773a31e5b5
Merge pull request #5068 from gitbutlerapp/Fix-ordering-and-conflict-viewing-and-diffing 
Make edit mode fantastic
 2024-10-09 15:34:50 +02:00
Caleb Owens
82b58b6875 Make edit mode fantastic 2024-10-09 15:27:20 +02:00
Caleb Owens
41c6f5ac5c
Merge pull request #5063 from gitbutlerapp/Float-conflicted-files 
Float unconflicted files in edit mode
 2024-10-09 15:00:48 +02:00
Kiril Videlov
9cc51ff84a
Merge pull request #5065 from gitbutlerapp/dependabot/cargo/tauri-plugin-context-menu-8d5854f 
Bump tauri-plugin-context-menu from `1cdd3b5` to `8d5854f`
 2024-10-09 14:59:03 +02:00
Kiril Videlov
92ccda6f96
Merge pull request #5060 from gitbutlerapp/Consistent-setting-of-stack-head-and-updating-series 
Consistent setting of stack head and updating series
 2024-10-09 11:57:39 +02:00
dependabot[bot]
e414d3d360
Bump tauri-plugin-context-menu from 1cdd3b5 to 8d5854f 
Bumps [tauri-plugin-context-menu](https://github.com/c2r0b/tauri-plugin-context-menu) from `1cdd3b5` to `8d5854f`.
- [Commits](1cdd3b5567...8d5854f186)

---
updated-dependencies:
- dependency-name: tauri-plugin-context-menu
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-09 09:36:08 +00:00
Mattias Granlund
aa4e1667c7 Enable prettier for .vscode files 
- unclear why these were ever ignored
 2024-10-09 11:31:08 +02:00
Caleb Owens
39f9f50296 Float unconflicted files in edit mode 2024-10-09 11:21:51 +02:00
Nico Domino
b3e3ebdb34
fix: migrate Icon.svelte to svelte 5 syntax (#4990) 
* fix: migrate Icon.svelte to svelte 5 syntax

* fix: prettier
 2024-10-09 01:49:31 +02:00
Kiril Videlov
87a4c61b9f Consistent setting of stack head updating the series 2024-10-08 22:25:19 +02:00
Kiril Videlov
915acd6afb Fixes a bug when validating stack target commit 2024-10-08 22:24:34 +02:00
Kiril Videlov
1aa47d00f2
Merge pull request #5059 from gitbutlerapp/refactor-Branch-and-Stack 
refactor Branch and Stack
 2024-10-08 19:49:38 +02:00
Kiril Videlov
34ca1f4a65 Merge master into refactor Branch and Stack 2024-10-08 19:40:17 +02:00
Caleb Owens
12782d5229
Merge pull request #5000 from gitbutlerapp/pr-5000 
FEARLESS REBASING
 2024-10-08 16:49:51 +02:00
Kiril Videlov
cfafc8d7b5 Make all places that create Stack also initialize it 2024-10-08 16:43:42 +02:00
Kiril Videlov
48bbe13d56 Rename StackExt.new to create 2024-10-08 16:37:07 +02:00
Kiril Videlov
570c974544 Rename StackActions to StackExt 
Closer to rust conventions
 2024-10-08 16:32:18 +02:00
Kiril Videlov
f172855c61 Adds a new method to StackActions 2024-10-08 16:12:21 +02:00
Kiril Videlov
ce9b136185 Rename Stack constructor function to new_uninitialized 
This describes it more accurately
 2024-10-08 16:05:23 +02:00
Kiril Videlov
f6d8bbc663 remove unused type 2024-10-08 16:03:22 +02:00
Kiril Videlov
d05d962cf8 Rename Branch to Stack 2024-10-08 15:59:27 +02:00
Esteban Vega
72e981f8cc
pr details follow up (#5054) 
* PR Details: CMD or Ctrl + Click opens the browser

* Segment: Optionally make it unfocusable

Control whethe the segment can be focused on tab, or not

* PR Details: Remove unused 'e' handler

* Borderless Textarea: Ability to autofocus

Optionally, autofocus the input field on mount

* PR Details: Update focus behavior

- Focus on the title input filed on mount
- Make the segments unfocusable

* design update

* Update PrDetailsModal.svelte

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
 2024-10-08 15:50:43 +02:00
Caleb Owens
99145f4aa4 Redo branch upstream integration 2024-10-08 15:49:58 +02:00
Kiril Videlov
9e9f3255a8 Remove some types out of the stack crate 
Seems i can get away without adding it
 2024-10-08 15:44:59 +02:00
Kiril Videlov
7ec59f8489 extract the Branch types to crate gitbutler-stack 2024-10-08 15:27:16 +02:00
Kiril Videlov
d78ebbe176 rename crate gitbutler-stack to gitbutler-stack-api 
This is needed to free up the name gitbutler-stack
 2024-10-08 14:53:23 +02:00
Kiril Videlov
0658920abc
Merge pull request #5057 from gitbutlerapp/Refactor-Branch-to-abstract-setting-and-getting-the-head-property 
Refactor Branch to abstract setting and getting the `head` property
 2024-10-08 13:21:31 +02:00
Kiril Videlov
5b7109e8ee refactor(Branch): implement set_head() and make field private 
This allows us to control the head setting and update the stack `heads` field accordingly
 2024-10-08 12:21:57 +02:00
Kiril Videlov
cb2c0d458e refactor(Branch): implement a head() method 
Moving the access to head behind a method so that we can eventually migrate to the `heads` field
 2024-10-08 12:23:38 +02:00
Caleb Owens
02307a5512
Merge pull request #5021 from gitbutlerapp/Test-and-refactor-branch-upstream-integration 
Introduce merge_base_octopussy
 2024-10-08 10:54:48 +02:00
Caleb Owens
8f9fd0cbe7 Extract branch_upstream_integration into it's own file 2024-10-07 18:02:21 +02:00
Caleb Owens
45fbb1af76 Remove old update_base_branch code 2024-10-07 17:46:28 +02:00
Caleb Owens
2f33d618d5 Remove succeeding rebase flag from the frontend 2024-10-07 17:31:08 +02:00
Caleb Owens
531672876f Remove edit mode flag from backend 2024-10-07 17:08:32 +02:00
Caleb Owens
5feacea05f
Merge pull request #5053 from gitbutlerapp/Refactor-edit-mode 
Use common primatives, and make sure conflicted trees are handled correctly
 2024-10-07 17:04:43 +02:00
Caleb Owens
2cb1358ac0 Use common primatives, and make sure conflicted trees are handled correctly 2024-10-07 16:51:24 +02:00
Caleb Owens
0c362ae6df
Merge pull request #5052 from gitbutlerapp/Refactor-tree-updating 
Extract tree updating into its own tested function
 2024-10-07 16:28:55 +02:00
Caleb Owens
82406810f0 Extract tree updating into its own tested function 2024-10-07 16:10:34 +02:00
Esteban Vega
cb90ca5e7c
Merge pull request #5037 from gitbutlerapp/pr-details 
PR details modal
 2024-10-07 14:37:20 +02:00
Pavel Laptev
f6621ba4d5 copy update 2024-10-07 14:33:22 +02:00
estib
efcfe0954e PrDetailsModal: Display the actualy body 
- Display the actual body value
- Generate the message on `shift` + `cmd` + g
 2024-10-07 14:14:38 +02:00
estib
455d67fb86 Prettier fixing 2024-10-07 14:07:20 +02:00