gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-22 00:51:38 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,357 Commits 155 Branches 1,065 Tags 61 MiB
afc270b561
Commit Graph

9357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kiril Videlov
f699b72768 Implement support for creating and updating Series description 2024-10-02 18:20:23 +02:00
estib
ef418a20d7 move commit: Prefer rebase 
- Prefer rebase than calculating the commit out of the diff
 2024-10-02 17:38:51 +02:00
Esteban Vega
c4fc0923ce
Merge pull request #5017 from gitbutlerapp/add-scroll-area-to-the-edit-mode 
Edit mode: Add a max height and scrollable container
 2024-10-02 13:28:19 +02:00
Pavel Laptev
3b280597fa layout update + remove "ActionView" component 2024-10-02 12:07:11 +02:00
estib
337096a254 move commit: Add tests for multiple commits 
- Add tests for moving commits in between branches that have exisiting commits in them
- Assert the contents of the commit and uncommitted files
 2024-10-02 12:00:02 +02:00
Kiril Videlov
7d9f440fd6 Fix listing of stack series 2024-10-02 11:40:45 +02:00
dependabot[bot]
7ca8d91923
Bump tonic from 0.12.1 to 0.12.3 in the cargo group 
Bumps the cargo group with 1 update: [tonic](https://github.com/hyperium/tonic).


Updates `tonic` from 0.12.1 to 0.12.3
- [Release notes](https://github.com/hyperium/tonic/releases)
- [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/tonic/compare/v0.12.1...v0.12.3)

---
updated-dependencies:
- dependency-name: tonic
  dependency-type: indirect
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-02 09:27:48 +00:00
Mattias Granlund
3008244201 Fix errors that appeared after svelte plugin upgrade 2024-10-02 11:26:15 +02:00
Mattias Granlund
a93d87331f Bump npm versions of svelte plugins 2024-10-02 11:26:15 +02:00
Mattias Granlund
332bbb3c1d Fix bind:this={} for Svelte5 components 
- needs `ReturnType` and `typeof` to work correctly
- svelte-check does not recognise this type bug yet
- vscode svelte plugin started complaining a week ago
 2024-10-02 11:25:31 +02:00
Pavel Laptev
3470a73999 header "files amount" badge added 2024-10-02 11:21:16 +02:00
estib
88b0f204bf Edit mode: Add a max height and scrollable container 
In order to be able to display large edit mode files list without having to scroll the whole page to the bottom, add a scrollable container to the commits file list
 2024-10-02 10:01:52 +02:00
Kiril Videlov
03659e4731 Add tests for Stack method push_series 2024-10-02 01:49:12 +02:00
Kiril Videlov
b5325e2d55 Add tests for Stack method update_series 2024-10-02 01:20:37 +02:00
Kiril Videlov
28a6e0a2bf Fixe an issue with Stack.add_series 2024-10-01 23:46:22 +02:00
Kiril Videlov
9ce6dd8635 Rename Stack trait methods to refer to 'series' 2024-10-01 21:51:53 +02:00
Kiril Videlov
4cf5983dfb Stacking: maintain correct order of heads when updating 2024-10-01 18:28:24 +02:00
dependabot[bot]
374085a52d
Bump tauri-plugin-single-instance from 677bade to 0b59bc7 
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `677bade` to `0b59bc7`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](677bade908...0b59bc7096)

---
updated-dependencies:
- dependency-name: tauri-plugin-single-instance
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-01 16:04:23 +00:00
dependabot[bot]
e0f773d4b1
Bump tauri-plugin-log from 677bade to 0b59bc7 
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace) from `677bade` to `0b59bc7`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](677bade908...0b59bc7096)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-01 16:03:57 +00:00
dependabot[bot]
1010a48143
Bump tauri-plugin-window-state from 677bade to 0b59bc7 
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `677bade` to `0b59bc7`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](677bade908...0b59bc7096)

---
updated-dependencies:
- dependency-name: tauri-plugin-window-state
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-01 16:03:31 +00:00
Kiril Videlov
72e6004f1c Stack: move functions for manipulating heads to own module 2024-10-01 17:41:33 +02:00
Kiril Videlov
00e2b891dd Stacking: Assert no loose commits can be created (outside of a series) 2024-10-01 17:37:26 +02:00
Esteban Vega
b33c7b0486
Merge pull request #5009 from gitbutlerapp/markdown-renderers 2024-10-01 17:26:32 +02:00
Caleb Owens
8d27806f5e
Merge pull request #5008 from gitbutlerapp/Fix-applying-mergable-branch 
Added the tests
 2024-10-01 17:23:17 +02:00
Kiril Videlov
1b953d286c Stacking: enforce that patch references point to changeIDs when available 2024-10-01 17:19:04 +02:00
estib
7ce815a7ca Markdown: Add BR and strong 
Add new-line and bold-text rendereres for the Markdown component
 2024-10-01 17:15:31 +02:00
Caleb Owens
a468ec7783 Added the tests 2024-10-01 17:12:46 +02:00
Esteban Vega
d24b467ecb
Merge pull request #4997 from gitbutlerapp/ai-pr-methods 
ai: Methods for PR summarization
 2024-10-01 16:45:43 +02:00
Kiril Videlov
04c17656bb Stacking: Maintain the correct heads order when adding new ones 2024-10-01 16:12:49 +02:00
Mattias Granlund
1cdc3b7110 Add patch series to vbranch API struct 2024-10-01 16:09:07 +02:00
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