Commit Graph

3048 Commits

Author SHA1 Message Date
Nikita Galaiko
d77123b775 fix: remove unnecessary steps in creating symlink content
The code previously included unnecessary steps to make the symlink target path relative and convert it to a byte array. These steps have been removed as they are not needed for creating the symlink content.
2023-09-29 09:47:17 +02:00
Nikita Galaiko
1cccaa6d69
Merge pull request #1256 from gitbutlerapp/Update-sentry-dependencies
Update sentry dependencies
2023-09-29 09:13:59 +02:00
Nikita Galaiko
f61ed2d14b chore: remove unused dependency sentry-anyhow 2023-09-29 09:08:27 +02:00
Nikita Galaiko
110db1bf85 chore: update dependencies and remove sentry-anyhow from Cargo.toml
The changes in this commit update the dependencies in the Cargo.toml file and remove the sentry-anyhow package. The sentry-anyhow package is no longer needed as it has been replaced by the sentry package. This change simplifies the dependencies and ensures that the project is using the latest versions of the required packages.
2023-09-29 09:08:16 +02:00
Nikita Galaiko
dda9e8d705
Merge pull request #1255 from gitbutlerapp/Update-sentry-dependencies
chore: enable debug symbols for sentry
2023-09-29 09:03:05 +02:00
Nikita Galaiko
afa01d6207 chore: enable debug symbols for sentry 2023-09-29 08:56:34 +02:00
Nikita Galaiko
d12bb8bf7c
Merge pull request #1254 from gitbutlerapp/Update-sentry-dependencies
Update sentry dependencies
2023-09-29 08:47:57 +02:00
Nikita Galaiko
7c725a4a9f structured logging 2023-09-29 08:40:21 +02:00
Nikita Galaiko
fb4fb7ad06 improve sentry integration 2023-09-29 08:11:03 +02:00
Mattias Granlund
544a35eea2 Fix lint error 2023-09-29 01:01:36 +03:00
Mattias Granlund
f1a9add4f7 Missed these props in the last commit 2023-09-29 01:01:36 +03:00
Mattias Granlund
48cd2ea296 Use actual types for tray store props 2023-09-29 01:01:36 +03:00
Mattias Granlund
88877e84eb Make some UI updates optimistic
- apply
- unapply
- delete branch
- update notes
2023-09-29 00:57:28 +03:00
Nikita Galaiko
129ed8d0a0
Merge pull request #1251 from gitbutlerapp/update-build-command-and-product-name
chore: update build scripts to include separate build commands for ni…
2023-09-28 14:32:51 +02:00
Nikita Galaiko
8ac716e44b fix allowlist 2023-09-28 14:27:49 +02:00
Nikita Galaiko
80f43ffe32 chore: update build scripts to include separate build commands for nightly and development modes 2023-09-28 13:31:40 +02:00
Nikita Galaiko
3b6aafc705
Merge pull request #1249 from gitbutlerapp/update-dependencies
chore: update dependencies
2023-09-28 10:42:41 +02:00
Nikita Galaiko
8c425fee7f pnpm install 2023-09-28 10:40:54 +02:00
Nikita Galaiko
d67008ab81 merged upstream 2023-09-28 10:40:34 +02:00
Nikita Galaiko
2241cacb75
Merge pull request #1250 from gitbutlerapp/Virtual-branch
chore: update gpg import action to version 6
2023-09-28 10:37:48 +02:00
Nikita Galaiko
af09d2074e chore: update gpg import action to version 6 2023-09-28 10:37:18 +02:00
Nikita Galaiko
3f35c564d2 chore: update dependencies
- Update "@types/lscache" to version "^1.3.2"
- Update "@typescript-eslint/eslint-plugin" to version "^6.7.2"
- Update "@typescript-eslint/parser" to version "^6.7.2"
- Update "marked" to version "^9.0.3"
- Update "postcss" to version "^8.4.30"

