gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-23 09:33:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,770 Commits 155 Branches 1,066 Tags 61 MiB
933da5588a
Commit Graph

547 Commits

Author SHA1 Message Date
Kiril Videlov
0570679887 default value if theres nothing? 2023-06-21 15:31:29 +02:00
Scott Chacon
40351431c8 fix hunks 2023-06-21 15:31:29 +02:00
Nikita Galaiko
977c70a802 less dev logs 2023-06-21 13:00:36 +02:00
Nikita Galaiko
7074f735d7 sanity virtual branch tests 2023-06-21 11:10:18 +02:00
Scott Chacon
645bef29b6
Merge branch 'master' into sc-vbranch-commits 2023-06-21 10:50:46 +02:00
Scott Chacon
73e9a8ca7c oops. lint 2023-06-21 10:46:58 +02:00
Scott Chacon
da2ffb795d send mtime as hunk modified time (I think) 2023-06-21 10:38:37 +02:00
Nikita Galaiko
e3a7c73bfb branch: types for ownership 2023-06-21 10:23:07 +02:00
Scott Chacon
a4a4fc39a7 fix weird hunk thing 2023-06-21 10:13:44 +02:00
Scott Chacon
2f58d4439a change how we are getting paths 2023-06-21 09:42:07 +02:00
Scott Chacon
1cdd19f073 move files between lanes 2023-06-21 09:42:07 +02:00
Nikita Galaiko
662d40044b use real function via butler 2023-06-21 09:21:59 +02:00
Nikita Galaiko
1cf2e6af96 handle move files corner cases 2023-06-21 09:21:59 +02:00
Nikita Galaiko
c9c555fa77 simplify diff processing 2023-06-21 09:21:59 +02:00
Nikita Galaiko
36c4ad8673 error handling 2023-06-21 09:21:59 +02:00
Nikita Galaiko
a57dcc7dc3 remove extra fields 2023-06-21 09:21:59 +02:00
Nikita Galaiko
ad9a024b7a butler info 2023-06-20 14:56:50 +02:00
Nikita Galaiko
a674fec718 fix warnings 2023-06-20 14:51:08 +02:00
Nikita Galaiko
ef40ffe35c remove deltas logic from vbranches 2023-06-20 14:51:08 +02:00
Scott Chacon
e59691d15f
CLI and APIs binary for simple virtual branch manipulation (#425) 
Here we're squash-merging a branch that adds a new cli tool and some basic APIs for manipulating the data format of virtual branches as used by the frontend.

* simple cli for showing data, including vbranches
* can set and show the remote target default
* basic list, new and move in API for frontend

---------

Co-authored-by: Kiril Videlov <kiril@videlov.com>
Co-authored-by: Nikita Galaiko <nikita@galaiko.rocks>
 2023-06-20 14:33:02 +02:00
Mattias Granlund
561011fff5 Initialise with system theme in Rust code 2023-06-19 12:19:08 +01:00
Nikita Galaiko
38fb0132ec update dependencies 2023-06-16 09:29:26 +02:00
Nikita Galaiko
d0a83e97cf small events refactor 2023-06-15 16:20:31 +02:00
Nikita Galaiko
da76e26d7f flush/restore branches 2023-06-15 14:38:07 +02:00
Nikita Galaiko
4a18b2200e vbranches: move deltas distribution to handler 2023-06-15 09:14:52 +02:00
Kiril Videlov
8ec1370043 setup access to branch testdata resource json file 2023-06-14 12:12:43 +02:00
Nikita Galaiko
8198de686a tests and fixes for virtual branch writer 2023-06-08 13:54:45 +02:00
Nikita Galaiko
d72e1967ee do not try to read current as a branch 2023-06-08 13:54:45 +02:00
Nikita Galaiko
6d66b4b93d Reader::is_dir 2023-06-08 13:54:45 +02:00
Nikita Galaiko
c3a3834443 use Project::try_from(git2::Repository) 2023-06-08 13:54:45 +02:00
Nikita Galaiko
37fb566f89 rust kung fu for readers 2023-06-08 13:54:45 +02:00
Nikita Galaiko
97ecc9eb96 deltas writer writes virtual branches also 2023-06-08 13:54:45 +02:00
Nikita Galaiko
ac9d06deb0 functions to split deltas into virtual branches 2023-06-08 13:54:45 +02:00
Nikita Galaiko
695ef1a00e bump git2 2023-06-07 14:27:12 +02:00
Nikita Galaiko
c186dea4af watcher handler run async 2023-06-07 13:58:49 +02:00
Nikita Galaiko
ad675c7292 vb: writer, reader for selected branch 2023-06-07 12:46:54 +02:00
Nikita Galaiko
891ca38c30 vb: separate target reader 2023-06-07 12:46:54 +02:00
Nikita Galaiko
6ee2a8c087 init bookmarks reader/writer/iterator 2023-06-05 16:15:43 +02:00
Nikita Galaiko
83be7af9f4 align session writer signature 2023-06-05 10:43:56 +02:00
Nikita Galaiko
7958ea38fa extract bookmark writer 2023-06-05 10:43:56 +02:00
Nikita Galaiko
6167ee0a31 extract pty writer 2023-06-05 10:43:56 +02:00
Nikita Galaiko
de30d69128 extract deltas writer 2023-06-05 10:43:56 +02:00
Nikita Galaiko
0c7c444bb5 improve reindex detection for bookmarks 2023-06-02 14:31:35 +02:00
Nikita Galaiko
89cfe4bc9d watcher/handler: log events 2023-06-02 14:31:35 +02:00
Nikita Galaiko
2f61c409eb make a separate reindex event 2023-06-02 14:31:35 +02:00
Nikita Galaiko
6744016ffe add basic dispatchers tests 2023-06-02 14:31:35 +02:00
Nikita Galaiko
fef2f97b20 rm crossbeam_channel dependency 2023-06-01 16:02:10 +02:00
Nikita Galaiko
a8fa48c929 fully async dispatcher 2023-06-01 15:43:34 +02:00
Nikita Galaiko
6efd814c6e simplify dispatcher 2023-06-01 14:59:06 +02:00
Nikita Galaiko
705e0b4ffb more logs to file watcher 2023-06-01 09:15:24 +02:00
Nikita Galaiko
63a576d5a6 make file_change and ticket async 2023-05-31 11:35:04 +02:00
Nikita Galaiko
e79c4f9f5f cargo fmt 2023-05-31 10:52:07 +02:00
Nikita Galaiko
ecf3194125 fix some warnings 2023-05-31 10:52:07 +02:00
Nikita Galaiko
b686053ee8 stop generating snippets in rust 2023-05-29 14:24:49 +02:00
Nikita Galaiko
9e73226702 custom snippet generator 2023-05-29 14:24:49 +02:00
Nikita Galaiko
86209c04a5 only index bookmark if changed 2023-05-29 14:24:49 +02:00
Nikita Galaiko
6b5e101f64 ngram tokenizer 2023-05-29 14:24:49 +02:00
Nikita Galaiko
3517cb5339 index bookmarks to the same search document as deltas 2023-05-29 14:24:49 +02:00
Nikita Galaiko
2f2285cf40 update test for bookmarks search 2023-05-29 14:24:49 +02:00
Nikita Galaiko
9102dd706b index ngrams for bookmark notes 2023-05-29 14:24:49 +02:00
Nikita Galaiko
afa4c397d8 setup ngram search 2023-05-29 14:24:49 +02:00
Nikita Galaiko
165fe531c4 create search index for bookmarks 2023-05-29 14:24:49 +02:00
Kiril Videlov
ebf22ec9f1 oops remove unused thing 2023-05-23 14:43:23 +02:00
Kiril Videlov
f2dbf05434 push after cloud has been enabled 2023-05-23 14:38:23 +02:00
Nikita Galaiko
2fb8fe3389 use single connection to database 2023-05-23 10:27:01 +02:00
Nikita Galaiko
37efa4e48a remove db hooks 2023-05-22 16:56:10 +02:00
Nikita Galaiko
0fb7aaede4 add button to player frame filename 2023-05-22 16:56:10 +02:00
Nikita Galaiko
beca54115b display bookmark status in the sessions list 2023-05-22 16:56:10 +02:00
Nikita Galaiko
490f3ba657 add bookmark modal 2023-05-22 16:56:10 +02:00
Nikita Galaiko
a261060403 rm printlns 2023-05-22 16:56:10 +02:00
Nikita Galaiko
7a58558c07 sqlite: use WAL mode 2023-05-19 16:15:46 +02:00
Nikita Galaiko
9fe324996d allow to delete bookmarks 2023-05-19 16:15:46 +02:00
Nikita Galaiko
fd00c76f6f aggregate deltas when reading from database 2023-05-19 14:12:06 +02:00
Nikita Galaiko
5031e6ba12 simplify project file change 2023-05-19 14:12:06 +02:00
Nikita Galaiko
45efa9e10e rm app/ dir 2023-05-19 12:59:57 +02:00
Nikita Galaiko
6c24282dcc save bookmarks into sessions 2023-05-19 10:57:50 +02:00
Nikita Galaiko
612261cc0a init bookmarks package 2023-05-19 10:57:50 +02:00
Nikita Galaiko
0e89f15a62 make db transaction callback return result 2023-05-19 10:57:50 +02:00
Nikita Galaiko
fc32525d85 do not index sessions twice when fetching 2023-05-17 14:33:31 +02:00
Nikita Galaiko
e083922114 remove unused code 2023-05-17 14:33:31 +02:00
Nikita Galaiko
9ae8f7f4ea add project_id to files and deltas 2023-05-17 14:33:31 +02:00
Nikita Galaiko
6a0701be5e do not store duplicated file contents 2023-05-17 14:33:31 +02:00
Nikita Galaiko
403ad202fc use sqlite hooks to emit events 2023-05-17 14:33:31 +02:00
Nikita Galaiko
7a810a17c2 save all data into database 2023-05-17 14:33:31 +02:00
Nikita Galaiko
e89a6b63e8 allow to publish events to watchers 2023-05-17 14:33:31 +02:00
Nikita Galaiko
09ea70e8a3 deltas searcher args fix 2023-05-17 14:33:31 +02:00
Nikita Galaiko
5dce8bb430 rm get_session_reader method 2023-05-17 14:33:31 +02:00
Nikita Galaiko
405983e135 rm get_session_writer method 2023-05-17 14:33:31 +02:00
Nikita Galaiko
6c0a105934 create databases for sessions,deltas,files 2023-05-17 14:33:31 +02:00
Nikita Galaiko
47cf663301 add sqlite skeleton 2023-05-17 14:33:31 +02:00
Nikita Galaiko
d6f5b3120c move reader writer to root 2023-05-16 13:31:04 +02:00
Nikita Galaiko
a1a3aaeb41 export sessionreader as reader 2023-05-16 13:31:04 +02:00
Nikita Galaiko
59352d3247 extract deltas reader 2023-05-16 13:31:04 +02:00
Nikita Galaiko
92e4e7604e extract text document to mod 2023-05-16 13:31:04 +02:00
Nikita Galaiko
e2781591c1 bump deps 2023-05-16 08:20:07 +02:00
Nikita Galaiko
15538de760 project: add description 2023-05-15 15:38:37 +02:00
Nikita Galaiko
8d81e45f8b bump tauri 2023-05-12 12:48:07 +02:00
dependabot[bot]
f48db1c7cd Bump anyhow from 1.0.70 to 1.0.71 in /src-tauri 
Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.70 to 1.0.71.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.70...1.0.71)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-12 12:23:23 +02:00
Nikita Galaiko
72888bbf07 add rust api to fetch feedback archives 2023-05-12 11:51:55 +02:00
dependabot[bot]
cf681f7b53 Bump tokio from 1.27.0 to 1.28.0 in /src-tauri 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.27.0 to 1.28.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.27.0...tokio-1.28.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-05-11 08:06:33 +02:00
dependabot[bot]
d0041f81f6 Bump git2 from 0.16.1 to 0.17.1 in /src-tauri 
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.16.1 to 0.17.1.
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/0.16.1...0.17.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-11 08:06:10 +02:00
Nikita Galaiko
1774ec4073 index sessions in background after fetch 2023-05-10 14:29:13 +02:00
Nikita Galaiko
f91061cc53 fetch project on update 2023-05-10 14:29:13 +02:00
Nikita Galaiko
fb1e8c807d unify event data 2023-05-10 14:29:13 +02:00
Nikita Galaiko
de8178d1b6 make event fields private 2023-05-10 14:29:13 +02:00
Nikita Galaiko
9eaef82393 send new sessions on fetch 2023-05-10 14:29:13 +02:00
Nikita Galaiko
a47b0dda1f Add event_sender to App and update function signatures 
Implemented the addition of an event_sender property to the App struct which is used by the start_watcher and init functions. Updated the new, init, and start_watcher functions to work with the new event_sender, and removed the now unnecessary events argument.

