gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-04 03:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,586 Commits 147 Branches 1,034 Tags 51 MiB
ca6e8f6597
Commit Graph

405 Commits

Author SHA1 Message Date
Nikita Galaiko
b142a3c25b fix: handle binary files and prioritize binary hunks 2023-11-15 10:21:33 +01:00
Nikita Galaiko
824012466d do not send handled auth errors to sentry 2023-11-15 09:13:50 +01:00
Nikita Galaiko
779c731f1c introduce rate limiter for sentry 2023-11-14 16:58:51 +01:00
Nikita Galaiko
9eb3cf9e0a handle open error 2023-11-14 15:19:22 +01:00
Nikita Galaiko
bdd24b69da extract sentry mod 2023-11-14 15:09:01 +01:00
Nikita Galaiko
165b0fcf46 handle projects that were removed 2023-11-14 15:02:16 +01:00
Nikita Galaiko
4684e22ba1
Merge pull request #1586 from gitbutlerapp/dependabot/cargo/tokio-1.34.0 
chore(deps): bump tokio from 1.33.0 to 1.34.0
 2023-11-14 11:45:13 +01:00
Nikita Galaiko
ab893091ad
Merge pull request #1590 from gitbutlerapp/dependabot/cargo/uuid-1.5.0 
chore(deps): bump uuid from 1.4.1 to 1.5.0
 2023-11-14 11:44:56 +01:00
Nikita Galaiko
8dcc102d29 debounce file change events 2023-11-14 11:37:40 +01:00
Nikita Galaiko
9f1910a59e ignore some vbranch errors while flushing 2023-11-14 10:25:31 +01:00
Nikita Galaiko
ee2e281ec3
Merge pull request #1595 from gitbutlerapp/fix-amend-ownership-check 
Fix amend ownership check
 2023-11-14 10:14:21 +01:00
Nikita Galaiko
f6531e815e verify amendable diffs agains real diff 2023-11-14 09:48:18 +01:00
Nikita Galaiko
449c0092e5 make sure all dirs exist when creating project 2023-11-14 09:47:49 +01:00
Nikita Galaiko
bdb0753e0b chore: fix warnings 2023-11-14 09:24:26 +01:00
dependabot[bot]
fd7a0a6b92
chore(deps): bump uuid from 1.4.1 to 1.5.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.4.1...1.5.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-13 15:55:30 +00:00
dependabot[bot]
875ee4b40a
chore(deps): bump tokio from 1.33.0 to 1.34.0 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.33.0 to 1.34.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.33.0...tokio-1.34.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-13 15:54:23 +00:00
Nikita Galaiko
75541c16b8 remove wd_tree flush optimization 2023-11-13 16:34:15 +01:00
Kiril Videlov
071889592c chore: simplify filter condition in list_remote_branches function 2023-11-11 18:02:23 +01:00
Kiril Videlov
c00e645881 list all remote branches 2023-11-11 18:02:23 +01:00
Nikita Galaiko
8f43847213
Merge pull request #1557 from gitbutlerapp/add-commit-method 
Add commit method
 2023-11-10 16:12:59 +01:00
Nikita Galaiko
77a8f15efa no signing when authors might mismatch 2023-11-10 16:04:39 +01:00
Nikita Galaiko
f58a79eb0c chore: remove migration logic for old data format 2023-11-10 15:48:23 +01:00
Nikita Galaiko
9949d2aa39
Merge pull request #1554 from gitbutlerapp/check-and-push-project-code 
Check and push project code
 2023-11-10 13:02:23 +01:00
Nikita Galaiko
018a480f3f feat: optimize code push check to only push if sync is enabled and code URL is present 2023-11-10 12:26:53 +01:00
Nikita Galaiko
b2c97fcc89 fix: fix order of commit descriptions in assertion statements 2023-11-10 12:19:57 +01:00
Nikita Galaiko
c144a82e36 feat: squash commits 2023-11-10 09:05:20 +01:00
Nikita Galaiko
41710e8656
Merge pull request #1549 from gitbutlerapp/add-squash-function 
GB-601 Add squash function
 2023-11-09 13:45:19 +01:00
