Commit Graph

303 Commits

Author SHA1 Message Date
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
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
f61679c082
fix: remove unused import 2024-03-24 12:10:39 +01:00
Mattias Granlund
f2a54b7f9f Fix bug occasionally preventing hunks from being moved
- hunks equal if hash is same, regardless of line numbers
- send hash from front end when updating ownership
- use updated line numbers after hunk intersection match
2024-03-24 01:46:17 +01:00
Kiril Videlov
d26cddf445
feat(virtual_branches): handle push error with user-friendly message 2024-03-23 21:40:03 +01:00
Kiril Videlov
8075f9e04f
feat: Add tests for normalize_branch_name function 2024-03-22 13:26:44 +01:00
Rütjerodt, Marcel
7e550dd0ca Resolves #3280 - allow # in branch names 2024-03-22 10:46:56 +01:00
Josh Junon
fdbf5a0184
fix profile pictures on windows 2024-03-22 01:51:58 +01:00
Kiril Videlov
ce548aca55
Merge pull request #3266 from gitbutlerapp/add-diff-hash-function
add-diff-hash-function
2024-03-21 22:58:15 +01:00
Josh Junon
0b8c0268ac
Merge pull request #3264 from gitbutlerapp/package-windows
initial attempt at windows bundling for nightly
2024-03-21 22:50:29 +01:00
Kiril Videlov
4ea3a98799
fix: set hash when converting hunks 2024-03-21 22:48:21 +01:00
Josh Junon
2a013b0369
initial attempt at windows bundling for nightly 2024-03-21 22:40:41 +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