Nikita Galaiko
bf6b7361ed
Merge pull request #1339 from gitbutlerapp/Filter-commits-by-type
...
fix integrated not remote commits display
2023-10-11 12:41:47 +02:00
Nikita Galaiko
8d9145738b
fix integrated not remote commits display
2023-10-11 12:40:17 +02:00
Nikita Galaiko
491eaa09fe
Merge pull request #1338 from gitbutlerapp/Handle-conflicting-commits
...
revert check for conflicts before commit creation
2023-10-11 12:13:28 +02:00
Nikita Galaiko
4c62849906
revert check for conflicts before commit creation
2023-10-11 12:05:48 +02:00
extrawurst
91303d9bf4
Merge pull request #1330 from gitbutlerapp/deny-unsafe-code
...
make sure clippy does not allow us to use unsafe
2023-10-11 10:38:43 +02:00
Nikita Galaiko
058b8bc70e
Merge pull request #1333 from gitbutlerapp/Refactor-init-device-oauth
...
fix: handle errors properly in init_device_oauth and check_auth_statu…
2023-10-11 10:38:14 +02:00
Kiril Videlov
b968c2cedd
fix incorrect csp list
2023-10-11 10:37:07 +02:00
extrawurst
b480902bf5
remove all unsafe usage and forbid it moving forward
2023-10-11 10:34:49 +02:00
Nikita Galaiko
2b47ed10bb
Merge branch 'master' into Refactor-init-device-oauth
2023-10-11 10:32:39 +02:00
Nikita Galaiko
3ecad2aa6e
Merge pull request #1335 from gitbutlerapp/Remove-conflict-check
...
should be possible to commit during conflict
2023-10-11 10:31:55 +02:00
Nikita Galaiko
7a145d2450
should be possible to commit during conflict
2023-10-11 10:26:16 +02:00
extrawurst
6fdb42f593
merged from upstream
2023-10-11 10:18:35 +02:00
extrawurst
f69029247e
fix conflicts
2023-10-11 10:18:28 +02:00
extrawurst
543cef22a1
Merge branch 'master' into deny-unsafe-code
2023-10-11 10:08:45 +02:00
extrawurst
bd10d3bb98
Merge pull request #1334 from gitbutlerapp/fix-some-warnings
...
refactor: remove unused imports
2023-10-11 10:05:22 +02:00
Nikita Galaiko
2d85b25005
Merge pull request #1329 from gitbutlerapp/Reset-branch-to-specific-commit
...
Reset branch to specific commit
2023-10-11 10:04:32 +02:00
Nikita Galaiko
1b12bfb3f3
cargo fmt
2023-10-11 10:04:07 +02:00
extrawurst
d8fc07f81f
refactor: remove unused imports
2023-10-11 09:57:24 +02:00
extrawurst
fff7ae7fd2
Merge pull request #1331 from gitbutlerapp/more-clippy-lints
...
more clippy lints and the according fixes
2023-10-11 09:55:43 +02:00
Nikita Galaiko
a08c6d7ce7
Merge pull request #1297 from gitbutlerapp/dependabot/cargo/reqwest-0.11.22
...
chore(deps): bump reqwest from 0.11.20 to 0.11.22
2023-10-11 09:55:25 +02:00
Nikita Galaiko
88f8d95be4
Merge pull request #1300 from gitbutlerapp/dependabot/cargo/rustix-0.38.13
...
chore(deps): bump rustix from 0.38.11 to 0.38.13
2023-10-11 09:55:14 +02:00
Nikita Galaiko
82b422c00a
Merge pull request #1304 from gitbutlerapp/dependabot/cargo/refinery-0.8.11
...
chore(deps): bump refinery from 0.8.10 to 0.8.11
2023-10-11 09:55:04 +02:00
Nikita Galaiko
41473864b5
Merge pull request #1305 from gitbutlerapp/dependabot/cargo/sha1-0.10.6
...
chore(deps): bump sha1 from 0.10.5 to 0.10.6
2023-10-11 09:54:46 +02:00
Nikita Galaiko
2e0f15de16
Merge pull request #1322 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-07650ca
...
chore(deps): bump tauri-plugin-window-state from `5b814f5` to `07650ca`
2023-10-11 09:54:27 +02:00
Nikita Galaiko
09526fdde6
fix: handle errors properly in init_device_oauth and check_auth_status functions
...
- Previously, the functions `init_device_oauth` and `check_auth_status` did not properly handle errors when sending requests and parsing response bodies.
- This commit updates the error handling in both functions to provide more informative error messages and properly propagate errors.
- Now, if there is an error sending the request or parsing the response body, the functions will return an `Error::Unknown` error with the appropriate context.
- This improves the reliability and error reporting of the login functionality in the client application.
2023-10-11 09:52:49 +02:00
extrawurst
af6c6c17bb
merged upstream
2023-10-11 09:52:43 +02:00
extrawurst
2e9f26e3cd
merged upstream
2023-10-11 09:52:36 +02:00
extrawurst
fecafc834b
Merge pull request #1328 from gitbutlerapp/GB-609-gitbutlerjson
...
GB-609: create/update `.git/gitbutler.json`
2023-10-11 09:51:03 +02:00
Nikita Galaiko
dbf2b2cacb
add subtle button to reset head commit
2023-10-11 09:43:32 +02:00
Nikita Galaiko
116953fbf1
merged upstream
2023-10-11 08:38:46 +02:00
Kiril Videlov
79f473e807
🔨 chore: move github module to correct location in module list
2023-10-10 19:18:44 +02:00
Kiril Videlov
698fb012e8
support for github device oauth flow
2023-10-10 19:18:44 +02:00
extrawurst
2acf7f36ea
more clippy lints and the according fixes
2023-10-10 17:39:13 +02:00
extrawurst
5fa412b857
make sure clippy does not allow us to use unsafe
2023-10-10 17:14:36 +02:00
extrawurst
251f78e1bf
remove unused method
2023-10-10 17:11:05 +02:00
extrawurst
6632a1b70b
feat: add test for gitbutler file creation and content verification
2023-10-10 16:36:07 +02:00
Nikita Galaiko
738d1bfceb
add a test button
2023-10-10 14:52:16 +02:00
Nikita Galaiko
1857e991aa
expose reset virtual branch command
2023-10-10 14:20:49 +02:00
Nikita Galaiko
8ebd529d55
feat: add support for tracking upstream head commit in virtual branches
...
The changes in this commit add support for tracking the upstream head commit in virtual branches. This is done by introducing a new field `upstream_head` in the `Branch` struct. The `upstream_head` field represents the last commit that has been pushed to the upstream branch.
The following changes were made:
- Added `upstream_head` field to the `Branch` struct
- Updated the `create_virtual_branch` function to initialize the `upstream_head` field as `None`
- Updated the `push` function to set the `upstream_head` field to the current head commit of the virtual branch
- Updated the `create_virtual_branch_from_branch` function to initialize the `upstream_head` field as `None`
- Updated the `BranchWriter` struct to write the `upstream_head` field to the branch metadata
- Updated the `TryFrom<&dyn crate::reader::Reader>` implementation
2023-10-10 14:13:21 +02:00
Nikita Galaiko
1721e9046f
feat: reset virtual branch
2023-10-10 14:10:24 +02:00
extrawurst
571e61e2e0
GB-609: create/update .git/gitbutler.json
...
this happens when a new session is created
2023-10-10 13:34:03 +02:00
extrawurst
64c84cd160
Merge pull request #1327 from gitbutlerapp/cleanup-clippy-warning
...
cleanup clippy warning
2023-10-10 12:46:32 +02:00
extrawurst
d3b356c3a9
cleanup clippy warning
2023-10-10 12:42:15 +02:00
Nikita Galaiko
c936a30266
Merge pull request #1325 from gitbutlerapp/Refactor-handler-struct
...
introduce dataDir to git file change handler
2023-10-10 12:29:23 +02:00
Nikita Galaiko
00543d15ee
introduce dataDir to git file change handler
2023-10-10 12:24:14 +02:00
extrawurst
ffda438143
Merge pull request #1316 from gitbutlerapp/Add-gb-flush-command
...
GB-610: flush session if GB_FLUSH file triggers watcher
2023-10-10 12:21:09 +02:00
extrawurst
f535ba30d5
trigger flush_session if GB_FLUSH file triggers watcher git event
...
* remove GB_FLUSH after processing it
* add test for flushing and deleting flush file
* add more unittests for cases:
* no session, file -> no flush, file deleted
* session, file -> flush, file deleted
* session, no file -> no flush
2023-10-10 12:03:06 +02:00
Nikita Galaiko
01e1be2f81
Merge pull request #1324 from gitbutlerapp/Update-set-user-function
...
feat: update set_user function to return the updated user object
2023-10-10 10:39:33 +02:00
Nikita Galaiko
69e9d08501
feat: update set_user function to return the updated user object
...
The `set_user` function in the client code has been updated to return the updated user object after setting it in the app. This change allows for better handling of the user object and enables further operations on it if needed. The updated function now returns a `Result<User, Error>` instead of `Result<(), Error>`.
2023-10-10 10:31:20 +02:00
Nikita Galaiko
5e1d8e3a27
Merge pull request #1323 from gitbutlerapp/Add-paths-module
...
define types for local app dir and logs dir
2023-10-10 09:39:10 +02:00
