Kiril Videlov
4ea3a98799
fix: set hash when converting hunks
2024-03-21 22:48:21 +01:00
Kiril Videlov
027684febb
feat: Implement Hunk::hash() method and replace diff_hash()
2024-03-21 22:37:36 +01:00
Kiril Videlov
eb5a2ba6c7
fix: revert to using hunk equality with hashes
2024-03-21 22:18:37 +01:00
Kiril Videlov
4000144acb
fix: fetch after push
2024-03-21 18:02:48 +01:00
Kiril Videlov
fba9b0a894
performance: diff tree to working dir with index
...
asdf
2024-03-21 00:01:29 +01:00
Kiril Videlov
7fbdfae1c4
Merge pull request #3250 from gitbutlerapp/add-connect-src-to-openai-api
...
feat(security): Add OpenAI API endpoint to CSP
2024-03-20 18:32:17 +01:00
Kiril Videlov
1b506bce79
feat(security): Add OpenAI API endpoint to CSP
2024-03-20 18:15:30 +01:00
Josh Junon
7a429dc32c
fix fetching with system executable
2024-03-20 18:13:35 +01:00
Josh Junon
ff6baa5032
add gitbutler-git utility binaries to tauri bundle config
2024-03-20 17:52:03 +01:00
Josh Junon
37f7e0ba70
don't log response parameter to git prompt response submissions
2024-03-20 15:26:46 +01:00
Kiril Videlov
f136534982
refactor: use generic as ref
2024-03-20 00:48:36 +01:00
Kiril Videlov
462a9337a4
on delete project remove virtual_branches file
2024-03-20 00:48:36 +01:00
Kiril Videlov
0831fd2619
feat: write vbranch state to a flat file
...
In addition to the default git storage, persist the state of virtual branches to a toml file in .git
2024-03-20 00:48:36 +01:00
Josh Junon
b555c376ec
allow action to be passed to test fetch endpoint
2024-03-19 20:09:43 +01:00
Mattias Granlund
9c0f77eb2f
Turn off tauri globals in conf file
...
- change was unintended
2024-03-19 19:07:02 +01:00
Mattias Granlund
17ec27f508
Make clippy happy be removing wildcard import
2024-03-19 17:56:14 +01:00
Josh Junon
c0378762c0
add fetch support
2024-03-19 17:56:14 +01:00
Josh Junon
df2f81340b
integrate gitbutler_git::push() into gitbutler-app and wire up askpass mechanisms
2024-03-19 17:56:14 +01:00
Kiril Videlov
c3076bac48
fix: remove persisting of passphrases for projects
...
Passphrases will no longer be persisted. When a project is read up, it will persist itself with the passphrase removed as a field
2024-03-19 12:50:34 +01:00
Josh Junon
92db784a29
add local git config get/set tauri commands
2024-03-19 11:01:06 +01:00
Josh Junon
572b589afa
remove unused imports
2024-03-19 10:27:12 +01:00
Kiril Videlov
106697e3f6
feat(virtual_branches): remove unnecessary synchronization
2024-03-18 23:22:58 +01:00
Kiril Videlov
8b06269c2a
refactor: Removed unnecessary unwrap in setting default target in VirtualBranchesHandle.
2024-03-18 19:31:13 +01:00
Caleb Owens
2774b81381
feat: Skip instrumenting _handle parameter in git_set_global_config and git_get_global_config
...
This commit skips instrumenting the _handle parameter in the functions git_set_global_config and git_get_global_config for cleaner logs and improved clarity in the code.
2024-03-18 19:20:18 +01:00
Caleb Owens
5cd2368236
Fix JSON formatting
2024-03-18 19:20:18 +01:00
Caleb Owens
a43cdb4060
Set up dependencies for anthropics and open AI in client
...
I've been able to use the OpenAI library as they support being in the browser if you pass the "dangerouslyAllowBrowser" flag.
Anthropics don't have any interest in supporting browers making API calls and causes sugnificant CORS problems, so I've made use of the Tauri HTTP library, so this commit also sets that up
2024-03-18 19:20:18 +01:00
Mattias Granlund
4522bd76ab
Recompute hunk hash when updating ownership file
...
- was never done, but probably should be
2024-03-18 18:56:24 +01:00
Kiril Videlov
786d63e601
refactor: Remove unnecessary println statement in get_applied_status function.
2024-03-18 18:14:21 +01:00
Mattias Granlund
1fd449bc8f
Rename/refactor a few things related to list_virtual_branches
...
- make `diff_file_to_hunks` take borrowed `FileDiff`
- improve readability of `get_applied_status`
- rename git::diff::Hunk -> git::diff::GitHunk to avoid confusion
- remove bubbling of hunk ownership (we don't use it)
- drop test for bubbling ownership
2024-03-18 17:58:35 +01:00
Josh Junon
2625ccd0d5
Merge pull request #3189 from gitbutlerapp/remove-core
...
remove core crate in favor of more granule crates
2024-03-18 15:23:20 +01:00
Josh Junon
c73dd6b0fe
normalize workspace imports
2024-03-18 15:08:51 +01:00
Josh Junon
52334a2724
remove core crate in favor of more granule crates
2024-03-18 15:06:40 +01:00
Kiril Videlov
d3e3e21a13
refactor: introduces a flat-file state for virtual branches
2024-03-16 21:23:12 +01:00
Scott Chacon
cec15bcdd0
send more context with feedback (OS, browser, index size)
2024-03-15 05:45:34 +01:00
Josh Junon
6ce77c8a06
elide lifetimes
2024-03-14 11:54:13 +01:00
Josh Junon
c5f8571e53
refactor the rest of repository.rs path handling
2024-03-14 11:30:24 +01:00
Josh Junon
5d6491f482
Merge pull request #3142 from gitbutlerapp/robust-alternates-writing
...
make the alternates path writing more robust
2024-03-14 10:47:58 +01:00
Josh Junon
2a08d87d72
make the alternates path writing more robust
2024-03-14 10:37:52 +01:00
Josh Junon
0f6f8427e7
remove unused import
2024-03-14 10:30:56 +01:00
Josh Junon
8de956400f
perform proper path handling and vectorized writes in conflict resolver
2024-03-13 15:33:53 +01:00
GitButler
c9f7ea0494
GitButler Integration Commit
...
This is an integration commit for the virtual branches that GitButler is tracking.
Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily.
If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.
Here are the branches that are currently applied:
- Virtual branch 7 (refs/gitbutler/Virtual-branch-7)
branch head: 8111cbe7994127d7c50f2ba164d06ae34f1dd302
- gitbutler-app/src/project_repository/conflicts.rs
- gitbutler-app/src/virtual_branches/virtual.rs
- Virtual branch 8 (refs/gitbutler/Virtual-branch-8)
- gitbutler-app/src/project_repository/conflicts.rs
Your previous branch was: refs/heads/exec-stuff
The sha for that commit was: 2bd1e8748628648e96d925b3bdba7572ce9ae734
For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch
2024-03-13 15:31:04 +01:00
Kiril Videlov
9a3fc86a8e
fix test
2024-03-11 22:44:19 +01:00
Kiril Videlov
6aabf37b2c
refactor: when fetching hunks by file return a map of DiffFile
...
Adding stonger types to the result will allow us to more easily propagate information like old/new files paths, size etc
2024-03-11 22:44:19 +01:00
Josh Junon
2e13650a7f
fixup many instances of poor path handling
2024-03-11 19:06:22 +01:00
Josh Junon
940059ef95
Merge pull request #3112 from gitbutlerapp/dont-use-results-in-tests
...
don't use results in tests
2024-03-11 18:41:15 +01:00
Josh Junon
86a621f2b2
don't use results in tests
2024-03-11 18:28:04 +01:00
Josh Junon
4c6d40da6e
use simpler path representation at call site
2024-03-11 18:23:06 +01:00
Josh Junon
a5e71b6903
fix test alternates test to be more robust
2024-03-11 16:40:02 +01:00
Josh Junon
bc626e4e92
Merge pull request #3108 from gitbutlerapp/fix-windows-gbrepo-path-filtering
...
fix gbrepo path filtering on windows
2024-03-11 16:25:44 +01:00
Josh Junon
8928920d47
fix gbrepo path filtering on windows
2024-03-11 15:45:00 +01:00
