gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-22 09:01:45 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,601 Commits 155 Branches 1,065 Tags 61 MiB
ddee80788b
Commit Graph

256 Commits

Author SHA1 Message Date
Kiril Videlov
a51f56de87
Merge pull request #2970 from gitbutlerapp/dependabot/cargo/rust-updates-c15be7964f 
Bump the rust-updates group with 10 updates
 2024-03-01 22:03:29 +01:00
Josh Junon
53aeb8a1a4 remove build warnings 2024-03-01 18:40:39 +01:00
dependabot[bot]
2af685d388
Bump the rust-updates group with 10 updates 
Bumps the rust-updates group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [serde](https://github.com/serde-rs/serde) | `1.0.196` | `1.0.197` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.56` | `1.0.57` |
| [anyhow](https://github.com/dtolnay/anyhow) | `1.0.79` | `1.0.80` |
| [bstr](https://github.com/BurntSushi/bstr) | `1.9.0` | `1.9.1` |
| [chrono](https://github.com/chronotope/chrono) | `0.4.33` | `0.4.34` |
| [governor](https://github.com/boinkor-net/governor) | `0.6.0` | `0.6.3` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.113` | `1.0.114` |
| [tauri](https://github.com/tauri-apps/tauri) | `1.5.4` | `1.6.0` |
| [log](https://github.com/rust-lang/log) | `0.4.20` | `0.4.21` |
| [tempfile](https://github.com/Stebalien/tempfile) | `3.10.0` | `3.10.1` |


Updates `serde` from 1.0.196 to 1.0.197
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.196...v1.0.197)

Updates `thiserror` from 1.0.56 to 1.0.57
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.56...1.0.57)

Updates `anyhow` from 1.0.79 to 1.0.80
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.79...1.0.80)

Updates `bstr` from 1.9.0 to 1.9.1
- [Commits](https://github.com/BurntSushi/bstr/compare/1.9.0...1.9.1)

Updates `chrono` from 0.4.33 to 0.4.34
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.33...v0.4.34)

Updates `governor` from 0.6.0 to 0.6.3
- [Release notes](https://github.com/boinkor-net/governor/releases)
- [Changelog](https://github.com/boinkor-net/governor/blob/master/release.toml)
- [Commits](https://github.com/boinkor-net/governor/compare/v0.6.0...v0.6.3)

Updates `serde_json` from 1.0.113 to 1.0.114
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.113...v1.0.114)

Updates `tauri` from 1.5.4 to 1.6.0
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.5.4...tauri-v1.6.0)

Updates `log` from 0.4.20 to 0.4.21
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/compare/0.4.20...0.4.21)

Updates `tempfile` from 3.10.0 to 3.10.1
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.10.0...v3.10.1)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: governor
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tauri
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: log
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-01 17:12:15 +00:00
Josh Junon
5c6ce60833 initial round of dead code removal 2024-03-01 17:39:42 +01:00
Josh Junon
2b53662775 fix remaining clippy errors after main.rs refactor 2024-03-01 15:49:33 +01:00
Josh Junon
d9187c8891 switch global config methods to static methods 2024-03-01 15:35:09 +01:00
Scott Chacon
748630b262 some docs and fixups 2024-03-01 15:25:20 +01:00
Josh Junon
502645eaac move from lib+bin to bin, refactor tests into crate 2024-03-01 15:14:30 +01:00
Scott Chacon
77e07e2308 Merged origin/master into Update unapply files function 2024-03-01 13:36:19 +01:00
Josh Junon
04ce762dc8 fix build/clippy warnings and flakey whitespace-sensitive tests 2024-03-01 13:31:49 +01:00
Scott Chacon
740e0477da Merged origin/master into Update unapply files function 2024-03-01 13:11:24 +01:00
Josh Junon
73faf32b29 automatically create gitbutler-ui/build 2024-03-01 13:00:31 +01:00
Josh Junon
94a5eb6be2 Turn normal comment into doc comment 2024-03-01 12:35:41 +01:00
Pavel Laptev
e58356bd14 detect OS 
in order to remove/add sidebar padding on the Sidebar
 2024-02-29 21:51:39 +02:00
Kiril Videlov
e8c7f53685
adds file logging of UI errors 2024-02-29 19:28:45 +01:00
Josh Junon
44c4365903
create windows gb repo path upon creation 2024-02-29 16:07:52 +01:00
Josh Junon
5c88e3db89
remove gitbutler-git from builds 2024-02-29 15:44:07 +01:00
Scott Chacon
c2571fd715 ✨ feat: adds reset_files command to revert files 
The "Revert File" function cheated a bit by undoing all the hunks, but that doesn't work for added or removed files. 

Added files are not removed, just contents cleared. Removed files are not restored.

This changes the implementation to just pass file paths and have git2 run the equivalent to `git checkout -- path` from the index.
 2024-02-29 13:19:16 +01:00
Nikita Galaiko
f147f12db0 merge upstream 2024-02-27 10:21:12 +01:00
Nikita Galaiko
4b4f6e210f prefer rebase when merging upstream into vbranch 2024-02-27 09:32:40 +01:00
AbhishekThorat
9eb1660af2 - Add support to remove .git/gitbutler.json file while deleting project 2024-02-26 23:45:21 +01:00
Kiril Videlov
093f003890 disallow adding of repositories with submodules due incomplete support 2024-02-26 14:17:56 +01:00
Mattias Granlund
0862d766bf Add back custom app updater 
- native one doesn't work on all platforms
 2024-02-26 13:03:23 +02:00
Kiril Videlov
c83e39ec5c update tests to reflect using the hunk context 2024-02-25 23:24:58 +01:00
Kiril Videlov
000ddeff91 chore: remove user-facing config for using diff contexts infavor of automatic migration 2024-02-25 23:24:58 +01:00
Kiril Videlov
08d22de40e if a project has not virtual branches migrate it to using diffs with context 2024-02-25 23:24:58 +01:00
Kiril Videlov
9d53268a5d use diff context lines internally if configured 2024-02-25 23:24:58 +01:00
Kiril Videlov
91885eac6b adds a config for using diffs with context lines internallyl 2024-02-25 23:24:58 +01:00
Kiril Videlov
a2e945d0b9 perf: optimize patch application for virtual branches 2024-02-25 15:54:08 +01:00
Kiril Videlov
e5bbf9298a perf: apply string patches instead of binary 2024-02-24 17:30:51 +01:00
Kiril Videlov
392cff5a42 feat: verify push results 
adds a callback checking the push result status from the remote
 2024-02-23 15:12:55 +01:00
Naman Garg
b305cdb86e Close App on Linux 2024-02-21 23:50:50 +01:00
Pranav2612000
0084b1b0ec fix: show better error message when loading a repository without commits 2024-02-21 22:22:41 +01:00
Kiril Videlov
30a72cd2f7 fix: closing the window should terminate the process for non-mac installations 2024-02-21 11:27:06 +01:00
Kiril Videlov
03b85e63c2 fix: lower the filesystem filter handling threshold 
There could be an application (e.g an IDE) which is constantly writing, so the threshold cant be too high
 2024-02-20 16:00:49 +01:00
Kiril Videlov
fb56cad857
Merge pull request #2750 from gitbutlerapp/Move-commit-to-vbranch-tests 
move commit functionality
 2024-02-20 14:55:40 +01:00
Kiril Videlov
3bc56d6c1f
chore: replace app internal scheduled fetching with UI triggered fetching on per-project basis 2024-02-20 00:52:30 +01:00
Kiril Videlov
fdac245acd chore: remove tray menu 2024-02-19 21:59:06 +01:00
Kiril Videlov
35cba464dc
Merge pull request #2689 from namanlp/replace-context-menu-plugin 
Replace fork of Context Menu Plugin with Upstream
 2024-02-19 18:59:36 +01:00
Naman Garg
aa27f8d3a8
Fix the Linux window show issue 2024-02-19 14:47:29 +05:30
Nikita Galaiko
2a07acf46e implement move_commit api 2024-02-19 09:21:12 +01:00
Federico Giovagnoli
10ae89202d
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 14:18:26 +01:00
Caleb Owens
77ddeb79ec Move comments to a rust FMT approved location 2024-02-18 13:44:30 +01:00
Caleb Owens
fa5d938590 Updated comments in context.rs 2024-02-18 13:44:30 +01:00
Caleb Owens
f790ca1b3d Add tests to verify changes 2024-02-18 13:44:30 +01:00
Caleb Owens
1378a8a8ca Change weird_testcase to not panic when it fails 2024-02-18 13:44:30 +01:00
Caleb Owens
df2e1e22c9 Fix "weird_testcase" whitespace 2024-02-18 13:44:30 +01:00
Caleb Owens
f90463c26f Fix most of the tests 2024-02-18 13:44:30 +01:00
Caleb Owens
ada7bee5d0 Fix clippy issues 2024-02-18 13:44:30 +01:00
Caleb Owens
894f9adb3b Remove whitespace 
Run rust FMT
 2024-02-18 13:44:30 +01:00
Caleb Owens
be051d7840 Fix line number calculations 2024-02-18 13:44:30 +01:00
Caleb Owens
2749ea1ccb Remove extra logic 
(the start_line_XXX_no_ctx) are the same as the hunk_XXX_start_line values
 2024-02-18 13:44:30 +01:00
Caleb Owens
29886f3290 Don't reverse before context 2024-02-18 13:44:30 +01:00
Caleb Owens
cf55bff6bf Clean up increment then decrement into one if expression 2024-02-18 13:44:30 +01:00
Caleb Owens
cf4c5609ba Fix surrounding logic 2024-02-18 13:44:30 +01:00
Caleb Owens
d9b6636462 Fix whitespace that vim removes 2024-02-18 13:44:30 +01:00
Kiril Videlov
709a8f4b2f add rate limiting for file filtering gitignored files 2024-02-18 12:36:34 +01:00
Kiril Videlov
ea927c2b21 perf: filter ignored changes for virtual branch calc 2024-02-18 12:36:34 +01:00
Kiril Videlov
dd5049244b chore: increase debounce timeout for file change events to prevent multiple events from being sent for a single file change 2024-02-17 18:28:37 +01:00
Meesayen
bd7bf3b8a9 chore: DRYer approach 2024-02-17 12:16:11 +01:00
Meesayen
fd7c18d121 feat: ability to discard changes to an entire file 2024-02-17 12:16:11 +01:00
Kiril Videlov
42302763d6 fix: update regex pattern to allow periods in branch names 2024-02-16 23:42:25 +01:00
Kiril Videlov
173886f947 fix: dont send the content of large text files to the UI as it cant handle it 2024-02-16 18:20:46 +01:00
Lawyered
88b1b647a1 Update Cargo.toml 
Corrects the usage of the indefinite article from 'an' to 'a' before the acronym 'URL' in documentation and comments, aligning with grammatical rules regarding consonant-sounding acronyms.
 2024-02-15 23:09:28 +01:00
Meesayen
7ebcd41fec fix: discard diff hunk incorrectly replaces all "-" with "+" 2024-02-15 16:56:20 +01:00
Kiril Videlov
28d5aca9c2 dont add gitbutler as committer by default 2024-02-14 22:40:44 +01:00
Naman Garg
5972ff5153
Update Tauri Context Menu plugin 2024-02-15 02:47:01 +05:30
Nikita Galaiko
eb193a32fe add TryFrom<&PathBuf> for tests 2024-02-14 17:25:39 +01:00
Nikita Galaiko
ddbeca298c unify TryFrom<&AppHandler> implementations 2024-02-14 17:25:39 +01:00
Kiril Videlov
90c8884bbf chore: remove inappropriate to_lowercase() of branch names 2024-02-14 15:48:39 +01:00
Kiril Videlov
920d0e96a8 fix: listing of remote branches no longer fetches commits and metadata 2024-02-11 22:52:52 +01:00
Kiril Videlov
d234649e47 feat: add support for fetching remote branch data and displaying commits in the branch view 2024-02-11 21:54:39 +01:00
Kiril Videlov
a42bbd7ffd feat: adds support for omitting host certificate checks when authenticating with ssh 2024-02-09 17:51:58 +01:00
Kiril Videlov
3251e15d40 feat: add gitbutler-git as a dependency and update git_head function to use gitbutler-git library for retrieving the symbolic head of a repository 2024-02-08 19:09:57 +01:00
dependabot[bot]
cef13d177c
Bump the rust-updates group with 2 updates 
Bumps the rust-updates group with 2 updates: [git2](https://github.com/rust-lang/git2-rs) and [tempfile](https://github.com/Stebalien/tempfile).


Updates `git2` from 0.18.1 to 0.18.2
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/git2-0.18.1...git2-0.18.2)

Updates `tempfile` from 3.9.0 to 3.10.0
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.9.0...v3.10.0)

---
updated-dependencies:
- dependency-name: git2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-07 12:09:43 +00:00
Nikita Galaiko
16f53de3d7
Merge pull request #2552 from gitbutlerapp/gb-818-add-test-for-unapplying-ownership 
GB-818 Add test for unapplying ownership
 2024-02-07 08:10:26 +01:00
Qix
0d201bd09c
Merge pull request #2546 from gitbutlerapp/dependabot/cargo/rust-patch-updates-1fe477dca3 
Bump the rust-patch-updates group with 3 updates
 2024-02-06 23:25:50 +01:00
Naman Garg
1cf8880a43
Update Author Email 2024-02-07 03:29:59 +05:30
Naman Garg
42befc62cd
Add authors in Packager.toml 2024-02-07 02:44:07 +05:30
Kiril Videlov
1501699689 Revert "update rate limiting for Sentry events to allow for burst" 
This reverts commit 64962078d2.
 2024-02-06 21:01:46 +01:00
Nikita Galaiko
a44d955262 remove obsolete test 2024-02-06 13:12:06 +01:00
Nikita Galaiko
ff8aac3d32 apply reverse hunk to unapply ownership 2024-02-06 12:48:43 +01:00
dependabot[bot]
3e10cfbb3f
Bump the rust-patch-updates group with 3 updates 
Bumps the rust-patch-updates group with 3 updates: [itertools](https://github.com/rust-itertools/itertools), [reqwest](https://github.com/seanmonstar/reqwest) and [sentry](https://github.com/getsentry/sentry-rust).


Updates `itertools` from 0.12.0 to 0.12.1
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.12.0...v0.12.1)

Updates `reqwest` from 0.11.23 to 0.11.24
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.23...v0.11.24)

Updates `sentry` from 0.32.1 to 0.32.2
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.32.1...0.32.2)

---
updated-dependencies:
- dependency-name: itertools
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: reqwest
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: sentry
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 16:20:33 +00:00
Nikita Galaiko
64962078d2 update rate limiting for Sentry events to allow for burst 2024-02-05 17:09:39 +01:00
Kiril Videlov
3e1a77e83a Remove LogsDir in favor of just path::PathBuf 2024-01-31 15:59:19 +01:00
Kiril Videlov
bfbfaacdd0 lint: fix clippy issues 2024-01-31 15:10:00 +01:00
Qix
2855a27c4c
Merge pull request #2476 from gitbutlerapp/dependabot/cargo/rust-patch-updates-4a55232a5a 
Bump the rust-patch-updates group with 4 updates
 2024-01-31 14:57:58 +01:00
Kiril Videlov
4e33c3ce68 Remote DataDir type in favor of just PathBuf 2024-01-31 14:39:47 +01:00
Nikita Galaiko
ab8db66dbc
Merge pull request #2488 from gitbutlerapp/set-base-branch-go-back-to-integration 
Set base branch go back to integration
 2024-01-30 14:51:28 +01:00
Nikita Galaiko
55a2641b32 fix going back to existing default target 2024-01-30 11:31:33 +01:00
Mattias Granlund
033b7f22b9 Add gitbutler, gitbutler-s3 and gravatar to browser csp 
- fixes broken profile pictures
- not sure it's worth the effort to proxy through backend
 2024-01-29 17:19:57 +01:00
Mattias Granlund
f8bce24af9 Reformat tauri conf files 2024-01-29 17:19:57 +01:00
dependabot[bot]
0cbffb2201
Bump the rust-patch-updates group with 4 updates 
Bumps the rust-patch-updates group with 4 updates: [serde](https://github.com/serde-rs/serde), [chrono](https://github.com/chronotope/chrono), [serde_json](https://github.com/serde-rs/json) and [mmap-rs](https://github.com/StephanvanSchaik/mmap-rs).


Updates `serde` from 1.0.195 to 1.0.196
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.195...v1.0.196)

Updates `chrono` from 0.4.31 to 0.4.33
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.31...v0.4.33)

