gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,304 Commits 148 Branches 1,032 Tags 66 MiB
abde2a03b6
Commit Graph

8304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Thiel
d1089f5d6e
update Cargo.lock with latest gix 
This was forgotten unfortunately.
 2024-07-19 10:44:48 +02:00
Sebastian Thiel
ddfd6b95eb
conflicts::mark() with newline check 
Error early, instead of having dubious issues later.
 2024-07-19 10:44:12 +02:00
Sebastian Thiel
0fbfa141b4
Don't touch disk once per path to conflict::resolve() multiple of them 2024-07-19 10:44:12 +02:00
Sebastian Thiel
5946c4ca9a
conflict::*()functions don't impose UTF-8 on paths 
That way it's compatible to more kinds of paths, on more filesystem.
It assumes that the content of the `conflict` file is never moved
across platforms.
 2024-07-19 10:44:12 +02:00
Mattias Granlund
b1349ccd62 Rename file gitHostService.ts -> gitHost.ts 2024-07-19 10:22:30 +02:00
Mattias Granlund
c7d0be9f33 Fix bug where prs on other remotes sorts last 2024-07-18 23:40:02 +01:00
Mattias Granlund
5fb79bd15d Only amend specific commit if hunk locked to previous change 
- the only commit that can be amended is the one the current change depends on
 2024-07-18 22:02:29 +01:00