Nikita Galaiko
ed8e348bfe feat: squash api 2023-11-09 13:00:14 +01:00
Kiril Videlov
1f7bcd05fb remove dead code 2023-11-08 18:45:32 +01:00
extrawurst
e94631cbb1 remove unused code 2023-11-08 16:36:11 +01:00
extrawurst
7e0a5844c4
GB-627: Session flush command (#1539) 2023-11-08 16:34:33 +01:00
Nikita Galaiko
b277992391 move virtual branches call into controller 2023-11-08 14:38:27 +01:00
Nikita Galaiko
43ffb2dc05 extract bookmarks controller 2023-11-08 13:32:46 +01:00
Nikita Galaiko
21f678b273 extract deltas controller 2023-11-08 12:28:50 +01:00
extrawurst
7d7fbbb513 * not not try to push code to gb every tick 
* use same tick interval as for fetch: 15min
* flush leading to push is unaffected by this
 2023-11-08 12:08:48 +01:00
Nikita Galaiko
cc900b911d
Merge pull request #1536 from gitbutlerapp/remove-log-tree-function 
Remove log tree function
 2023-11-08 11:13:49 +01:00
Nikita Galaiko
76c871bebe do not flush logs tree 2023-11-08 10:51:00 +01:00
Nikita Galaiko
14b25966e5 fix: handle removed files correctly when building working directory tree 2023-11-08 10:48:09 +01:00
Nikita Galaiko
872079fc8a
Merge pull request #1532 from gitbutlerapp/add-sessions-controller 
Add sessions controller
 2023-11-08 10:45:53 +01:00
Nikita Galaiko
89f4ee7899
Merge pull request #1533 from gitbutlerapp/remove-git-gb-push 
Remove git gb push
 2023-11-08 10:45:45 +01:00
dependabot[bot]
bec7bafa96
chore(deps): bump tokio-util from 0.7.9 to 0.7.10 
Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.9 to 0.7.10.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/commits)

---
updated-dependencies:
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-08 08:23:24 +00:00
Nikita Galaiko
18c83607bb
Merge pull request #1516 from gitbutlerapp/dependabot/cargo/chrono-0.4.31 
chore(deps): bump chrono from 0.4.29 to 0.4.31
 2023-11-08 09:20:46 +01:00
Nikita Galaiko
f8ef0e005a
Merge pull request #1515 from gitbutlerapp/dependabot/cargo/thiserror-1.0.50 
chore(deps): bump thiserror from 1.0.48 to 1.0.50
 2023-11-08 09:20:17 +01:00
Nikita Galaiko
84bb4f0eee rm unused methods 2023-11-08 09:18:12 +01:00
Nikita Galaiko
8e895a90c4 extract session commands 2023-11-08 09:16:40 +01:00
extrawurst
fe0368219f workaround libgit2 limitation of not pushing wildcards: explicitly pushing all ref/gitbutler/.. refs 2023-11-07 17:23:56 +01:00
Nikita Galaiko
823672ff47
Merge pull request #1527 from gitbutlerapp/fix-session-indexing 
less aggressive session indexing hack
 2023-11-07 14:54:20 +01:00
