Commit Graph

6402 Commits

Author SHA1 Message Date
Pavel Laptev
a8ac14871c
Styles: fix illustration tokens (#3402) 2024-04-02 13:52:05 +02:00
Mattias Granlund
f9795d7c82 Set scroll-behavior to none on <html> element
- probably lost when removing tailwind css
2024-04-02 13:05:37 +02:00
Kiril Videlov
36ee8a9bc2
feat: Change commit button text to 'Start commit' (#3399)
Looks good, thanks!
2024-04-01 22:30:16 +02:00
Kiril Videlov
0c8d7a8f5d
Merge pull request #3395 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-066058f
build(deps): bump tauri-plugin-window-state from `c6a5b7a` to `066058f`
2024-04-01 18:16:39 +02:00
Kiril Videlov
2b25715e30
Merge pull request #3396 from gitbutlerapp/dependabot/cargo/tauri-plugin-log-066058f
build(deps): bump tauri-plugin-log from `c6a5b7a` to `066058f`
2024-04-01 18:16:33 +02:00
Kiril Videlov
467ba7e485
Merge pull request #3397 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-066058f
build(deps): bump tauri-plugin-single-instance from `c6a5b7a` to `066058f`
2024-04-01 18:16:25 +02:00
Kiril Videlov
0948891339
Merge pull request #3398 from gitbutlerapp/dependabot/cargo/tauri-plugin-store-066058f
build(deps): bump tauri-plugin-store from `c6a5b7a` to `066058f`
2024-04-01 18:16:19 +02:00
Kiril Videlov
d1f099c09f
Merge pull request #3393 from gitbutlerapp/dependabot/npm_and_yarn/npm-updates-5a9777be9f
build(deps): bump the npm-updates group with 6 updates
2024-04-01 18:15:58 +02:00
Kiril Videlov
cb43625f74
Merge pull request #3394 from gitbutlerapp/dependabot/cargo/rust-updates-edc401d946
build(deps): bump the rust-updates group with 3 updates
2024-04-01 18:15:39 +02:00
Kiril Videlov
65aa6a5d98
Merge pull request #3385 from gitbutlerapp/error-handling
consistent error-handling
2024-04-01 18:14:15 +02:00
dependabot[bot]
9ce4103462
build(deps): bump tauri-plugin-store from c6a5b7a to 066058f
Bumps [tauri-plugin-store](https://github.com/tauri-apps/plugins-workspace) from `c6a5b7a` to `066058f`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](c6a5b7ae47...066058f631)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 15:45:32 +00:00
dependabot[bot]
59c1d58bb6
build(deps): bump tauri-plugin-single-instance
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `c6a5b7a` to `066058f`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](c6a5b7ae47...066058f631)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 15:45:06 +00:00
dependabot[bot]
14d9511f37
build(deps): bump tauri-plugin-log from c6a5b7a to 066058f
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace) from `c6a5b7a` to `066058f`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](c6a5b7ae47...066058f631)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 15:44:41 +00:00
dependabot[bot]
8a0966eed1
build(deps): bump tauri-plugin-window-state from c6a5b7a to 066058f
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `c6a5b7a` to `066058f`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](c6a5b7ae47...066058f631)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 15:44:17 +00:00
dependabot[bot]
69ae2d33b9
build(deps): bump the rust-updates group with 3 updates
Bumps the rust-updates group with 3 updates: [tokio](https://github.com/tokio-rs/tokio), [refinery](https://github.com/rust-db/refinery) and [similar](https://github.com/mitsuhiko/similar).


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

Updates `refinery` from 0.8.12 to 0.8.13
- [Release notes](https://github.com/rust-db/refinery/releases)
- [Changelog](https://github.com/rust-db/refinery/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-db/refinery/compare/0.8.12...0.8.13)

Updates `similar` from 2.4.0 to 2.5.0
- [Changelog](https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mitsuhiko/similar/compare/2.4.0...2.5.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: refinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: similar
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 15:43:50 +00:00
Sebastian Thiel
91a6a3a879
doc: add information on how to use the new error types, and what to consider. 2024-04-01 17:41:31 +02:00
Sebastian Thiel
2aaacdfca7
chore: remove legacy error in favor of new error system 2024-04-01 17:33:14 +02:00
dependabot[bot]
66b00b42d1
build(deps): bump the npm-updates group with 6 updates
Bumps the npm-updates group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [openai](https://github.com/openai/openai-node) | `4.29.2` | `4.31.0` |
| [@codemirror/lang-python](https://github.com/codemirror/lang-python) | `6.1.4` | `6.1.5` |
| [@codemirror/view](https://github.com/codemirror/view) | `6.26.0` | `6.26.1` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) | `7.108.0` | `7.109.0` |
| [reflect-metadata](https://github.com/rbuckton/reflect-metadata) | `0.2.1` | `0.2.2` |
| [tailwindcss](https://github.com/tailwindlabs/tailwindcss) | `3.4.2` | `3.4.3` |


Updates `openai` from 4.29.2 to 4.31.0
- [Release notes](https://github.com/openai/openai-node/releases)
- [Changelog](https://github.com/openai/openai-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openai/openai-node/compare/v4.29.2...v4.31.0)

Updates `@codemirror/lang-python` from 6.1.4 to 6.1.5
- [Changelog](https://github.com/codemirror/lang-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-python/compare/6.1.4...6.1.5)

Updates `@codemirror/view` from 6.26.0 to 6.26.1
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.26.0...6.26.1)

Updates `@sentry/sveltekit` from 7.108.0 to 7.109.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/7.109.0/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.108.0...7.109.0)

Updates `reflect-metadata` from 0.2.1 to 0.2.2
- [Release notes](https://github.com/rbuckton/reflect-metadata/releases)
- [Changelog](https://github.com/rbuckton/reflect-metadata/blob/main/tsconfig-release.json)
- [Commits](https://github.com/rbuckton/reflect-metadata/commits)

Updates `tailwindcss` from 3.4.2 to 3.4.3
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.3/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: openai
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@codemirror/lang-python"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: reflect-metadata
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 15:25:51 +00:00
Pavel Laptev
fe71400823
Button and design tokens refactoring (#3391)
* Refactor button props

* style: button update

* Formatting

* New disabled button styles

* refactor: control size updated

* refactor: design tokens

- simplify token names
- sizes updates

* Push buttons styles update until new design
2024-04-01 16:27:09 +02:00
Sebastian Thiel
d0db6a67df
use the new 'app' error type everywhere 2024-04-01 16:19:09 +02:00
Sebastian Thiel
b7b73ec0c9
feat: an application error for use with Tauri, from anyhow and thiserror. 2024-04-01 16:14:34 +02:00
Sebastian Thiel
eba6bc1cef
feat: add error::Code and ways to attach them in anyhow. 2024-04-01 16:14:34 +02:00
Sebastian Thiel
136a998623
chore: cleanup core::error and app::error
* Remove `app` specific portions in core that were unused.
* Remove unused error-context and sentry integration which was unused everywhere.
2024-04-01 16:14:34 +02:00
Mattias Granlund
f614f739ae Make more type conversion implicit in commands.rs 2024-04-01 15:52:51 +02:00
Mattias Granlund
139d535b36 Fix lint errors in SyncButton 2024-04-01 15:29:12 +02:00
Mattias Granlund
8d2fe6574d Disable merge button when PR state != 'clean'
These parameters don't seem well document, but looks like we should only enable merge button when it's mergeable_state == 'clean'
2024-04-01 15:29:02 +02:00
Mattias Granlund
e93149d9a8 Refactor onwership.ts
- replaces a set with a map so we can use hunk hash in api calls
- shortens method names, e.g. `addHunk` -> `add`
2024-04-01 15:22:33 +02:00
Mattias Granlund
402dbf5253 Update ownership when branch updates
This likely fixes the empty commit bug experienced by some users. It would be incorrect to create this ownership store once and never update it.
2024-04-01 15:22:33 +02:00
Kiril Videlov
c584312c98
Merge pull request #3387 from gitbutlerapp/add-use-toml-state
feature flag for reading vbranch state from the toml file
2024-04-01 00:34:09 +02:00
Kiril Videlov
d94542d0c7
if use_state_handle enabled get state from toml 2024-04-01 00:21:07 +02:00
Kiril Videlov
a1bd1fafea
adds list branches & check file exists for vb state handle 2024-04-01 00:20:11 +02:00
Kiril Videlov
7a4dc32ba7
add toml state to branch and target readers
This allows reading to happen from either the meta git repo or the toml file
2024-03-31 23:07:44 +02:00
Kiril Videlov
a57ba4c683 add feature flag for reading vbs from toml 2024-03-31 22:21:04 +02:00
Kiril Videlov
e9b4ef3249
Merge pull request #3384 from gitbutlerapp/virtual-branches-writer-refactor-1
refactor: move VirtualBranchesHandle construction out of branch reader/writer
2024-03-31 01:01:32 +01:00
Kiril Videlov
04e6d2d7d7
fix test 2024-03-31 00:43:26 +01:00
Kiril Videlov
3d831c8527 fix: ci for gitbutler-core
testing shit
2024-03-31 00:21:13 +01:00
Kiril Videlov
de181f2107 refactor: move VirtualBranchesHandle construction out of branch reader/writer
When the migration is complete there will be no branch/target reader/writer. For now, inject the handle
2024-03-30 23:56:33 +01:00
Pavel Laptev
c85c1e9758
Style fixes (#3383)
* style update: segmented control for `Changes`

* style fix: hunk lines overlap with another class
2024-03-30 23:40:30 +01:00
Kiril Videlov
f5ebbdfc09
Merge pull request #3382 from gitbutlerapp/fix-publishing
revert 3378; move lib to `crates/gitbutler-core`
2024-03-30 23:10:49 +01:00
Pavel Laptev
41638f50e8
Refactor: removing tailwind. Part 1 (#3375)
* Remove: unused component `DiffContext`

* remove: unused component `Stats`

* refactor: remove tailwind

* fix and refactor: Share Issue Modal

- tailwind remove
- fix label id and and close button
- textBox added new props

* remove: unused `RemoteNamePanel`

* refactor: teilwind classes replace

* refactor: new DiffMessage comp + teilwind replace

* refactor: replace tailwind classes

* refactor: replace tailwind + handle MD styles

- added markdown styles for PR previews
- tailwind classes replacement

* refactor: unused comp `NotesTabPanel` removed

+ tailwind classes replaced
2024-03-30 22:55:23 +01:00
Sebastian Thiel
37efc8bc94
Assure CI will build the new core as well 2024-03-30 22:48:08 +01:00
Sebastian Thiel
72291ce4cb
chore: align 'app' and 'lib' crates imports.
This is done one-time (for now) using a nightly feature of cargo-fmt
as defined in `rustfmt-nightly.toml.`

It's planned to make this the default so imports will always be sorted.
For now it can be run manually with:
    cargo +nightly fmt -- --config-path rustfmt-nightly.toml
or
    pnpm rustfmtTBD
 Please enter the message for your patch. Lines starting with
2024-03-30 22:43:16 +01:00
Sebastian Thiel
26c39f2a3f
chore: move library from top-level to gitbutler-core
This better expresses what it does, and leaves the `gitbutler-app`
in the top-level where it can serve as visible entrypoint.
2024-03-30 22:39:21 +01:00
Sebastian Thiel
7941db2b2f
Revert "Merge pull request #3378 from gitbutlerapp/crates"
This reverts commit 423b27c11a, reversing
changes made to b39779366f.
2024-03-30 22:25:36 +01:00
Kiril Videlov
423b27c11a
Merge pull request #3378 from gitbutlerapp/crates
establish `crates/` directory
2024-03-30 20:34:46 +01:00
Sebastian Thiel
603652e66b
chore: align 'app' and 'lib' crates imports.
This is done one-time (for now) using a nightly feature of cargo-fmt
as defined in `rustfmt-nightly.toml.`

It's planned to make this the default so imports will always be sorted.
For now it can be run manually with:

    cargo +nightly fmt -- --config-path rustfmt-nightly.toml

or

    pnpm rustfmt
2024-03-30 19:48:48 +01:00
Sebastian Thiel
47e5badbfc
chore(app): move it to crates/ to establish the new structure.
It is similar to `nu-shell`, which has a lot of crates by now,
which is something we probably see here as well.
2024-03-30 19:36:27 +01:00
Mattias Granlund
b39779366f Refactor project service and how its used
- we are moving away from using observables inside .svelte files
Refactor project service
- easier to consume with value/error stores instead of observable
2024-03-30 17:33:40 +01:00
Kiril Videlov
86b69064c2
Merge pull request #3373 from gitbutlerapp/lib-in-toplevel
extract general library from `app` crate
2024-03-30 17:29:45 +01:00
Mattias Granlund
cf38afffd8 Use svelte component context in even more places
The general goal is to make data globally available to components to avoid
prop drilling from the dependency root into leaf nodes. With this commit the code
now uses context for looking up branches, commits, ownership, etc.

Beyond this goal we should as a next step consider separating out pure UI
components from client specific ones. For example, `FileStatusIcons` should
not depend on a list of commits. We should also avoid activating/deactiviating
features since it is prone to breakage. We therefore need to look over how
`selectedOwnership` is made active for virtual branches, but ignored for
previewing remote branches.

Goals accomplished in this commit:
- no more prop-drilling of branch, commits, ownership
- easier to enable e.g. lock tooltip in leaf nodes
- context builder for things that are not unique by type (e.g. commits)

Goals not accomplished in this commit:
- `selectedFiles` is still passed around
- `UserSettings` needs to be changed from interface -> class
2024-03-30 15:28:49 +01:00