Changes:
- Added event_sender property to App struct.
- Added event_sender argument to new function.
- Removed events argument from init_project, init, and start_watcher functions.
- Updated start_watcher and init functions to use the new event_sender.
 2023-05-10 13:21:57 +02:00
Nikita Galaiko
2856d51979 add test for remote sync sessions order 2023-05-10 08:00:07 +02:00
Nikita Galaiko
f41413cbde add tests for remote syncronization 2023-05-10 08:00:07 +02:00
dependabot[bot]
0417e36bcc Bump uuid from 1.3.1 to 1.3.2 in /src-tauri 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.3.1...1.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 15:16:55 +02:00
dependabot[bot]
648c4507ec Bump tauri from 1.2.4 to 1.2.5 in /src-tauri 
Bumps [tauri](https://github.com/tauri-apps/tauri) from 1.2.4 to 1.2.5.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.2.4...tauri-v1.2.5)

---
updated-dependencies:
- dependency-name: tauri
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 15:01:37 +02:00
Nikita Galaiko
cea80b5cb1 fetch remotes every 10 min 2023-05-08 14:54:55 +02:00
Nikita Galaiko
f9a15a5729 test searcher delete 2023-05-08 10:05:28 +02:00
Nikita Galaiko
ed3ed7e84b add delete all data 2023-05-08 10:05:28 +02:00
Nikita Galaiko
5dd48b69ab extract reader to mod 2023-05-08 07:47:52 +02:00
Nikita Galaiko
4b92d52636 extract gb_repository to mod 2023-05-08 07:47:52 +02:00
Nikita Galaiko
8b0da72931 move the rest inside app 2023-05-08 07:38:29 +02:00
Nikita Galaiko
942b48914c move users inside app 2023-05-08 07:38:29 +02:00
Nikita Galaiko
39b3cc0698 reexport deltas 2023-05-08 07:38:29 +02:00
Nikita Galaiko
77bdd0650b move projects inside app 2023-05-08 07:38:29 +02:00
Nikita Galaiko
31f0b3a693 rm unused session.activity 2023-05-08 07:38:29 +02:00
Nikita Galaiko
014a4e0575 move deltas inside app 2023-05-08 07:38:29 +02:00
Nikita Galaiko
7b637ee527 move sessions inside app 2023-05-08 07:38:29 +02:00
Nikita Galaiko
fe61ffe042 project purging 2023-05-05 14:03:44 +02:00
Nikita Galaiko
a07d6c07a3 protect session id comparison with a lock too 2023-05-05 13:43:30 +02:00
Nikita Galaiko
92ec2a52a2 Revert "tauri 1.3" 
This reverts commit 7a0b25e9dc.
 2023-05-05 09:59:49 +02:00
Nikita Galaiko
e0639b0024
return open project error reasons to frontend 2023-05-04 13:32:00 +02:00
Nikita Galaiko
7a0b25e9dc tauri 1.3 2023-05-04 10:22:41 +02:00
Nikita Galaiko
f1818f78e6 minor refactoring 2023-05-03 12:34:11 +02:00
Nikita Galaiko
559074ff20 store session_id hash mapping 2023-05-03 08:15:11 +02:00
Nikita Galaiko
797b210c9d do not share repositories between requests 2023-05-02 15:00:53 +02:00
Nikita Galaiko
cd382bd9f7 set last session timestamp 2023-04-28 13:01:36 +02:00
Nikita Galaiko
7efdf0a5e7 use default differ component to render commit diff 2023-04-28 09:48:26 +02:00
Nikita Galaiko
7ff819c78a support hiding windows on non-macs 2023-04-27 13:46:58 +02:00
Nikita Galaiko
198c272175 hide and show app completely 2023-04-27 13:46:58 +02:00
Nikita Galaiko
13da9d8f87 handle strip_prefix error 2023-04-27 11:02:01 +02:00
Nikita Galaiko
4bfd84ee86 more logs 2023-04-27 11:02:01 +02:00
Nikita Galaiko
06c4590dc9 more info in error messages 2023-04-27 11:02:01 +02:00
Nikita Galaiko
617ae58013 do not return statuses for non utf file names 2023-04-27 11:02:01 +02:00
Scott Chacon
227a3f469c push to the project id 2023-04-25 16:04:30 +02:00
Nikita Galaiko
b89ec9f1ce cmdk: add more help actions 2023-04-24 16:03:02 +02:00
Nikita Galaiko
6970c324c7 git_match_path: make it case insensitive 2023-04-24 10:51:51 +02:00
Nikita Galaiko
a06c234e0c better sentry setup 2023-04-21 16:10:06 +02:00
Nikita Galaiko
28fd4d1127 better test 2023-04-21 12:51:42 +02:00
Nikita Galaiko
3690b99537 correctly handle unicode diffs 2023-04-21 12:51:42 +02:00
Nikita Galaiko
6827ab6a00 better log messages 2023-04-21 12:51:42 +02:00
Nikita Galaiko
1f6c703869 cargo update 2023-04-21 12:51:42 +02:00
Nikita Galaiko
0c089e18c2 support partially staged files 2023-04-21 09:59:40 +02:00
Nikita Galaiko
848b6b5dc7 add comments 2023-04-20 10:48:16 +02:00
Nikita Galaiko
2c87b383ba newline 2023-04-20 10:48:16 +02:00