Nikita Galaiko
5027509640 cargo fmt 2023-11-07 14:02:57 +01:00
Nikita Galaiko
bd022452f1 less aggressive session indexing hack 2023-11-07 13:35:18 +01:00
Nikita Galaiko
3a3f8da54c make sure deleted files are removed from session/wd 2023-11-07 13:31:14 +01:00
Nikita Galaiko
735e23be83 chore: refactor code to remove unnecessary references in function signatures 2023-11-07 12:42:38 +01:00
dependabot[bot]
d07530d554
chore(deps): bump chrono from 0.4.29 to 0.4.31 
Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.29 to 0.4.31.
- [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.29...v0.4.31)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-06 15:36:05 +00:00
dependabot[bot]
b77e604ebb
chore(deps): bump thiserror from 1.0.48 to 1.0.50 
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.48 to 1.0.50.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.48...1.0.50)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-06 15:35:48 +00:00
Nikita Galaiko
8917e3b9ba git: treat ssh key error as auth error 2023-11-06 15:24:08 +01:00
Nikita Galaiko
f946a58d5f feat: use From instead of TryForm where possible 2023-11-06 10:57:00 +01:00
Nikita Galaiko
7dc9f45d1a chore: refactor Controller initialization to use from method instead of try_from for improved code readability and consistency 2023-11-06 10:32:12 +01:00
Nikita Galaiko
f00aa38677
Merge pull request #1508 from gitbutlerapp/add-test-for-dirty-function 
GB-626
 2023-11-03 14:47:38 +01:00
Nikita Galaiko
1a5cda3799 extra check for sessions indexer 2023-11-03 14:30:30 +01:00
Nikita Galaiko
7480ac20be
Merge pull request #1506 from gitbutlerapp/create-virtual-branch-reference 
Create virtual branch reference
 2023-11-03 13:30:44 +01:00
