gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 10:33:21 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,393 Commits 158 Branches 1,068 Tags 61 MiB
87a4c61b9f
Commit Graph

9393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kiril Videlov
7ab8fdf0b8
Merge pull request #5031 from gitbutlerapp/series-on-list-virtual-branches-order 
Fixes the order of series on the UI API (list_virtual_branches)
 2024-10-03 18:56:36 +02:00
Kiril Videlov
57753e43a8
Merge pull request #5030 from gitbutlerapp/rm-change-reference 
Refactor - removes the change_refernce module that what the initial imlementation of stacking
 2024-10-03 18:56:10 +02:00
Kiril Videlov
cd4ec147b1 Fixes the order of series on the UI API (list_virtual_branches) 
The UI needs the list starting with newest first.
Updated docs.
 2024-10-03 18:50:56 +02:00
Kiril Videlov
e63e876ca5 Refactor - removes the change_refernce module that what the initial imlementation of stacking 
This is now replaced with the more capable and correct `Stack` trait, implemented on `Branch`.

The new endpoints are:
create_series,
remove_series,
update_series_name,
update_series_description,
push_stack,
 2024-10-03 18:39:50 +02:00
estib
9dcbf8b756 PRDetailsModal: Don't fetch the PR template if no path is given 2024-10-03 14:01:08 +02:00
estib
7b71f40b7b PRDetailsModal: Add tab indexes 2024-10-03 14:00:03 +02:00
estib
17d8ef8428 PRDetailsModal: Update the preferred PR action 
Move the ability to select whether to create a Draft PR or a normal one to the Details modal
 2024-10-03 13:27:19 +02:00
Esteban Vega
ec4d1b941c
Merge pull request #5028 from gitbutlerapp/fix-update-the-dd-button-type 
fix: Update the type of the drop down button
 2024-10-03 12:41:16 +02:00
estib
94fa0fed5d fix: Update the type of the drop down button 
Fix up the type of variable used to refernce the drop down button in the PR button component
 2024-10-03 11:58:01 +02:00
Kiril Videlov
3fc1687f86
Merge pull request #5027 from gitbutlerapp/reverse-patches-in-stack-series 2024-10-03 07:22:34 +02:00
Kiril Videlov
fdf26be501
Merge pull request #5026 from gitbutlerapp/merge-base-range-optimization 2024-10-03 07:22:09 +02:00
Kiril Videlov
9c9c0fe5aa fix: list_virtual_branches series patch order should be newest to oldest 2024-10-03 06:16:03 +02:00
Kiril Videlov
d8c00133aa fix: Replace log range with merge base in Stack trait 2024-10-03 06:01:35 +02:00
Kiril Videlov
a1ea435e87
Merge pull request #5012 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-0b59bc7 
Bump tauri-plugin-window-state from `677bade` to `0b59bc7`
 2024-10-03 01:17:15 +02:00
Kiril Videlov
0f1eb8c9a3
Merge pull request #5013 from gitbutlerapp/dependabot/cargo/tauri-plugin-log-0b59bc7 
Bump tauri-plugin-log from `677bade` to `0b59bc7`
 2024-10-03 01:16:39 +02:00
Kiril Videlov
0122bb5dba
Merge pull request #5014 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-0b59bc7 
Bump tauri-plugin-single-instance from `677bade` to `0b59bc7`
 2024-10-03 01:16:17 +02:00
Kiril Videlov
4cd93a6733
Merge pull request #5020 from gitbutlerapp/dependabot/cargo/cargo-22a2db0795 
Bump tonic from 0.12.1 to 0.12.3 in the cargo group
 2024-10-03 01:15:48 +02:00
Kiril Videlov
b4f03c16d8
Merge pull request #5024 from gitbutlerapp/dependabot/cargo/rust-updates-0010f5dc81 
Bump the rust-updates group across 1 directory with 13 updates
 2024-10-03 01:14:33 +02:00
