gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-30 04:58:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,333 Commits 157 Branches 1,072 Tags 61 MiB
2b53662775
Commit Graph

198 Commits

Author SHA1 Message Date
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
Kiril Videlov
f86935d335 measure rust performance in dev and nightly 2024-01-26 13:59:38 +01:00
Nikita Galaiko
4532334874 use latest session when reading default target 2024-01-26 10:01:00 +01:00
Kiril Videlov
975729d409 chore: update terminology from "applied branches" to "workspace" 2024-01-24 17:50:36 +01:00
Kiril Videlov
4b55839fce feat: add periodic update check every 6 hours to ensure app is up to date 2024-01-24 17:41:31 +01:00
Kiril Videlov
2f1cc069be use tauri native update dialog 2024-01-24 15:17:11 +01:00
Kiril Videlov
29b5499869 hunk context lines are computed against the correct head 2024-01-24 14:09:59 +01:00
Nikita Galaiko
83d6d8dd3e
Merge pull request #2377 from gitbutlerapp/refactor-target-and-branch-writers 
Refactor target and branch writers
 2024-01-23 10:10:17 +01:00
Kiril Videlov
3c9408a253 🔧 fix: remove unnecessary TODO comment in hunk_with_context function 2024-01-22 20:48:21 +01:00
Kiril Videlov
6548bdfa21 always add old line number when building hunk context 2024-01-22 20:06:18 +01:00
Nikita Galaiko
4fda8370a4 make sure nothing is flashed when idle 2024-01-22 15:37:42 +01:00
Nikita Galaiko
143b8f6c3e remove unused variable 2024-01-22 13:13:54 +01:00
Nikita Galaiko
0d723554e6 handle applying branch that should become the target 2024-01-22 10:54:28 +01:00
Kiril Videlov
0439559a5c Improved hunk locking 
Adds a lockedBy property to hunks on the API, containing a commit id to whitch the hunk is considered locked
 2024-01-19 22:03:26 +01:00
dependabot[bot]
12f364e1fb
chore(deps): bump the rust-minor-updates group with 4 updates 
Bumps the rust-minor-updates group with 4 updates: [uuid](https://github.com/uuid-rs/uuid), [bstr](https://github.com/BurntSushi/bstr), [regex](https://github.com/rust-lang/regex) and [url](https://github.com/servo/rust-url).


Updates `uuid` from 1.6.1 to 1.7.0
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.6.1...1.7.0)

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

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