Nikita Galaiko
40bf6c6670 add missing reference creation 2023-11-03 13:08:37 +01:00
extrawurst
dc4fddf81f code push ends with pushing all gb refs 2023-11-02 16:20:39 +01:00
extrawurst
918a093d89
GB-613 push project code to gb repo (#1479) 2023-11-02 14:45:50 +01:00
Nikita Galaiko
911f884552 ensure can amend only to the same branch 2023-11-02 10:25:54 +01:00
Nikita Galaiko
67fce382d9 merged upstream 2023-11-02 09:45:45 +01:00
Nikita Galaiko
531bff3061 satisfy cranky 2023-11-02 09:21:05 +01:00
Nikita Galaiko
3ebd071e9e do not unwrap 2023-11-02 09:19:28 +01:00
Nikita Galaiko
ede64d3501 recursive link test 2023-11-02 09:00:07 +01:00
Nikita Galaiko
0edbfc1a54 fix: handle symlinks correctly when adding and flushing files in the repository 2023-11-02 08:43:25 +01:00
Nikita Galaiko
b221254257 to_same_branch working 2023-11-01 14:44:47 +01:00
Nikita Galaiko
693e92119d add tests 2023-11-01 13:45:13 +01:00
Nikita Galaiko
ad7d0d6f62 feat: allow amending hunks to the branch top commit 2023-11-01 13:42:58 +01:00
Nikita Galaiko
ba0069e6ae fix hunk locking 2023-11-01 13:27:12 +01:00
Nikita Galaiko
78c179389b
Merge pull request #1487 from gitbutlerapp/refactor-get-applied-status-function 
Refactor get applied status function
 2023-11-01 12:17:05 +01:00
Nikita Galaiko
65b1d7ed38 simplify virtual branch types conversion 2023-11-01 11:54:59 +01:00
extrawurst
e1a13b4cd1 cleanup to be more idiomatic rust by warpping the shared resource inside a Mutex 2023-10-31 20:16:40 +01:00
Nikita Galaiko
c54a8f283d ✨ feat: add support for caching and retrieving authenticated user information from GitHub API 
The changes include:
- Added a new function `getAuthenticatedWithCache` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API and cache it using `lscache`
- Added a new function `getAuthenticated` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API
- Updated the `userStore` in `client/src/lib/stores/user.ts` to include a new property `github_username` to store the GitHub username of the authenticated user
- Updated the `gitHubOauthCheckStatus` function in `client/src/routes/auth/github.ts` to set the `github_username` property of the `userStore` with the authenticated user's username
- Updated the `openURL` function in `client/src/cmd/login.go` to check for the presence of `DESKTOP_SESSION` or `XDG_CURRENT_DESKTOP`
 2023-10-31 13:25:21 +01:00
Nikita Galaiko
1720fb098f
Merge pull request #1446 from gitbutlerapp/dependabot/cargo/async-trait-0.1.74 
Bump async-trait from 0.1.73 to 0.1.74
 2023-10-31 12:04:49 +01:00
Nikita Galaiko
5b2e87c003
Merge pull request #1448 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.2 
Bump ssh-key from 0.6.1 to 0.6.2
 2023-10-31 12:04:42 +01:00
Nikita Galaiko
181c83e792
Merge pull request #1449 from gitbutlerapp/dependabot/cargo/tokio-1.33.0 
Bump tokio from 1.32.0 to 1.33.0
 2023-10-31 12:04:35 +01:00
Nikita Galaiko
7dcdd959ed fix cherry pick conflict resolution 2023-10-31 11:52:11 +01:00
Nikita Galaiko
97d6be48f0 refactor cherry picking 2023-10-31 08:45:53 +01:00
Nikita Galaiko
b896c34b70
Merge pull request #1464 from gitbutlerapp/handle-missing-default-target 
🔧 fix: handle case when default target is not set
 2023-10-30 10:11:08 +02:00
Nikita Galaiko
2a43aff7de 🔧 fix: handle case when default target is not set 2023-10-30 08:54:15 +01:00
Nikita Galaiko
a0a6b6090d
Merge pull request #1463 from gitbutlerapp/fix-project-fetch-error 
do not log auth error
 2023-10-30 09:52:04 +02:00
Nikita Galaiko
e24f00864a do not log auth error 2023-10-30 08:37:36 +01:00
dependabot[bot]
41707dfad5
Bump ssh-key from 0.6.1 to 0.6.2 
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.1 to 0.6.2.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.1...ssh-key/v0.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-28 19:52:24 +00:00
Kiril Videlov
5f1ef9149c chore: update tauri-plugin-context-menu dependency to use the gitbutlerapp repository instead of c2r0b repository 
This is a workaround for the lacking linux support, we want to at least be able to compile
 2023-10-28 21:51:30 +02:00
Kiril Videlov
19e933d713 feat: add filter functionality to pull requests listing in project view using the native context menu 2023-10-28 21:51:30 +02:00
Nikita Galaiko
2d64d29c47 refactor: avoid mutation 2023-10-24 14:51:24 +02:00
Nikita Galaiko
304ee291aa
Merge pull request #1454 from gitbutlerapp/add-merge-function-and-integrated-commits-test 
fix integrated commit detection
 2023-10-24 14:18:03 +02:00
Nikita Galaiko
f66c1e4db7 cranky fixes 2023-10-24 14:10:06 +02:00
Nikita Galaiko
687d73897a cargo fmt 2023-10-24 13:57:43 +02:00
Nikita Galaiko
52757a4ad5 better imitate a real remote merge 2023-10-24 13:57:22 +02:00
Nikita Galaiko
c0c8ac8133 fix integrated commit detection 2023-10-24 13:49:06 +02:00
Nikita Galaiko
7c56f41ab1 when choosing upstream branch name, ignore case 2023-10-24 12:46:59 +02:00
Nikita Galaiko
48b16b8881
Merge pull request #1443 from gitbutlerapp/add-cherry-pick-method 
feat: cherry pick onto virtual branch
 2023-10-24 08:45:46 +02:00
dependabot[bot]
efbd5fbe34
Bump tokio from 1.32.0 to 1.33.0 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.32.0 to 1.33.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.32.0...tokio-1.33.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-23 15:37:26 +00:00
dependabot[bot]
6f5f3aa811
Bump async-trait from 0.1.73 to 0.1.74 
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.73 to 0.1.74.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.73...0.1.74)

---
updated-dependencies:
- dependency-name: async-trait
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-23 15:36:15 +00:00
Nikita Galaiko
04007e5e87 expose cherry pick api 2023-10-23 15:57:44 +02:00
Nikita Galaiko
552fe0c5cd cherry-pick onto virtual branch 2023-10-23 15:51:31 +02:00