Commit Graph

6106 Commits

Author SHA1 Message Date
Josh Junon
7a77d980bf
removed unused import on windows 2024-04-05 12:03:23 +02:00
Mattias Granlund
1c2db6f24f Allow amend while hunk/file locked
We have gone a bit back and forth here, but this should be the right way of handling locks wrt to dragging.

- uses dropzone accept call to dynamically block locked hunks/files
2024-04-04 21:06:30 +02:00
Mattias Granlund
96a3237ac1 Allow merging/rebasing from branch preview
- feels like you shouldn't need to apply a branch just to merge a pr
2024-04-04 19:14:05 +02:00
Mattias Granlund
e95fb62410 Flatten the AI service directory
- resolves cyclic dependency between the two packages
2024-04-04 19:06:28 +02:00
Mattias Granlund
54cba257dd Fix cyclical dependency in AI service 2024-04-04 18:19:26 +02:00
Mattias Granlund
295e14ee50 Improve wait conditions for PR checks
- continue waiting if there are check suites that haven't completed
2024-04-04 15:49:51 +02:00
Pavel Laptev
b36bc1ff4b
wiggle lock files if dragging (#3432)
* wiggle lock files if dragging

* lint fixes

* Expand lane only when clicking expand button

- previous behavior was click anywhere to expand

* wiggle lock files if dragging

* lint fixes

* minor comments change

---------

Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
2024-04-04 15:31:56 +02:00
Mattias Granlund
6b888c3e89 Expand lane only when clicking expand button
- previous behavior was click anywhere to expand
2024-04-04 15:19:57 +02:00
Mattias Granlund
5882d2ed32 Update two eslint npm packages
- dependabot doesn't suggest major upgrades
2024-04-04 14:57:28 +02:00
Josh Junon
b9c07265c2
Merge pull request #3344 from gitbutlerapp/separate-integration-tests
separate integration tests for 'changeset' crate
2024-04-04 14:07:46 +02:00
Josh Junon
e7c8d5823a
Merge pull request #3347 from gitbutlerapp/separate-integration-tests-git
separate integration tests for 'git' crate
2024-04-04 14:00:35 +02:00
Sebastian Thiel
4bd5495020
chore(changeset): don't build doc-tests
There are no doctests and it's unlikely there will be anytime soon
as this library isn't for publishing.
2024-04-04 13:53:08 +02:00
Sebastian Thiel
194f8b5235
chore(changeset): assure the crate isn't published.
The crate is only for use by GitButler.
2024-04-04 13:53:07 +02:00
Sebastian Thiel
ee88e1b9b0
chore: separate 'changeset' crate integration tests 2024-04-04 13:53:03 +02:00
Sebastian Thiel
884f8a742d
chore(git): don't build doc-tests, or unit-tests of binaries
There are no doctests and it's unlikely there will be anytime soon
as this library isn't for publishing.

The binaries did try to build unit-tests as well even though these
aren't quite feasible, so they are disabled now to reduce clutter.
2024-04-04 13:46:07 +02:00
Sebastian Thiel
2ee77704c7
chore(git): assure the crate isn't published.
The crate is only for use by `gitbutler`.
2024-04-04 13:46:00 +02:00
Sebastian Thiel
ed2daf5ffb
chore: separate 'git' crate integration tests 2024-04-04 13:45:58 +02:00
Josh Junon
28a4f841aa
Merge pull request #3429 from gitbutlerapp/fix-readme-assets
fix gitbutler-app -> gitbutler-tauri broken links
2024-04-04 12:55:52 +02:00
Josh Junon
a425c8c3b5
fix gitbutler-app -> gitbutler-tauri broken links 2024-04-04 12:55:08 +02:00
Josh Junon
22a732b21e
Merge pull request #3405 from gitbutlerapp/restructure-crates
Restructure crates
2024-04-04 12:53:03 +02:00
Josh Junon
4d78be2d95
fix clippy lints from toolchain update 2024-04-04 12:37:52 +02:00
Josh Junon
977d9096be
update toolchain 2024-04-04 12:20:31 +02:00
Josh Junon
59af2953cd
update config to refer to new crate structure 2024-04-04 12:09:12 +02:00
Josh Junon
5a9962bc5a
initial move of crates (no config changes) 2024-04-04 11:49:12 +02:00
Pavel Laptev
fa2a75508b
CSS fixes (#3427)
* fix: draggable scroll triggered too early
the triggerRange set to fixed number because it was getting triggered too soon on small screens.
* `shaky` animation renamed + deleted unused CSS
2024-04-04 01:54:09 +02:00
Mattias Granlund
06689a79ac Fix bug where extra files shown while dragging
The drag cloning selector can be used in different branches, so we can to restrict our dom query to only the parent container of the file being dragged.
2024-04-04 01:49:50 +02:00
Mattias Granlund
ea1a16cc1f Refactor FileSelection into a custom store
This just makes more sense.
2024-04-04 01:21:21 +02:00
Pavel Laptev
281f1c7476
Small layout fixes for files list (#3423) 2024-04-03 22:45:18 +02:00
Mattias Granlund
d021eb51a4 Refactor internal error page
- copies most things from `ProblemLoadingRepo`
- `maybeGetContext` function now necessary for project selector
- throw expected error in layout.ts if loading project fails
2024-04-03 22:10:54 +02:00
Mattias Granlund
ea9cf23997 Fix drag & drop object clone
- dimensions must be preserved
- old code related to file tree dropped
2024-04-03 17:52:26 +02:00
Mattias Granlund
07310ce67f Bugfix file selection
- file preview must close when no file selected
2024-04-03 17:52:26 +02:00
Mattias Granlund
c5738fee4b Allow hunk drag when locked, necessary for amending commit 2024-04-03 17:18:54 +02:00
Mattias Granlund
a0d30e8f43 Fix shift selecting files after rebasing Pavel's work
- works but will need more love
2024-04-03 17:18:54 +02:00
Pavel Laptev
6c8544acd8 disable dragging for locked files 2024-04-03 17:18:54 +02:00
Pavel Laptev
19cbb91961 added autoscroll on drag + style fixes 2024-04-03 17:18:54 +02:00
Pavel Laptev
f725f55ad1 add utility to select files 2024-04-03 17:18:54 +02:00
Pavel Laptev
a49ccc3eee added autoscroll on drag + style fixes 2024-04-03 17:18:54 +02:00
Pavel Laptev
585bd463b8 fix: handle opacity when multiple files selected
previosly the opacity worked only for one file
2024-04-03 17:18:54 +02:00
Pavel Laptev
03d6ee2190 add utility to select files 2024-04-03 17:18:54 +02:00
Mattias Granlund
1cf360c1ff Put BranchFilesHeader into BranchFilesList
- removed it when refactoring file selection
- realized it is necessary even without tree view
2024-04-03 13:52:39 +02:00
Mattias Granlund
55ed8dc45a Remove tree list view
- not being used
- reduced maintenance cost
2024-04-03 13:52:39 +02:00
Mattias Granlund
b10904ae65 Use Svelte context for file selection and ownership
This commit needlessly entangles two changes, but they are part of the same effort. We replace the use of props for passing selected files and selected ownership with context getters.

Landing this now since it's functionally much better than before, but this code needs more work. We are currently using a store on the `FileSelection` object essentially for retriggering checks, it has a smell to it.

Note that the reason selectedFileIds is separate from selectedFiles is that our file objects mutate with every update from the back end. That's why until now has been clearing quite often.

TODO: Rename `SelectedOwnership` to something more true to its function
2024-04-03 13:25:18 +02:00
Caleb Owens
1c7d305273
Merge pull request #3411 from gitbutlerapp/add-difflenth-to-settings
Add difflenth to settings
2024-04-03 08:58:37 +01:00
Kiril Videlov
d050ebdfc4
Merge pull request #3415 from gitbutlerapp/content-wrapper-z-index-increase
fix zindex glitch with branch search input
2024-04-03 09:57:07 +02:00
Caleb Owens
691392328a
Remove Console Log 2024-04-03 08:56:43 +01:00
Kiril Videlov
6594760d7f
fix zindex glitch with branch search input 2024-04-03 09:54:29 +02:00
Pavel Laptev
648fe29f99 Minor layout updates
- added `Spacer` above `Amount of provided context`
- changed space between section
- amount input changes from 100 to 80
2024-04-03 08:52:50 +01:00
Caleb Owens
8c52dfe767 feat: Increase the diff length limit for API usage
- Adds a new configuration key `gitbutler.diffLengthLimit` to allow users to
  customize the diff length limit
- Adds a method `getDiffLengthLimitConsideringAPI` to return the diff length
  limit with a specified upper bound of characters in order to not inundate the
  API
- Updates the `buildClient` and `summarizeCommit`/`summarizeBranch` methods to
  use the new `getDiffLengthLimitConsideringAPI` method

feat: Add a `showCountActions` prop to the TextBox component
- Adds a new prop `showCountActions` to the TextBox component to display
  character count actions (e.g., min/max length indicators)
2024-04-03 08:52:50 +01:00
Caleb Owens
7f8e3f6574 feat: refactor AIService to improve readability
Extract repeated config access into separate methods. Introduce
variables to clarify the meaning of complex conditional statements.
The changes make the code easier to understand and maintain without
altering its behavior.
2024-04-03 08:52:50 +01:00
Pavel Laptev
9f65af954b
small design tokens update (#3414) 2024-04-03 02:03:09 +02:00