gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-09 03:18:16 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,524 Commits 157 Branches 1,083 Tags 64 MiB
0570679887
Commit Graph

447 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