gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-27 09:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
10,013 Commits 147 Branches 1,024 Tags 64 MiB
0ebb6f6036
Commit Graph

10013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kiril Videlov
0ebb6f6036 Expose stackBranches on VirtualBranchReference in the UI 
To be used for rendering the updated design that shows the top-of-stack branch
 2024-11-05 14:08:52 +01:00
Kiril Videlov
d763258bc8 Adds a method commits to Branch 2024-11-03 22:57:07 +01:00
Pavel Laptev
fdbf545179
Update StackingSeriesHeaderContextMenu.svelte (#5436) 2024-11-05 10:44:50 +01:00
ndom91
1bca738991 fix: BranchPreview.svelte 
fix: BranchPreview.svelte move commitCard import
 2024-11-05 10:36:12 +01:00
ndom91
d3df6a2776 feat: remove CommitCard usage from BranchPreview and BaseBranch view 2024-11-05 10:36:12 +01:00
Mattias Granlund
252ac974be Fix bug preventing file context menu to open 
- was happening for selected items
 2024-11-04 23:34:34 +01:00
Caleb Owens
72fe2556a7
Merge pull request #5432 from gitbutlerapp/fix-getting-stuck-in-onboarding 
Fix getting stuck in onboarding
 2024-11-04 19:18:22 +01:00
Caleb Owens
645845720b Fix getting stuck in onboarding 2024-11-04 18:56:14 +01:00
Esteban Vega
1fcf6a4763
Merge pull request #5428 from gitbutlerapp/e-branch-3 
fix: Hunk dependencies account for complete overwrite
 2024-11-04 18:44:33 +01:00
Kiril Videlov
589bbb2392
Merge pull request #5421 from gitbutlerapp/refactor-virtual-branch-commit 
Remove files from VirtualBranchCommit struct
 2024-11-04 18:42:31 +01:00
Caleb Owens
596c60cbbc Fix select many casing 2024-11-04 18:12:27 +01:00
Mattias Granlund
36c620414f Remove files from VirtualBranchCommit struct 
- loaded separately in the client
 2024-11-04 18:06:18 +01:00
Mattias Granlund
eea3e13244 Add From impl for FileDiff -> RemoteBranchFile 
- eliminates some code duplication
 2024-11-04 18:05:31 +01:00
Mikael Carpenter
b311bd841d refactor: bring back the pre and ensure it wraps 2024-11-04 17:52:49 +01:00
Mikael Carpenter
afca5c5b45 fix: move errorMessage to the content slot 
Text wasn't wrapping, but this looks a little more idiomatic for this codebase given how the InfoMessage component is used
 2024-11-04 17:52:49 +01:00
ndom91
829163411e fix: Tauri v2 linux dependencies 2024-11-04 17:40:20 +01:00
estib
b38839f5ed fix: Hunk dependencies account for complete overwrite 
Handle the computation of dependencies when a patch overrides a hunk completely.
Also handle the cases of determining the intersection of changes when deleting complete files
 2024-11-04 17:26:39 +01:00
Caleb Owens
75cbc282a8 Use HTMLElementTagNameMap for createElement 2024-11-04 16:53:28 +01:00
Caleb Owens
2d4937a6b9 Remove unrequired onDestroy hook 2024-11-04 16:52:10 +01:00
Caleb Owens
4e735be872 Use once rather than manually removing event listener 2024-11-04 16:51:45 +01:00
Caleb Owens
6212b43d3d Remove seemingly unused event listner remover 2024-11-04 13:41:07 +01:00
Caleb Owens
34ac6a8db4 Move chips code about 2024-11-04 12:08:30 +01:00
Mattias Granlund
b269bbf08f Fix performance problem with file drag & drop 
- fixes manual use of a svelte action
- pass store to DraggableFile instead of updating selection list
- refactor file selection
 2024-11-04 11:46:32 +01:00
Kiril Videlov
a9cb841717
Merge pull request #5419 from gitbutlerapp/kv-branch-2 
Remove unnecessary field remote_commit_ids_by_change_id
 2024-11-03 20:46:28 +01:00
Kiril Videlov
51c36128ce Remove unnecessary field remote_commit_ids_by_change_id 2024-11-03 20:37:27 +01:00
Kiril Videlov
c9005523c9
Merge pull request #5415 from gitbutlerapp/kv-branch-2 
fix(stack): branch_base takes commit id directly
 2024-11-03 14:03:40 +01:00
Kiril Videlov
4e3eabfad7 fix(stack): branch_base takes commit id directly 
Using change ID for the merge base is not relevant
 2024-11-03 13:57:18 +01:00
Kiril Videlov
8fe38eadd7
Merge pull request #5414 from gitbutlerapp/minor-stack-refactor 
Renames PatchReference to Branch and other minor stack refactors
 2024-11-03 13:41:40 +01:00
Kiril Videlov
64c28d7008 Fix a bug in commit_by_oid_or_change_id 
It now correctly finds the commit if it happens to be the merge base and is referenced with changeID instead of commitID
 2024-11-03 13:29:27 +01:00
Kiril Videlov
49ef4d5d27 Introduce a branch_base method on Stack for discovering the base of a branch 2024-11-03 12:53:12 +01:00
Kiril Videlov
64cba8ebfc Rename type PatchReference to Branch for clarity 2024-11-03 12:16:45 +01:00
Kiril Videlov
3a383e19bd
Merge pull request #5386 from gitbutlerapp/kv-branch-1 
Fixes a bug where incorrect remote commits are shown when remote was rebased
 2024-11-03 00:33:17 +01:00
Kiril Videlov
e3b647b073
Merge pull request #5411 from gitbutlerapp/performance 
use gitoxide for merging trees
 2024-11-02 21:25:30 +01:00
Sebastian Thiel
e4079e5578
avoid duplicate MD5 hash generation 2024-11-02 19:54:08 +01:00
Sebastian Thiel
4c8d270d8a
Use gitoxide or is_integrated(). 
This is the most expensive call as it's possible to trigger a lot
of merges.

Also improve performance by aborting the merge as early as it's
known that there is a conflict.
 2024-11-02 19:23:53 +01:00
Sebastian Thiel
7327a5791b
Use the latest version of gitoxide with support for merging trees. 2024-11-02 15:25:50 +01:00
Sebastian Thiel
e8071419b0
remove ineffective diff options when diffing trees. 
These options were related to the worktree, which won't take part in this
kind of diff.
 2024-11-02 15:20:56 +01:00
Sebastian Thiel
69979807fe
The UUID crate always needs V4, so have that feature in the workspace. 
Some crates use it from the workspace as if it had that feature,
but the reason they compile is only due to compiling a crate higher
up that sets the feature, which transitively affects the crate in question.

When building `gitbutler-diff` for instance, the build will fail.
 2024-11-02 14:48:18 +01:00
Kiril Videlov
2ba4cb2e77
Merge pull request #5410 from gitbutlerapp/move-patch-reference-to-stack-crate 
Refactor: move patch reference structs to the stack crate
 2024-11-02 14:11:06 +01:00
Kiril Videlov
736ef0d648 Refactor: move patch reference structs to the stack crate 
The separation no longer makes sense
 2024-11-02 13:24:53 +01:00
Kiril Videlov
9ae182fac7
Merge pull request #5409 from gitbutlerapp/kv-branch-2 
Stack - small refactors
 2024-11-02 13:09:26 +01:00
Kiril Videlov
eab3f6208e Refactor Stack: make initialized() return Result 
This way we dont need to repeat the error message in places where that is checked
Also make it private
 2024-11-02 12:30:36 +01:00
Kiril Videlov
0a79974601 Refactor: add useful functions e.g. getting the stack commits or merge base to the Stack impl 
Ideally we can move to a state where these types of operations have single well tested implementations
 2024-11-02 12:16:05 +01:00
Kiril Videlov
d855660f25 refactor: stack tests - remove initialize function call 
Stack cant be created unitialized anymore
 2024-11-02 11:21:23 +01:00
Kiril Videlov
79cd76305f
Merge pull request #5406 from gitbutlerapp/refactorz 
Remove old commit reorder implementation
 2024-11-02 10:18:53 +01:00
Kiril Videlov
eea5ac4213
Merge pull request #5399 from gitbutlerapp/gitbutler-settings 
Introduce gitbutler-settings crate
 2024-11-02 00:22:52 +01:00
Kiril Videlov
b9825f1bd1 Remove legacy commit reorder code 2024-11-01 21:18:05 +01:00
Kiril Videlov
555a5a27e4 Remove old reorder commit in UI 2024-11-01 20:26:45 +01:00
Kiril Videlov
2604cdd6cd
Merge pull request #5405 from gitbutlerapp/dependabot/cargo/rust-updates-9e20b0c220 
build(deps): bump the rust-updates group across 1 directory with 13 updates
 2024-11-01 19:40:58 +01:00
dependabot[bot]
314840a46e
build(deps): 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 |
| --- | --- | --- |
| [uuid](https://github.com/uuid-rs/uuid) | `1.10.0` | `1.11.0` |
| [serde](https://github.com/serde-rs/serde) | `1.0.210` | `1.0.214` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.64` | `1.0.66` |
| [tokio](https://github.com/tokio-rs/tokio) | `1.40.0` | `1.41.0` |
| [anyhow](https://github.com/dtolnay/anyhow) | `1.0.89` | `1.0.92` |
| [futures](https://github.com/rust-lang/futures-rs) | `0.3.30` | `0.3.31` |
| [console-subscriber](https://github.com/tokio-rs/console) | `0.4.0` | `0.4.1` |
| [once_cell](https://github.com/matklad/once_cell) | `1.20.1` | `1.20.2` |
| [reqwest](https://github.com/seanmonstar/reqwest) | `0.12.8` | `0.12.9` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.128` | `1.0.132` |
| [file-id](https://github.com/notify-rs/notify) | `0.2.1` | `0.2.2` |
| [clap](https://github.com/clap-rs/clap) | `4.5.19` | `4.5.20` |
| [regex](https://github.com/rust-lang/regex) | `1.11.0` | `1.11.1` |



Updates `uuid` from 1.10.0 to 1.11.0
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.10.0...1.11.0)

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

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

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

Updates `anyhow` from 1.0.89 to 1.0.92
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.89...1.0.92)

Updates `futures` from 0.3.30 to 0.3.31
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31)

Updates `console-subscriber` from 0.4.0 to 0.4.1
- [Release notes](https://github.com/tokio-rs/console/releases)
- [Changelog](https://github.com/tokio-rs/console/blob/main/release-plz.toml)
- [Commits](https://github.com/tokio-rs/console/compare/console-subscriber-v0.4.0...console-subscriber-v0.4.1)

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

Updates `reqwest` from 0.12.8 to 0.12.9
- [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.8...v0.12.9)

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

Updates `file-id` from 0.2.1 to 0.2.2
- [Release notes](https://github.com/notify-rs/notify/releases)
- [Changelog](https://github.com/notify-rs/notify/blob/main/CHANGELOG.md)
- [Commits](https://github.com/notify-rs/notify/compare/file-id-0.2.1...file-id-0.2.2)

Updates `clap` from 4.5.19 to 4.5.20
- [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.19...clap_complete-v4.5.20)

Updates `regex` from 1.11.0 to 1.11.1
- [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.11.0...1.11.1)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- 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: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: futures
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: console-subscriber
  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-patch
  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: file-id
  dependency-type: direct:production
  update-type: version-update:semver-patch
  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-patch
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-11-01 18:16:24 +00:00