dependabot[bot]
69752599be
Bump the rust-updates group across 1 directory with 13 updates 
Bumps the rust-updates group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [serde](https://github.com/serde-rs/serde) | `1.0.209` | `1.0.210` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.63` | `1.0.64` |
| [backtrace](https://github.com/rust-lang/backtrace-rs) | `0.3.73` | `0.3.74` |
| [once_cell](https://github.com/matklad/once_cell) | `1.19.0` | `1.20.1` |
| [reqwest](https://github.com/seanmonstar/reqwest) | `0.12.7` | `0.12.8` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.127` | `1.0.128` |
| [pretty_assertions](https://github.com/rust-pretty-assertions/rust-pretty-assertions) | `1.4.0` | `1.4.1` |
| [tempfile](https://github.com/Stebalien/tempfile) | `3.12.0` | `3.13.0` |
| [tauri-build](https://github.com/tauri-apps/tauri) | `1.5.4` | `1.5.5` |
| [tokio-util](https://github.com/tokio-rs/tokio) | `0.7.11` | `0.7.12` |
| [rstest](https://github.com/la10736/rstest) | `0.22.0` | `0.23.0` |
| [clap](https://github.com/clap-rs/clap) | `4.5.16` | `4.5.19` |
| [regex](https://github.com/rust-lang/regex) | `1.10.6` | `1.11.0` |



Updates `serde` from 1.0.209 to 1.0.210
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.209...v1.0.210)

Updates `thiserror` from 1.0.63 to 1.0.64
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.63...1.0.64)

Updates `backtrace` from 0.3.73 to 0.3.74
- [Release notes](https://github.com/rust-lang/backtrace-rs/releases)
- [Commits](https://github.com/rust-lang/backtrace-rs/compare/0.3.73...0.3.74)

Updates `once_cell` from 1.19.0 to 1.20.1
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matklad/once_cell/compare/v1.19.0...v1.20.1)

Updates `reqwest` from 0.12.7 to 0.12.8
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.7...v0.12.8)

Updates `serde_json` from 1.0.127 to 1.0.128
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/1.0.127...1.0.128)

Updates `pretty_assertions` from 1.4.0 to 1.4.1
- [Release notes](https://github.com/rust-pretty-assertions/rust-pretty-assertions/releases)
- [Changelog](https://github.com/rust-pretty-assertions/rust-pretty-assertions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-pretty-assertions/rust-pretty-assertions/compare/v1.4.0...v1.4.1)

Updates `tempfile` from 3.12.0 to 3.13.0
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.12.0...v3.13.0)

Updates `tauri-build` from 1.5.4 to 1.5.5
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-build-v1.5.4...tauri-build-v1.5.5)

Updates `tokio-util` from 0.7.11 to 0.7.12
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.11...tokio-util-0.7.12)

Updates `rstest` from 0.22.0 to 0.23.0
- [Release notes](https://github.com/la10736/rstest/releases)
- [Changelog](https://github.com/la10736/rstest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/la10736/rstest/compare/v0.22.0...v0.23.0)

Updates `clap` from 4.5.16 to 4.5.19
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.16...clap_complete-v4.5.19)

Updates `regex` from 1.10.6 to 1.11.0
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.10.6...1.11.0)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: backtrace
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: once_cell
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: reqwest
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: pretty_assertions
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: tauri-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: rstest
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-02 22:37:53 +00:00
Kiril Videlov
a0fd42b7d6
Merge pull request #4992 from gitbutlerapp/stacking-api-v2 
stacking api v2
 2024-10-03 00:30:41 +02:00
Pavel Laptev
47c0bad9ac
fix: diff example "added/deleted" lines (#5023) 2024-10-03 00:22:00 +02:00
Kiril Videlov
ef91acc71a Fixes an issue initializing stacks 2024-10-03 00:17:58 +02:00
Kiril Videlov
e00f47aea5 list_virtual_branches now includes the series data 
at this point only local patches are returned
 2024-10-02 23:49:58 +02:00
Kiril Videlov
99e48e4f3e Initialize the Stack heads for branches during get_applied_status 2024-10-02 22:25:44 +02:00
Kiril Videlov
0ccd6709b6 Implementa helper Stack method for updating latest stack series head 2024-10-02 22:24:42 +02:00
Kiril Videlov
b8f69d9406 Wire up v2 stacking api as Tauri commands 2024-10-02 20:47:50 +02:00
Kiril Videlov
c94e8d121f Update of series name disallowed after push 2024-10-02 20:26:05 +02:00
Kiril Videlov
89960f6bfc Make stack initialization more forgiving 2024-10-02 19:28:29 +02:00
estib
c804699fd1 move commit: Check whether the commit is locked to it's ancestors 
If the commit being moved depends on changes made in any of the ancestor commits, raise an error.

Add integration tests for that
 2024-10-02 18:57:54 +02:00
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
Caleb Owens
f47fdd703b Introduce merge_base_octopussy 2024-10-02 14:59:11 +02:00
Caleb Owens
3f37e5aaf9 Use random names in commit_tree testing utility 2024-10-02 14:55:33 +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