Updates `serde_json` from 1.0.111 to 1.0.113
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.111...v1.0.113)

Updates `mmap-rs` from 0.6.0 to 0.6.1
- [Changelog](https://github.com/StephanvanSchaik/mmap-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/StephanvanSchaik/mmap-rs/commits)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: mmap-rs
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-29 16:01:13 +00:00
Kiril Videlov
7a05d6914c feat: adds configurable telemetry settings for error reporting and metrics tracking 2024-01-28 12:59:22 +01:00
Nikita Galaiko
e4139457e6
Merge pull request #2452 from gitbutlerapp/refactor-get-default-target-function 
Refactor get default target function
 2024-01-26 15:42:14 +01:00
Kiril Videlov
273d205789 light performance sampling in stable builds 2024-01-26 15:31:19 +01:00
Nikita Galaiko
cd8ad563b5 more places to use latest_session instead of current 2024-01-26 14:51:59 +01:00
Nikita Galaiko
67b74fe4fb
Merge pull request #2451 from gitbutlerapp/fix-current-sha-type 
Fix current sha type
 2024-01-26 14:49:27 +01:00
Nikita Galaiko
3cf1350ce2 do not attempt to create a new session in list_branches 2024-01-26 14:47:36 +01:00
Nikita Galaiko
284448e594 fix: update type of current_sha field in Branch struct to git::Oid to match the actual type of the value 2024-01-26 14:37:48 +01:00