626 Commits

Author	SHA1	Message	Date
Nikita Galaiko	a8e35f5ef7	cargo fmt	2023-07-21 08:38:17 +02:00
Nikita Galaiko	b9e8e0f65d	handlers: move tests into same file	2023-07-21 08:38:17 +02:00
Nikita Galaiko	fd741b1fa8	copy values inside dispatcher	2023-07-21 08:38:17 +02:00
Nikita Galaiko	45d85e9d2a	fix compilation	2023-07-20 16:31:09 +02:00
Nikita Galaiko	c28c3b58e5	put more locks for vbranch operations	2023-07-20 16:31:09 +02:00
Nikita Galaiko	6cea0cee40	fix pushing	2023-07-20 15:40:32 +02:00
Nikita Galaiko	8188722433	fix tests compilatation	2023-07-20 14:14:19 +02:00
Nikita Galaiko	3ba99e207c	cargo fmt	2023-07-20 14:14:19 +02:00
Nikita Galaiko	9787c596c6	simplify watcher api	2023-07-20 14:14:19 +02:00
Scott Chacon	c77a5dae44	actually respect the correct setting	2023-07-20 10:12:57 +02:00
Scott Chacon	37e1e42ca2	can set the gitbutler.utmostDiscretion setting from the ui as a supporter	2023-07-20 09:58:05 +02:00
Kiril Videlov	94ff9506e3	different icon for dev mode	2023-07-19 15:12:16 +02:00
Nikita Galaiko	8028eaaa67	do not show target branch in the tray	2023-07-19 14:45:14 +02:00
Nikita Galaiko	345c74ba62	include left lines into hash caclulation	2023-07-19 12:46:14 +02:00
Scott Chacon	59b0604d7e	Formatting	2023-07-19 11:33:04 +02:00
Scott Chacon	56ba838334	tests and symlinks	2023-07-19 11:33:04 +02:00
GitButler	a02e2e1c82	Formatting	2023-07-19 11:33:04 +02:00
GitButler	62bc434869	Check if a file is executable and use that mode	2023-07-19 11:33:04 +02:00
Nikita Galaiko	b810a73d2f	stop assuming push remote name	2023-07-19 10:45:52 +02:00
Nikita Galaiko	7ce2428304	rm unused printlns	2023-07-19 10:45:52 +02:00
Nikita Galaiko	c7f29f5cb8	cargo fmt	2023-07-19 10:45:52 +02:00
Nikita Galaiko	2b5e981e28	use branch::Name for virtual_branches	2023-07-19 10:45:52 +02:00
Nikita Galaiko	e458bfd077	cargo fmt	2023-07-19 10:45:52 +02:00
Nikita Galaiko	11730aa7af	create git branch name module	2023-07-19 10:45:52 +02:00
Nikita Galaiko	4299d63074	rm unused parameter	2023-07-19 10:45:52 +02:00
GitButler	5000c577a6	use git config if it exists	2023-07-18 13:11:27 +02:00
GitButler	2f1bc32363	get default user from git config if we’re not logged in	2023-07-18 13:11:27 +02:00
nikita@galaiko.rocks	f2cdf79439	do not flush session/wd tree	2023-07-18 12:54:55 +02:00
nikita@galaiko.rocks	5ca9a644d2	cargo fmt	2023-07-18 09:28:01 +02:00
nikita@galaiko.rocks	3c579ef577	consider adding the same hunk an update	2023-07-18 09:28:01 +02:00
nikita@galaiko.rocks	1c71dfd511	proxy remote branch autors avatars	2023-07-17 16:13:16 +02:00
nikita@galaiko.rocks	922046d9c3	singleton assets proxy	2023-07-17 16:13:16 +02:00
GitButler	1300888d82	rm assets mod	2023-07-17 14:49:26 +02:00
GitButler	2ebb1438c9	store singleton zipper in a state	2023-07-17 14:49:26 +02:00
Nikita Galaiko	d4ea56e38e	cleanup tauri deps	2023-07-17 13:41:58 +02:00
Nikita Galaiko	d1fc5d23e0	move butler to another crate	2023-07-17 13:41:58 +02:00
Nikita Galaiko	f0f615c150	refactor cmd	2023-07-17 10:47:22 +02:00
Nikita Galaiko	c923722cad	make upstream optional	2023-07-17 09:12:20 +02:00
Nikita Galaiko	b2fb64c071	use merge name & branch, remove description	2023-07-17 09:12:20 +02:00
Nikita Galaiko	e48c8b02bb	use channel in the release updater url	2023-07-14 15:01:49 +02:00
Nikita Galaiko	556db1290d	nightly builds	2023-07-14 13:06:22 +02:00
Nikita Galaiko	dd16428451	rm duplicated diff calculation	2023-07-14 12:36:55 +02:00
Nikita Galaiko	9054c004cf	extract diff to a separate mod	2023-07-14 12:36:55 +02:00
Nikita Galaiko	8dabbc29d4	move conflicts to a separate mod	2023-07-14 10:12:40 +02:00
Nikita Galaiko	e5d8282339	rm usnused code	2023-07-14 09:32:37 +02:00
Scott Chacon	d80dbb1c44	fix conflict thing (#707) ... * fix conflict thing * test failed correctly	2023-07-13 17:57:41 +02:00
Nikita Galaiko	a7a1a12f5c	fix tests	2023-07-13 16:04:49 +02:00
idonahue	e45808e8a2	All branches in the swimming pool are now called "Virtual branch" + a number	2023-07-13 16:04:49 +02:00
Nikita Galaiko	59f05e0953	check for result	2023-07-13 16:02:22 +02:00
Nikita Galaiko	51fcd4e2ed	move tests to a separate file	2023-07-13 15:37:37 +02:00