These updates include bug fixes and performance improvements.
2023-09-28 10:37:12 +02:00
Nikita Galaiko
410fdadd1c
Merge pull request #1248 from gitbutlerapp/update-branch-commits-layout
group integrated commits separately
2023-09-28 10:33:56 +02:00
Nikita Galaiko
919b334447 refactor: remove unnecessary prop 'isIntegrated' from CommitCard component in CommitList component 2023-09-28 10:32:31 +02:00
Nikita Galaiko
18ff457936 group integrated commits separately 2023-09-28 10:14:31 +02:00
Nikita Galaiko
568c59cd4d
Merge pull request #1247 from gitbutlerapp/fix-popup-menu-collapse
chore: update context menu in code editor component
2023-09-28 09:07:34 +02:00
Nikita Galaiko
53dd5a651d chore: update context menu in code editor component
The context menu in the code editor component has been updated to include a new option to collapse sections. Additionally, the "Open in Visual Studio Code" option will now only be displayed if there is a specific line number associated with the item.
2023-09-28 09:05:40 +02:00
Nikita Galaiko
043fe4576f
Merge pull request #1246 from gitbutlerapp/add-hunk-unapply-functionality
Add hunk unapply functionality
2023-09-27 12:08:43 +02:00
Nikita Galaiko
e3415c0b6b fix: hunk equiality 2023-09-27 12:02:30 +02:00
Nikita Galaiko
21ab6a78ae chore: update lint and format scripts to use prettier and eslint without specifying plugin search directory 2023-09-27 10:24:51 +02:00
Nikita Galaiko
61544a003c feat: add ability to unapply ownership for a hunk in the client
The changes in this commit add support for unapplying ownership for a hunk in the client. This allows users to discard changes made to a specific hunk and revert it back to its original state. The unapplyHunk method is added to the BranchController class, which sends a request to the server to unapply the ownership of the hunk. Upon successful unapplying, the virtual branch store is reloaded to reflect the changes.
2023-09-27 10:23:53 +02:00
Nikita Galaiko
114e4135ee
Merge pull request #1245 from gitbutlerapp/add-test-for-parse-ownership-tricky-file-name
fix: improve parsing of ownership ranges in FileOwnership struct
2023-09-26 14:23:15 +02:00
Nikita Galaiko
bbeadd0c8d fix: improve parsing of ownership ranges in FileOwnership struct
The parsing logic for ownership ranges in the `FileOwnership` struct has been improved. Previously, it split the input string by ':' and then by ',' to extract the file path and ranges. However, this approach had issues with file paths containing ':' characters. 

The updated logic now iterates over the parts of the input string in reverse order. If a part can be parsed as a `Hunk` (range), it is added to the `ranges` vector. Otherwise, it is considered as part of the file path and added to the `file_path_parts` vector. Finally, the `file_path_parts` vector is joined with ':' to form the file path.

This change ensures that file paths containing ':' characters are correctly parsed, allowing for more flexible and accurate parsing of ownership ranges.
2023-09-26 14:18:40 +02:00
Nikita Galaiko
d9f93a28ec
Merge pull request #1244 from gitbutlerapp/unapply-ownership
unapply ownership api
2023-09-26 14:06:20 +02:00
Nikita Galaiko
c7a86f2039 unapply ownership api 2023-09-26 13:59:02 +02:00
Nikita Galaiko
9daea8152b
Merge pull request #1243 from gitbutlerapp/add-checkout-tree-builder
Add checkout tree builder
2023-09-26 10:57:54 +02:00
Nikita Galaiko
3cdce00170 refactor: simplify checkout options in merge and apply branch functions
The merge_virtual_branch_upstream, apply_branch, and update_base_branch functions had repetitive code for checking out conflicts. This commit refactors the code to use a new CheckoutIndexBuilder struct, which simplifies the checkout options and makes the code more readable.
2023-09-26 10:52:46 +02:00
Nikita Galaiko
9f721e57d9 refactor: simplify code for checking out tree and add builder pattern for checkout options
The code for checking out a tree has been simplified by removing unnecessary code and using the builder pattern for checkout options. This makes the code more readable and maintainable.
2023-09-26 10:43:13 +02:00
Nikita Galaiko
a26f8f1a16
Merge pull request #1242 from gitbutlerapp/refactor-build-wd-tree-function
refactor: simplify code for adding index entry and building working d…
2023-09-26 10:35:00 +02:00
Nikita Galaiko
18371227e8 refactor: simplify code for adding index entry and building working directory tree 2023-09-26 10:30:16 +02:00
Nikita Galaiko
3d118c51f1
Merge pull request #1237 from gitbutlerapp/refactor-file-lock-struct
reduce amount of opened file for locks
2023-09-25 10:47:52 +02:00
Nikita Galaiko
065c00b011 reduce amount of opened file for locks 2023-09-25 10:36:51 +02:00
Nikita Galaiko
a953c8829b
Merge pull request #1236 from gitbutlerapp/fix-repo-base-url
fix: handle different formats of remoteUrl in BaseBranch class's repo…
2023-09-22 13:07:22 +02:00
Nikita Galaiko
ef1f41d5ee fix: handle different formats of remoteUrl in BaseBranch class's repoBaseUrl method 2023-09-22 13:05:40 +02:00
Nikita Galaiko
022f7014ab
Merge pull request #1235 from gitbutlerapp/fix-session-files-and-deltas
chore: use Partial<Record<..>> for better type checking
2023-09-21 14:40:45 +02:00
Nikita Galaiko
9d99a4aad8 chore: use Partial<Record<..>> for better type checking 2023-09-21 13:39:47 +02:00
Scott Chacon
49dfcace64
Merge pull request #1228 from gitbutlerapp/add-merge-virtual-branch-function
Detect and merge upstream branch changes
2023-09-21 10:17:14 +02:00
Nikita Galaiko
e282f22e6d
Merge pull request #1234 from gitbutlerapp/remove-unused-test-data-script
chore: remove unused test data generation script and associated JSON …
2023-09-21 10:10:14 +02:00
Nikita Galaiko
9c2534fd44 chore: remove unused test data generation script and associated JSON file 2023-09-21 10:09:44 +02:00
Scott Chacon
661d111475
give branchCount a default 2023-09-21 10:09:12 +02:00