Commit Graph

8224 Commits

Author SHA1 Message Date
Kiril Videlov
27561fa7b8
simplify get_applied_status function signature 2024-07-20 21:57:45 +02:00
Kiril Videlov
84fda3838a
simplify get_workspace_head signature 2024-07-20 21:48:04 +02:00
Kiril Videlov
4125dcef3b
get remove vbranches list as function parameter 2024-07-20 21:44:20 +02:00
Kiril Videlov
4654529aa9
Merge pull request from gitbutlerapp/rm-commented-code
remove commented out code
2024-07-20 21:39:41 +02:00
Kiril Videlov
e41ff19dc0
remove commented out code 2024-07-20 21:31:52 +02:00
Kiril Videlov
2cf0c9723b
Merge pull request from gitbutlerapp/fix-listing-of-snapshots
fix listing of snapshots
2024-07-20 16:00:34 +02:00
Kiril Videlov
0e9b8c2957
fixes a situation in which listing of snapshots fails 2024-07-20 15:51:46 +02:00
Sebastian Thiel
9f9a0e3d01
Merge pull request from Byron/fix-4371
don't fail hard if there is no project metadata
2024-07-20 15:31:50 +02:00
Sebastian Thiel
a15d4332d7
Ignore failures when sending with Share project data and there is no project data ()
This seems to be the common case now, but let's keep that option in case that changes.
2024-07-20 15:27:45 +02:00
Kiril Videlov
ea5079b723
oplog - get a workdir tree in a safe manner 2024-07-20 14:31:43 +02:00
Kiril Videlov
18f2eef7b3
Merge pull request from gitbutlerapp/remove-refs-to-branch-controller
remove references to virtual branch controller from event handler
2024-07-20 13:48:50 +02:00
Kiril Videlov
b7e2f60b89
remove references to virtual branch controller from event handler
After recent refactors, this state is useless
2024-07-20 13:44:03 +02:00
Kiril Videlov
21e7953ac1
Merge pull request from Byron/optimize-one
optimize `is_commit_integrated()`
2024-07-20 13:35:49 +02:00
Kiril Videlov
603df1c998
Merge pull request from gitbutlerapp/error-codes-for-commit-failures
Adds error codes for commit failures
2024-07-20 13:18:18 +02:00
Kiril Videlov
577d035a64
Merge pull request from gitbutlerapp/dependabot/cargo/cargo-57db22b3e5
Bump gix-path from 0.10.8 to 0.10.9 in the cargo group
2024-07-20 13:17:11 +02:00
Kiril Videlov
5d56427f83
Adds error codes for commit failures
This will helps the UI better understand why a commit operation may have failed
2024-07-20 12:54:48 +02:00
Mattias Granlund
02d4d6fb63 Always open markdown links in external browser 2024-07-20 00:03:29 +02:00
Sebastian Thiel
ea37a387b4
optimize is_commit_integrated()
- do not repeatedly optain the same state, but cache it
- when doing a merge-check, keep temporary objects in memory only.
2024-07-19 11:14:19 +02:00
dependabot[bot]
8936cced4e
Bump gix-path from 0.10.8 to 0.10.9 in the cargo group
Bumps the cargo group with 1 update: [gix-path](https://github.com/Byron/gitoxide).


Updates `gix-path` from 0.10.8 to 0.10.9
- [Release notes](https://github.com/Byron/gitoxide/releases)
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Byron/gitoxide/compare/gix-path-v0.10.8...gix-path-v0.10.9)

---
updated-dependencies:
- dependency-name: gix-path
  dependency-type: direct:production
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-19 08:56:28 +00:00
Sebastian Thiel
b0bfdac0fb
Merge pull request from Byron/resolve-optimization
improved `conflict` file handling
2024-07-19 10:54:53 +02:00
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 () 2024-07-18 21:53:30 +02:00
Pavel Laptev
0c7678fa04
UXUI - Profile settings ()
* 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 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 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 ()
`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 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 ()
* 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 ()" ()
This reverts commit c857d1005d.
2024-07-18 01:50:40 +02:00
Pavel Laptev
c857d1005d
Focus on the last selected item bug ()
* 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 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 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