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
Kiril Videlov
91947e5d94
Merge pull request #3307 from gitbutlerapp/check-hunk-ownership-consistency-on-assignment
...
feat: detect conflicting ownership claims
2024-03-24 20:31:31 +01:00
Kiril Videlov
d9b2928a85
feat: detect conflicting ownership claims
2024-03-24 19:25:51 +01:00
Kiril Videlov
8e0a28ef88
Merge pull request #3306 from gitbutlerapp/update-virtual-branch-context-migration
...
feat: Migrate use_diff_context to true if no active virtual branches
2024-03-24 17:37:47 +01:00
Kiril Videlov
1b54b7efdb
feat: Migrate use_diff_context to true if no active virtual branches
...
Migrate to use diff context for any projects that have stale unapplied branches. This will facilitate removing the old code for supporting zero context hunks
2024-03-24 17:28:17 +01:00
Kiril Videlov
a328ad4d7d
Merge pull request #3305 from gitbutlerapp/add-state-dir-for-project
...
feat: namespace virtual_branches.toml under .git/gitbutler
2024-03-24 17:16:59 +01:00
Kiril Videlov
9d7e847f82
feat: namespace virtual_branches.toml under .git/gitbutler
...
The virtual_branches.toml was never read
2024-03-24 17:06:14 +01:00
Kiril Videlov
7e8eab4726
Merge pull request #3304 from gitbutlerapp/expand-lane
...
feat: Update "Collapse lane" help text to "Expand lane"
2024-03-24 16:24:47 +01:00
Eyal Cherevatsky
8fbbe38432
fix: improve Segment button selected state style ( #3301 )
...
* fix: improve `Segment` button selected state style
* Update Segment.svelte
- styles updated. align with the `IconButton` styles
- unused CSS removed
- accessibility navigation fixed. Instead of arrows — use tabs
* Update Segment.svelte
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-03-24 16:16:33 +01:00
Kiril Videlov
b929d180ee
feat: Update "Collapse lane" help text to "Expand lane"
2024-03-24 16:08:24 +01:00
Kiril Videlov
17c9620395
Merge pull request #3294 from gitbutlerapp/fix-unneeded-config-set-calls
...
refactor(AISettings): Remove unneeded config set calls
2024-03-24 15:56:22 +01:00
Mayfield
b2eee287fe
dispatch change event and allow min tab size of 1
2024-03-24 10:43:24 -04:00
Pavel Laptev
87f03bf5d4
Merge branch 'master' into add-userSettings-tabSize-support
2024-03-24 15:03:21 +01:00
Pavel Laptev
16e27b42dd
Fix the order for interactive elements in TexBox
...
In order to support correct keyboard navigation
2024-03-24 15:02:46 +01:00
Pavel Laptev
6558c32fe2
added new input type
...
+ shake animation if the input is invalid
+ added new input props — minVal, maxVal, width and textAlign
+ added new section card prop `centerAlign`
+ new icon
2024-03-24 15:00:37 +01:00
Mayfield
3fc492b3eb
fix import order
2024-03-24 09:03:20 -04:00
Mayfield
a6928381c8
move userSettings to a more appropriate level
2024-03-24 07:33:24 -04:00
Kiril Videlov
37a9e6d916
Merge pull request #3299 from gitbutlerapp/update-repository-dependencies
...
fix: remove unused import
2024-03-24 12:21:11 +01:00
Kiril Videlov
f61679c082
fix: remove unused import
2024-03-24 12:10:39 +01:00
Mayfield
f254d7dc58
feat: add tab size option to Appearance settings
2024-03-23 21:33:25 -04:00
Mayfield
3486bfaf43
fix: background color CSS variable typo
2024-03-23 21:33:25 -04:00
Mayfield
901aed1afe
feat: add tabSize user setting
2024-03-23 21:33:25 -04:00
