Eyal Cherevatsky
b30b138128
feat: allow submitting rename branch form on pressing Enter
...
In addition, auto-focus the branch name input.
2024-03-27 22:13:27 +01:00
Mattias Granlund
e25f669492
Add some documentation to rxjs/store.ts
...
- this file will likely be read a few times, worth explaining the reasoning
- make the code a bit more concise
2024-03-27 20:02:20 +01:00
Kiril Videlov
29ce48d6a7
Merge pull request #3357 from gitbutlerapp/update-cargo-lock-dependencies
...
feat: Update dependencies to the latest versions
2024-03-27 19:44:11 +01:00
Kiril Videlov
d629020953
feat: Update dependencies to the latest versions
2024-03-27 19:28:53 +01:00
Mattias Granlund
2497ec633d
Run dependabot for npm every week
...
- mainly because posthog seems to be making breaking changes quite frequently
2024-03-27 19:23:07 +01:00
dependabot[bot]
4500b490fb
build(deps): bump the npm-updates group with 14 updates
...
Bumps the npm-updates group with 14 updates:
| Package | From | To |
| --- | --- | --- |
| [@tauri-apps/cli](https://github.com/tauri-apps/tauri ) | `1.5.10` | `1.5.11` |
| [openai](https://github.com/openai/openai-node ) | `4.28.4` | `4.29.2` |
| [@codemirror/lang-xml](https://github.com/codemirror/lang-xml ) | `6.0.2` | `6.1.0` |
| [@codemirror/view](https://github.com/codemirror/view ) | `6.24.1` | `6.26.0` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript ) | `7.104.0` | `7.108.0` |
| [autoprefixer](https://github.com/postcss/autoprefixer ) | `10.4.17` | `10.4.19` |
| [postcss](https://github.com/postcss/postcss ) | `8.4.35` | `8.4.38` |
| [posthog-js](https://github.com/PostHog/posthog-js ) | `1.110.0` | `1.116.6` |
| [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss ) | `0.5.11` | `0.5.13` |
| [svelte-check](https://github.com/sveltejs/language-tools ) | `3.6.6` | `3.6.8` |
| [svelte-outclick](https://github.com/babakfp/svelte-outclick ) | `3.7.0` | `3.7.1` |
| [tailwindcss](https://github.com/tailwindlabs/tailwindcss ) | `3.4.1` | `3.4.2` |
| [typescript](https://github.com/Microsoft/TypeScript ) | `5.3.3` | `5.4.3` |
| [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ) | `4.5.2` | `4.5.3` |
Updates `@tauri-apps/cli` from 1.5.10 to 1.5.11
- [Release notes](https://github.com/tauri-apps/tauri/releases )
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.10...@tauri-apps/cli-v1.5.11 )
Updates `openai` from 4.28.4 to 4.29.2
- [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.28.4...v4.29.2 )
Updates `@codemirror/lang-xml` from 6.0.2 to 6.1.0
- [Changelog](https://github.com/codemirror/lang-xml/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/lang-xml/compare/6.0.2...6.1.0 )
Updates `@codemirror/view` from 6.24.1 to 6.26.0
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.24.1...6.26.0 )
Updates `@sentry/sveltekit` from 7.104.0 to 7.108.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases )
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.104.0...7.108.0 )
Updates `autoprefixer` from 10.4.17 to 10.4.19
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.17...10.4.19 )
Updates `postcss` from 8.4.35 to 8.4.38
- [Release notes](https://github.com/postcss/postcss/releases )
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss/compare/8.4.35...8.4.38 )
Updates `posthog-js` from 1.110.0 to 1.116.6
- [Release notes](https://github.com/PostHog/posthog-js/releases )
- [Changelog](https://github.com/PostHog/posthog-js/blob/main/CHANGELOG.md )
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.110.0...v1.116.6 )
Updates `prettier-plugin-tailwindcss` from 0.5.11 to 0.5.13
- [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases )
- [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.11...v0.5.13 )
Updates `svelte-check` from 3.6.6 to 3.6.8
- [Release notes](https://github.com/sveltejs/language-tools/releases )
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.6.6...svelte-check-3.6.8 )
Updates `svelte-outclick` from 3.7.0 to 3.7.1
- [Commits](https://github.com/babakfp/svelte-outclick/commits )
Updates `tailwindcss` from 3.4.1 to 3.4.2
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases )
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.2/CHANGELOG.md )
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.1...v3.4.2 )
Updates `typescript` from 5.3.3 to 5.4.3
- [Release notes](https://github.com/Microsoft/TypeScript/releases )
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml )
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.3...v5.4.3 )
Updates `vite` from 4.5.2 to 4.5.3
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.3/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v4.5.3/packages/vite )
---
updated-dependencies:
- dependency-name: "@tauri-apps/cli"
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: npm-updates
- dependency-name: openai
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: npm-updates
- dependency-name: "@codemirror/lang-xml"
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: npm-updates
- dependency-name: "@codemirror/view"
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: npm-updates
- dependency-name: "@sentry/sveltekit"
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: npm-updates
- dependency-name: autoprefixer
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: npm-updates
- dependency-name: postcss
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: npm-updates
- dependency-name: posthog-js
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: npm-updates
- dependency-name: prettier-plugin-tailwindcss
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: npm-updates
- dependency-name: svelte-check
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: npm-updates
- dependency-name: svelte-outclick
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
- dependency-name: typescript
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: npm-updates
- dependency-name: vite
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: npm-updates
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-27 19:14:06 +01:00
Kiril Videlov
18c0c3a87e
Merge pull request #3348 from gitbutlerapp/Virtual-branch
...
dependabot re-enable
2024-03-27 18:53:37 +01:00
Kiril Videlov
b36b746e6a
dependabot re-enable
...
This makes a no-op change to dependabot.yml to force Dependabot to re-evaluate the config file.
2024-03-27 18:51:47 +01:00
Mattias Granlund
811d94030e
Limit max height of project selector popup
...
- requested by LaylaTichy on discord
2024-03-27 17:17:08 +01:00
Pavel Laptev
4e1c7910e1
accessibility fix: commit card folding behaviour on keyup ( #3337 )
...
* fix: commit card folding behaviour on keyup
I was able to fold/unfold it pressing any key. Fixed to `Enter` and `Space` keys only
2024-03-27 11:57:03 +01:00
Pavel Laptev
d3662e6557
style fix: tag component ( #3341 )
2024-03-27 01:19:11 +01:00
Kiril Videlov
2d4095c24e
Merge pull request #3334 from Byron/tests-with-init-defaultbranch
...
tests work with init.defaultBranch
2024-03-26 21:46:06 +01:00
Mattias Granlund
f51e2b2530
Nitpicking a few things
...
- use more intuitive error handling in `observableToStore`
- improve pr loading service
- simplify base branch service observable
- add concrete error class for default target not set
- disclosure in layout.ts about `const project` being only await allowed
2024-03-26 19:59:06 +01:00
Pavel Laptev
189c1d7f0b
UI refactor ( #3335 )
...
* Unused CSS removed
* Refactor: simplify Tag component props
2024-03-26 16:47:14 +01:00
Kiril Videlov
aaa7d74bce
Merge pull request #3333 from gitbutlerapp/fix-release-script-for-windows
...
feat(release): skip building windows if job is release
2024-03-26 14:39:30 +01:00
Sebastian Thiel
e8b98ee80d
fix: tests work in presence of init.defaultBranch=main
...
The test-suite hardcodes `refs/heads/master`. However, `git`
somewhat selectively picks up configuration that affects
the default branch name, like `GIT_BRANCH_DEFAULT` and
`init.defaultBranch`.
This causes `HEAD` to contain `refs/heads/main`, which typically
isn't created, causing 199 tests to fail.
Now `git2` repository initialization will override the branch name.
The only notable exception to this is a submodule test, which
needs the `HEAD` branch to be set specifically after initialization.
2024-03-26 14:34:08 +01:00
Sebastian Thiel
95467bac8e
fix typo
2024-03-26 14:34:07 +01:00
Kiril Videlov
719a664809
feat(release): skip building windows if job is release
...
Until we have signing working
2024-03-26 14:23:27 +01:00
Kiril Videlov
51a65bfe72
Merge pull request #3328 from gitbutlerapp/hunk-equality-comparisons
...
hunk ownership: use line numbers in eq check
2024-03-26 01:54:18 +01:00
Kiril Videlov
93acbb4421
hunk ownership: use line numbers in eq check
...
Now that line numbers are set correctly, re-introducing the equality check based on line numbers
2024-03-26 01:44:33 +01:00
Kiril Videlov
104574b9bd
Merge pull request #3316 from gitbutlerapp/add-git-hunk-data-to-virtual-branch-diff
...
fix: when listing vbranches use workspace line num
2024-03-26 01:30:02 +01:00
Kiril Videlov
6832b4916c
fix: correct line numbers only for applied branches
...
The functionality for (re)setting the line number to the global workspace numbers only applies to applied branches
2024-03-26 01:20:11 +01:00
Kiril Videlov
7a839e1b11
compare branch non-committed to workspace non-committed diffs
...
Intersection with the all diffs is erroneous because of the presence of committed hunks that may overlap with uncommitted ones
2024-03-26 01:20:11 +01:00
Kiril Videlov
d44eaefd9b
fix: correct hunk parsing for intersection calc
2024-03-26 01:20:11 +01:00
Kiril Videlov
bfa1ecfb0d
fix: when listing vbranches use workspace line num
...
Previously the line numbers on hunks inside a vbranch were the line numbers the branch would have in isolation.
This led to a few problems when there were hunks in the same file on multiple branches:
- Line numbers in GB not matching what is seen in the editor
- Issues related to moving hunks around
2024-03-26 01:20:11 +01:00
Josh Junon
c3c478b85e
Merge pull request #3326 from gitbutlerapp/exclusive-linespan-refactor
...
make LineSpan end-exclusive
2024-03-26 00:18:57 +01:00
Josh Junon
c8a238e6ae
make LineSpan end-exclusive
2024-03-26 00:09:02 +01:00
Josh Junon
c3f292c773
Merge pull request #3325 from gitbutlerapp/add-hunk
...
add Hunk trait to gitbutler-changeset
2024-03-25 23:55:57 +01:00
Josh Junon
3a099ad789
add Hunk trait to gitbutler-changeset
2024-03-25 23:46:10 +01:00
Josh Junon
9ebdd2f4ed
Merge pull request #3323 from gitbutlerapp/simpler-clippy
...
Simpler clippy
2024-03-25 23:14:12 +01:00
Josh Junon
4e547d451b
Merge pull request #3322 from gitbutlerapp/Make-more-type-conversion-implicit-in-commands.rs-
...
Make more type conversion implicit in `commands.rs`
2024-03-25 23:11:43 +01:00
Josh Junon
a9cbe74675
Merge pull request #3324 from gitbutlerapp/dedupe-ci
...
don't run ci twice per pull request
2024-03-25 23:10:33 +01:00
Josh Junon
0f964a787c
don't run ci twice per pull request
2024-03-25 23:09:51 +01:00
Mattias Granlund
7986d3bb5f
Make more type conversion implicit in commands.rs
...
Errors like: invalid args `projectId` for `list_remote_Branches`: invalid type, expected a UUID string.
We could make it better by returning the user error as it typically does, but tbh, that currently does not have much value.
2024-03-25 23:01:53 +01:00
Josh Junon
772e272b3a
copy clippy lint config to all other crates
2024-03-25 23:01:03 +01:00
Josh Junon
1dfdc2c1a2
make clippy deny warnings in CI
2024-03-25 23:01:01 +01:00
Josh Junon
5b9fcc21ce
simplify clippy configuration
2024-03-25 23:00:58 +01:00
Josh Junon
4163ad23ff
Merge pull request #3321 from gitbutlerapp/remove-line-file
...
remove linefile
2024-03-25 23:00:36 +01:00
Josh Junon
0e9a84168a
remove additional features from changeset CI
2024-03-25 22:50:37 +01:00
Josh Junon
b1a28810d1
Merge pull request #3320 from gitbutlerapp/Remove-project_id-and-branch_id-validation-steps
...
Remove project_id and branch_id validation steps
2024-03-25 22:43:04 +01:00
Josh Junon
9803a7d0c8
remove linefile
2024-03-25 22:42:22 +01:00
Mattias Granlund
25d0a5d6d4
Remove project_id and branch_id validation steps
...
- provides little value and creates too much noise
2024-03-25 22:33:05 +01:00
Mattias Granlund
c13c706268
Improve "taken" loop when updating hunk ownership
...
- previous veresion inserted more than one ownership claim per branch
- buggy since `branch.clone()` would include things not yet taken
2024-03-25 21:46:53 +01:00
Mattias Granlund
d025293b0e
Fix css for textbox disabled state ( #3315 )
2024-03-25 21:28:38 +01:00
Mattias Granlund
81e61409ca
Fix: cancel input prompt when dismissing input modal
2024-03-25 21:13:36 +01:00
Kiril Videlov
65e7540b96
Merge pull request #3310 from gitbutlerapp/reconcile-ownership-claims
...
refactor: extract ownership calculation for update
2024-03-25 00:44:27 +01:00
Kiril Videlov
eb89c3d08c
refactor: extract ownership calculation for update
...
This should have no functional change. Simply extracting the interesting code to separate function. And also adding an initial test
2024-03-25 00:23:19 +01:00
Kiril Videlov
1dd1e1b0f5
Merge pull request #3308 from gitbutlerapp/add-tab-size-setting
...
feat(settings): Clarify tab size setting for code diffs
2024-03-24 21:28:34 +01:00
Kiril Videlov
f37e9aa422
feat(settings): Clarify tab size setting for code diffs
2024-03-24 20:46:44 +01:00
Mattias Granlund
bec9224ee0
Merge pull request #3298 from mayfieldiv/add-userSettings-tabSize-support
...
feat: make code tab size configurable
2024-03-24 20:41:09 +01:00
