75 Commits

Author	SHA1	Message	Date
Kiril Videlov	72cdec8c93	move snapshot CherryPick before the operation	2024-05-23 11:56:52 +02:00
Kiril Videlov	e0584534e5	move snapshot UndoCommit before the operation	2024-05-23 11:54:46 +02:00
Kiril Videlov	05039a2bbb	move snapshot ReorderCommit before the operation	2024-05-23 11:54:03 +02:00
Kiril Videlov	ff04bc0a59	move snapshot InsertBlankCommit before the operation	2024-05-23 11:53:16 +02:00
Kiril Videlov	168a218ebe	move snapshot MoveCommitFile before the operation	2024-05-23 11:52:27 +02:00
Kiril Videlov	f514ec752c	move snapshot AmendCommit before the operation	2024-05-23 11:51:18 +02:00
Kiril Videlov	7944fb4558	move snapshot DiscardFile before the operation	2024-05-23 11:50:34 +02:00
Kiril Videlov	6574a805a8	move snapshot DiscardHunk before the operation	2024-05-23 11:50:06 +02:00
Kiril Videlov	a418f22e23	move snapshot UpdateWorkspaceBase before the operation	2024-05-23 11:49:34 +02:00
Kiril Videlov	f94ff8fd41	move snapshot MergeUpstream to before the operation	2024-05-23 11:48:56 +02:00
Kiril Videlov	a65aec6054	move snapshot SetBaseBranch to before the operation	2024-05-23 11:48:00 +02:00
Kiril Videlov	4092464be4	move snapshot UndoCommit to before the operation	2024-05-23 11:46:52 +02:00
Kiril Videlov	77e01b5928	move snapshot CreateCommit to before the operation	2024-05-23 11:45:14 +02:00
Kiril Videlov	753cc02a37	move snapshot UnapplyBranch to before the operation	2024-05-23 11:27:24 +02:00
Mattias Granlund	021180d8f1	Rename function	2024-05-23 10:58:59 +02:00
Mattias Granlund	cd419eca67	Refactor how we merge in commits from branch upstream ... - send change_id to frontend for `RemoteCommit` - split up massive function into three - add a couple of checks to prevent unexpected state - rebase if force push allowed (needs toggle)	2024-05-23 10:58:59 +02:00
Mattias Granlund	21e98fd9f2	Simplify getting default target ... - remove try function in favor of returning error - drop unused function	2024-05-21 12:02:38 +02:00
Scott Chacon	d267dbc77d	rust is not my favorite language	2024-05-15 13:40:27 +02:00
Scott Chacon	a23253e57d	who committed this?	2024-05-15 11:14:05 +02:00
Scott	520d95aef2	merge upstream	2024-05-14 14:07:09 +00:00
Kiril Videlov	631bc86031	snapshots of (un)appy branches contains name	2024-05-14 14:35:47 +02:00
Scott Chacon	d944cad533	merge upstream ... temp	2024-05-14 10:25:29 +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
Kiril Videlov	06dfc95692	add message trailer for commit snapshots	2024-05-13 01:07:42 +02:00
Kiril Videlov	262bbd8df7	on snapshot store branch name metadata	2024-05-12 19:49:51 +02:00
Scott Chacon	4d542330c5	merge stuff	2024-05-11 11:43:06 +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	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
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	4ea691a1cd	fetch from push remote too	2024-05-06 16:01:06 +02:00
Scott Chacon	ca634807b1	Merge branch 'master' into target-branch-selector-fix	2024-05-06 13:49:27 +02:00
Kiril Videlov	4f1c63ca77	dont error commands on snapshoting erros ... If the snapshoting returns an error that should not interfere with the command that the user originally intended to run	2024-05-05 22:34:15 +02:00
Kiril Videlov	5f6ff257d1	refactor snapshotting as an Oplog trait ... Implemented on Project	2024-05-05 22:28:12 +02:00
Scott Chacon	5527d2b6e2	initial implementation of different push target	2024-05-03 11:20:47 +02:00
Scott Chacon	2b1d808314	add several history manipulation backend functions ... this adds backend functions in Rust to do the following: * move file hunks between commits (basic) * undo any commit in a stack * insert a blank commit * move a commit within the stack * update a commit message in place	2024-04-29 15:03:01 +02:00
Kiril Videlov	5420fc3e3c	use new snapshot types	2024-04-26 23:20:31 +02:00
Kiril Videlov	fd1ac5d65b	improved snapshot labels	2024-04-25 21:44:30 +02:00
Kiril Videlov	4c92caafd4	create simple snapshots on branch operations	2024-04-25 19:23:13 +02:00
Kiril Videlov	0fea544cd7	rm gb_repository from controller	2024-04-21 09:26:34 +02:00
Kiril Videlov	ee62577012	remove gb_repository from remote	2024-04-21 09:16:14 +02:00
Kiril Videlov	9ca847b2a3	remove gb_repository from base	2024-04-21 09:10:37 +02:00
Kiril Videlov	72398719bc	rm test command	2024-04-20 00:38:18 +02:00
Kiril Videlov	0dccc5634a	rm gb_repository from create_virtual_branch_from_branch	2024-04-19 22:56:07 +02:00
Kiril Videlov	8fba308e43	rm gb_repository from move_commit	2024-04-19 22:55:35 +02:00
Kiril Videlov	a35ced3826	rm gb_repository from update_commit_message	2024-04-19 22:54:54 +02:00
Kiril Videlov	7aa574d5a0	rm gb_repository from squash	2024-04-19 22:54:13 +02:00