251 Commits

Author	SHA1	Message	Date
Scott Chacon	9e817b4d04	Merged origin/master into add-commit-id	2024-05-15 10:43:34 +02:00
Scott	520d95aef2	merge upstream	2024-05-14 14:07:09 +00:00
Kiril Videlov	e93ddfac34	snapshot of restores keeps more metadata	2024-05-14 16:04:02 +02:00
Kiril Videlov	8bae084518	snapshots for move hunk include branch name	2024-05-14 14:55:27 +02:00
Kiril Videlov	631bc86031	snapshots of (un)appy branches contains name	2024-05-14 14:35:47 +02:00
Scott Chacon	4cde9ce71d	windows doesn't have permissions like this	2024-05-14 13:43:49 +02:00
Scott Chacon	202c551bc7	remove signing setting	2024-05-14 13:15:11 +02:00
Scott Chacon	b5c9f934d5	supporting gpg.ssh.program	2024-05-14 11:57:23 +02:00
Scott Chacon	d944cad533	merge upstream ... temp	2024-05-14 10:25:29 +02:00
Scott Chacon	f106bfa246	basic ssh signing too	2024-05-14 10:08:22 +02:00
Kiril Videlov	80148f50fe	add sha to undo commit snapshot	2024-05-13 16:37:37 +02:00
Kiril Videlov	8849c9845e	add sha to commit snapshot	2024-05-13 16:24:40 +02:00
Scott Chacon	b17ab37a01	actually run gpg if specified	2024-05-13 16:19:45 +02:00
Kiril Videlov	06dfc95692	add message trailer for commit snapshots	2024-05-13 01:07:42 +02:00
Kiril Videlov	81e948774f	fix test	2024-05-12 23:42:04 +02:00
Kiril Videlov	336c7cb9bc	enable the new oplog snapshotting by default	2024-05-12 22:36:27 +02:00
Kiril Videlov	f8023ca735	refactor snapshotter trait ... Implementing this on branch turned out ot be restrictive so implementing for Oplog	2024-05-12 19:57:42 +02:00
Kiril Videlov	262bbd8df7	on snapshot store branch name metadata	2024-05-12 19:49:51 +02:00
Kiril Videlov	d52a7f5e4f	fix an issue with incorrect snapshot metadata on branch update	2024-05-12 19:18:03 +02:00
Kiril Videlov	5b3273f542	remove unused sessions / deltas implementation ... This is removed in favor of the new `ops` module	2024-05-12 03:39:04 +02:00
Kiril Videlov	27f0802443	remove gb_reference from projects	2024-05-12 03:08:54 +02:00
Kiril Videlov	18cf10a143	remove unused fetch_gb_data	2024-05-12 02:13:02 +02:00
Kiril Videlov	bca8e13dfb	remove unused push_gb_data	2024-05-12 02:05:07 +02:00
Kiril Videlov	2bbe4fa569	remove unused list_deltas endpoint	2024-05-11 21:12:08 +02:00
Kiril Videlov	14a7e8b2a1	remove unused list_sessions	2024-05-11 20:58:14 +02:00
Scott Chacon	4d542330c5	merge stuff	2024-05-11 11:43:06 +02:00
Kiril Videlov	9e5094247b	fix rust clippy error	2024-05-09 11:33:32 -07:00
Kiril Videlov	58c124627a	add an enpoint for getting the snapshot diff	2024-05-09 11:24:42 -07:00
Josh Junon	2006511a80	Merge pull request #3724 from gitbutlerapp/fork-exec-sign ... add gitbutler_git::sign_commit()	2024-05-08 12:28:22 +02:00
Mattias Granlund	e7f25e29c5	Check we are on the right branch in verify_branch ... Ensures we don't accidentally run commands while HEAD is pointing to something other than the gitbutler/integration branch.	2024-05-08 12:20:00 +02:00
Josh Junon	738e47a377	fix sync sign utility	2024-05-08 12:16:06 +02:00
Kiril Videlov	e6633df481	feat: Optimize snapshot creation in Oplog.rs ... Check for differences between the current tree and the parent tree before creating a new snapshot to prevent creating noop snapshots.	2024-05-08 03:12:17 +02:00
Kiril Videlov	903991eea7	use default snapshot_lines_threshold	2024-05-08 02:58:30 +02:00
Kiril Videlov	7cddab8285	fix early return missing snaposhotting 🤦‍♂️	2024-05-08 01:35:11 +02:00
Kiril Videlov	a942cb6f79	move snapshot creation on branch update to trait	2024-05-08 01:09:53 +02:00
Kiril Videlov	93d5e61530	rename module snapshots to ops	2024-05-08 00:29:38 +02:00
Kiril Videlov	289aafb496	rename snapshoter to snapshot	2024-05-08 00:29:38 +02:00
Kiril Videlov	2c065a602e	rename module of oplog trait	2024-05-08 00:29:38 +02:00
Kiril Videlov	f6e19e6c12	compose traits for nicer snapshotting functions	2024-05-08 00:00:18 +02:00
Mattias Granlund	e0a2985f37	Fix background switching between target.sha and integration commit	2024-05-07 16:59:06 +02:00
Josh Junon	ca714084b1	add synchronous signed git commit utility function	2024-05-07 16:37:52 +02:00
Josh Junon	1fd0b1ecfc	make askpass broker a global	2024-05-07 16:07:37 +02:00
Scott Chacon	51f9769024	sign commits with real git ... in the strangest possible way	2024-05-07 15:15:25 +02:00
Scott Chacon	ff11fcdb90	Add change-id property to commit ... Each commit has a change-id added to it's header field so we can more easily track patches by unique ids	2024-05-07 10:28:29 +02:00
Kiril Videlov	1bc41a9146	snapshot list pagination	2024-05-07 00:46:22 +02:00
Kiril Videlov	80346af154	fixes a possible condition where if integration commit is not found a lot of integreated commits are added to a vbranch	2024-05-07 00:02:22 +02:00
Caleb Owens	f13e827e33	Don't reparse branch_id ... This should make the situation where an error occurs even more absurd. It should also be saving some extra work which is always a bonus	2024-05-06 19:50:07 +01:00
Josh Junon	dce8ead62f	use simpler virtual branch handle fetch in tests (and fix strange uncaught compilation error)	2024-05-06 20:22:40 +02:00
Josh Junon	da62926a30	simplify retrieving of the vb_state handle	2024-05-06 20:08:28 +02:00
Josh Junon	85d045362a	remove useless AsRef impl	2024-05-06 20:07:47 +02:00