Updates `url` from 2.4.1 to 2.5.0
- [Release notes](https://github.com/servo/rust-url/releases)
- [Commits](https://github.com/servo/rust-url/compare/v2.4.1...v2.5.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
- dependency-name: url
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 17:41:07 +00:00
Nikita Galaiko
9670c863c0 always explicitly mark selected_for_changes 2024-01-19 11:07:22 +01:00
Nikita Galaiko
9898e7bf43 speed up is_remote check by assuming parents are remote 2024-01-19 08:08:59 +01:00
Pavel Laptev
d978bb6aa4 updated icons 2024-01-19 01:09:54 +01:00
Pavel Laptev
96cb115553 app icons updated 2024-01-19 01:03:24 +01:00
Qix
8cd7994d42
Merge pull request #2255 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.4 
chore(deps): bump ssh-key from 0.6.3 to 0.6.4
 2024-01-18 17:32:51 +01:00
Kiril Videlov
1e50bbd708 update tests 2024-01-18 15:31:53 +01:00
Kiril Videlov
27347f66fb serialize enum with lowercase 2024-01-18 15:31:53 +01:00
Kiril Videlov
8d564a6b45 skip types that we dont need for frontend 2024-01-18 15:31:53 +01:00
Kiril Videlov
b9b72fe7e2 🔨 chore: refactor diff printing to include change type information 2024-01-18 15:31:53 +01:00
Nikita Galaiko
ed6030486c
Merge pull request #2281 from gitbutlerapp/rebase-and-merge-function 
Rebase and merge function
 2024-01-18 13:03:32 +01:00
Nikita Galaiko
ed1feccca3 assume integrated commits's parents are integrated 2024-01-18 12:56:10 +01:00
Josh Junon
58951cc415 add basic fork/exec implementation with Tokio backend 2024-01-17 22:31:51 +01:00
Josh Junon
f119ea60ab add crate to manifests 2024-01-17 15:36:00 +01:00
Nikita Galaiko
cc7102b18c add failing test 2024-01-17 14:03:24 +01:00
Nikita Galaiko
f7bf028090 refactor: don't expose annotated commit 2024-01-17 13:42:56 +01:00
Kiril Videlov
8b8fbde33d fix hunk context line injection corner cases 2024-01-17 13:20:19 +02:00
Kiril Videlov
2c102dd957 🔨 chore: add tests for removed and new files in hunk_with_context function 2024-01-16 23:27:29 +02:00
Kiril Videlov
1fc6aabde2 more tests for injecting of hunk context 2024-01-16 18:12:28 +02:00
Kiril Videlov
c981a10abe test: add more tests for the hunk context injection 2024-01-16 13:14:54 +02:00
Kiril Videlov
d59a78aa52 unit tests for hunk context lines 2024-01-16 12:38:25 +02:00
Kiril Videlov
310d80394b 🐛 fix: handle potential index out of bounds error in context lines generation 2024-01-15 23:34:33 +02:00
Kiril Videlov
f26321065e safe usize subtraction 2024-01-15 23:15:46 +02:00
Kiril Videlov
acf487a907 fix line context for commit diffs 
when a file is new, we cant expect the parent commit to have the file
 2024-01-15 22:29:10 +02:00
dependabot[bot]
7fb4261fb8
chore(deps): bump ssh-key from 0.6.3 to 0.6.4 
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.3 to 0.6.4.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.3...ssh-key/v0.6.4)

---
updated-dependencies:
- dependency-name: ssh-key
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-15 15:10:45 +00:00
Kiril Videlov
6d96b0bf23 🔨 chore: fix out of bounds error in context_before loop 2024-01-15 15:37:22 +02:00
Kiril Videlov
7d9360662f 🐛 fix: off-by-one error in context lines calculation 2024-01-15 15:22:39 +02:00
Kiril Videlov
f5da2f012d 🐛 fix: fix index out of bounds error in context line generation 2024-01-15 15:22:39 +02:00
Nikita Galaiko
e70cf60cca ensure key is file 2024-01-15 09:45:40 +01:00
Nikita Galaiko
cc17805694 validate preferred key on the backend 2024-01-15 08:19:54 +01:00
Kiril Videlov
90e71e6458 use zero context hunks internally 
Use hunks with zero context lines for virtual branch ownership. Reconstruct the context lines before returning hunks to the frontend
working on tests WIP
handle new files
cleanup comments
skip binary files
🐛 fix: add trailing newline to diff string in hunk_with_context function
handle empty diffs
fix diff header expectations
 2024-01-14 23:42:34 +02:00
Kiril Videlov
5b7f63739b 🔨 chore: update remote URLs in tests to match new repository location 2024-01-13 17:40:47 +01:00
Nikita Galaiko
ab7e4eb73f
Merge pull request #2234 from gitbutlerapp/push-all-refs 
Push all refs
 2024-01-12 09:04:25 +01:00
Nikita Galaiko
43b071fb18 do not hide network error 2024-01-12 08:56:29 +01:00
Nikita Galaiko
fd3b443899 avoid race conditions by using timestamp instead of bool 2024-01-11 15:39:30 +01:00
Nikita Galaiko
38647d20a5 refactor: is_default -> selected_for_changes 2024-01-11 14:58:57 +01:00
Nikita Galaiko
dbe83d5f2d cargo fmt 2024-01-11 12:40:35 +01:00
Nikita Galaiko
3fd0936f54 fix: distribute hunks to the correct virtual branch based on default branch position 2024-01-11 12:37:50 +01:00
Nikita Galaiko
c376549a1f feat: add support for setting a virtual branch as the default branch 2024-01-11 10:38:22 +01:00
Nikita Galaiko
e1ee69a348 fix integrating fully merge branch while being behind 2024-01-10 12:37:23 +01:00
Nikita Galaiko
5c49311a49
Merge pull request #2214 from gitbutlerapp/remove-wd-reader 
Remove wd reader
 2024-01-10 09:55:03 +01:00
Nikita Galaiko
3eb3a40097 do not lock project directory 2024-01-10 09:49:37 +01:00
Nikita Galaiko
fb858fa936 refactor: simplify tree walk callback and use custom TreeWalkResult 2024-01-10 09:32:43 +01:00
Kiril Videlov
f3d93c79b6 🔨 chore: add test case for locking disjointed hunks in virtual branches 
🔧 fix: update line range to use i32 type in create_commit test
 2024-01-09 14:58:45 +01:00
Nikita Galaiko
0779243272 Merged origin/master into refactor-reader-writer 2024-01-09 12:57:54 +01:00