Pavel Laptev
2c9213580f
UX: Do not close the commit dialog after commit (#4437) 2024-07-18 21:53:30 +02:00
Pavel Laptev
0c7678fa04
UXUI - Profile settings (#4436) 
* UI: Unnecessary divider line removed

* hover background update

* InfoMessage: content margin update

* Authorize banner component + integration page undisabled

* "Integration" icon update
 2024-07-18 21:04:09 +02:00
Sebastian Thiel
dca8a94f48
Merge pull request #4432 from Byron/update-gix-path 
update `gix` to the latest version for its improved `git.exe` discovery on Windows
 2024-07-18 15:23:23 +02:00
Pavel Laptev
153bc0916b
Merge pull request #4434 from gitbutlerapp/Update--Normilise-branch-name-function 
refactor: Normalize branch name by replacing invalid characters with hyphens.
 2024-07-18 14:45:16 +02:00
Mattias Granlund
a7023ee359 Use correct pr prop for enabling/disabling merge button 2024-07-18 13:43:50 +01:00
Pavel Laptev
efb5c13725 refactor: Normalize branch name by replacing invalid characters with hyphens. 2024-07-18 14:32:30 +02:00
Pavel Laptev
936f026b4d
Fix: correct the role name (#4433) 
`listbox` should contain `option` items
 2024-07-18 12:35:03 +02:00
Sebastian Thiel
2e3f261bd2
update gix to the latest version for its improved git.exe discovery on Windows 
Instead of hard-coding two known paths, it will dynamically discover the right
location, handling different Windows install-locations automatically, using the
very portable and easy-to-use environment variables.
 2024-07-18 10:41:33 +02:00
Sebastian Thiel
af21b9c8a4
Merge pull request #4428 from JMonsorno/EmptyHistory 
Check for empty data first as history can be empty.
 2024-07-18 10:39:00 +02:00
Sebastian Thiel
5e263967f3
assume the type-system knows that data can't be undefined 2024-07-18 10:30:18 +02:00
Pavel Laptev
58615d6b01
Files-list-refactor (#4430) 
* Blur the selected item on `Esc`, elements role attr improved

* Removed `updateFocus` function

This function cause the autofocus on the previous selected item.

* Add semantic role to BranchFilesList component.

* Rearange attributes order

* Fix the Playwright test

* Fix arrow navigation
 2024-07-18 02:28:54 +02:00
Jason Monsorno
eedb1095c1
Merge branch 'master' into EmptyHistory 2024-07-17 20:22:41 -04:00
Pavel Laptev
2c2c96328f
Revert "Focus on the last selected item bug (#4421)" (#4429) 
This reverts commit c857d1005d.
 2024-07-18 01:50:40 +02:00
Pavel Laptev
c857d1005d
Focus on the last selected item bug (#4421) 
* Blur the selected item on `Esc`, elements role attr improved

* Removed `updateFocus` function

This function cause the autofocus on the previous selected item.

* Add semantic role to BranchFilesList component.

* Rearange attributes order

* Fix the Playwright test
 2024-07-18 01:29:08 +02:00
Jason Monsorno
93e8e53c2f Check for empty data first as history can be empty. 2024-07-17 17:17:22 -04:00
Kiril Videlov
d766220eae
Merge pull request #4425 from gitbutlerapp/move-diff-code-to-a-crate 
move hunk and diff code to a separate crate, out of the branch one
 2024-07-17 20:27:03 +02:00
Kiril Videlov
6101c5c66f
move hunk and diff code to a separate crate, out of the branch one 2024-07-17 20:16:48 +02:00
Kiril Videlov
6a15002ed0
Merge pull request #4424 from gitbutlerapp/remove-cirular-dependency-between-virual-and-diff-modules 
remove cirular dependency between virual and diff modules
 2024-07-17 19:11:04 +02:00
Kiril Videlov
e6ccf764ee
supresss clippy warning about type complexity 2024-07-17 18:48:45 +02:00
Kiril Videlov
d5fffbd4ac
move HunkLock struct to branch actions crate 2024-07-17 18:30:23 +02:00
Kiril Videlov
5d74440d4c
remove lock attribute from diff hunk structs 2024-07-17 18:23:49 +02:00
Mattias Granlund
2a08b419ea Fix broken debounce in update interval 
- this broke the 15 minute auto-updating interval
 2024-07-17 11:32:31 +01:00
Kiril Videlov
9eeb47b63f
get_applied_status returns locks 2024-07-17 12:01:50 +02:00
Nico Domino
26240ec190
fix: update docs push-on-release action (#4418) 2024-07-17 09:35:37 +00:00
Nico Domino
ab5af61960
feat: use pnpm@9.5.0 catalogs feature to keep versions in sync within monorepo (#4411) 2024-07-17 10:48:51 +02:00
Kiril Videlov
3ad6b3fd10
Merge pull request #4409 from gitbutlerapp/dependabot/cargo/rust-updates-9e51e1549e 
Bump the rust-updates group across 1 directory with 8 updates
 2024-07-16 22:14:28 +02:00
Kiril Videlov
eed5643569
Merge pull request #4410 from Byron/lock-upgrades 
clearer read-write separation
 2024-07-16 22:14:16 +02:00
Caleb Owens
b5d2c8a54f
Merge pull request #4415 from gitbutlerapp/update-svelte 
Fix up branches list
 2024-07-16 19:48:03 +02:00
Caleb Owens
90d1465e5d
Fix up branches list 2024-07-16 19:39:46 +02:00
Kiril Videlov
99dfb0084f
Merge pull request #4414 from gitbutlerapp/revert-4402-rename-trunk-to-target 
Revert "rename Trunk to Target in the UI"
 2024-07-16 19:24:13 +02:00
Kiril Videlov
881e4b5289
Revert "rename Trunk to Target in the UI" 2024-07-16 19:22:46 +02:00
Caleb Owens
c00a76bcce
Merge pull request #4413 from gitbutlerapp/update-svelte 
Fix everything runes runed
 2024-07-16 18:27:56 +02:00
Caleb Owens
d203ed897c
Fix everything runes runed 2024-07-16 18:25:16 +02:00
Sebastian Thiel
4526006bf9
Show that not all users of get_applied_status need write permissions... 
...according to tests.
 2024-07-16 17:33:53 +02:00
dependabot[bot]
cdafe5bc2c
Bump the rust-updates group across 1 directory with 8 updates 
Bumps the rust-updates group with 8 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [serde](https://github.com/serde-rs/serde) | `1.0.203` | `1.0.204` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.61` | `1.0.62` |
| [console-subscriber](https://github.com/tokio-rs/console) | `0.2.0` | `0.3.0` |
| [open](https://github.com/Byron/open-rs) | `5.2.0` | `5.3.0` |
| [sysinfo](https://github.com/GuillaumeGomez/sysinfo) | `0.30.12` | `0.30.13` |
| [rstest](https://github.com/la10736/rstest) | `0.20.0` | `0.21.0` |
| [clap](https://github.com/clap-rs/clap) | `4.5.8` | `4.5.9` |
| [diffy](https://github.com/bmwill/diffy) | `0.3.0` | `0.4.0` |



Updates `serde` from 1.0.203 to 1.0.204
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.203...v1.0.204)

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

Updates `console-subscriber` from 0.2.0 to 0.3.0
- [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.2.0...console-subscriber-v0.3.0)

Updates `open` from 5.2.0 to 5.3.0
- [Release notes](https://github.com/Byron/open-rs/releases)
- [Changelog](https://github.com/Byron/open-rs/blob/main/changelog.md)
- [Commits](https://github.com/Byron/open-rs/compare/v5.2.0...v5.3.0)

Updates `sysinfo` from 0.30.12 to 0.30.13
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/GuillaumeGomez/sysinfo/commits/v0.30.13)

Updates `rstest` from 0.20.0 to 0.21.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.20.0...v0.21.0)

Updates `clap` from 4.5.8 to 4.5.9
- [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.8...v4.5.9)

Updates `diffy` from 0.3.0 to 0.4.0
- [Changelog](https://github.com/bmwill/diffy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bmwill/diffy/commits)

---
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: console-subscriber
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: open
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: sysinfo
  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: diffy
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-16 15:22:10 +00:00
Kiril Videlov
9e0a0728e1
Merge pull request #4408 from gitbutlerapp/upgrade-windows-crate 
upgrade version of the windows crate
 2024-07-16 17:09:33 +02:00
Kiril Videlov
cc8d7c9206 upgrade version of the windows crate 2024-07-16 16:48:42 +02:00
Kiril Videlov
8b96b2ec70
Merge pull request #4406 from gitbutlerapp/upgrade-mock-instant-version 
upgrade mock_instant version
 2024-07-16 15:59:38 +02:00
Kiril Videlov
2f06fcb7cf
upgrade mock_instant version 2024-07-16 15:51:15 +02:00
Nico Domino
b63f3855e7
fix: change button tooltip event listeners to pointer* versions (#4405) 2024-07-16 15:29:25 +02:00
Nico Domino
4373b1c56e
fix: more docs gha release cleanup (#4403) 2024-07-16 13:21:16 +00:00
Kiril Videlov
205a3ea11b
Merge pull request #4404 from gitbutlerapp/can-not-manage-hunk-depends-on-multiple-branches 
feat: Improve hunk poisoning message in FileDiff.svelte
 2024-07-16 15:16:29 +02:00
Kiril Videlov
fc622e60a6
feat: Improve hunk poisoning message in FileDiff.svelte 2024-07-16 15:14:48 +02:00