27 Commits

Author	SHA1	Message	Date
Nikita Galaiko	ba0069e6ae	fix hunk locking	2023-11-01 13:27:12 +01:00
Nikita Galaiko	7dcdd959ed	fix cherry pick conflict resolution	2023-10-31 11:52:11 +01:00
Nikita Galaiko	97d6be48f0	refactor cherry picking	2023-10-31 08:45:53 +01:00
Nikita Galaiko	f66c1e4db7	cranky fixes	2023-10-24 14:10:06 +02:00
Nikita Galaiko	687d73897a	cargo fmt	2023-10-24 13:57:43 +02:00
Nikita Galaiko	52757a4ad5	better imitate a real remote merge	2023-10-24 13:57:22 +02:00
Nikita Galaiko	c0c8ac8133	fix integrated commit detection	2023-10-24 13:49:06 +02:00
Nikita Galaiko	552fe0c5cd	cherry-pick onto virtual branch	2023-10-23 15:51:31 +02:00
Nikita Galaiko	6044cf874d	move upstream detection tests to integration	2023-10-19 09:59:57 +02:00
Nikita Galaiko	474cfa2249	🔨 chore: refactor branch upstream handling	2023-10-19 09:12:20 +02:00
extrawurst	eb5b7ea6d3	fix new tests	2023-10-18 17:26:54 +02:00
extrawurst	bb56719d1e	fix merge conflict	2023-10-18 16:45:40 +02:00
extrawurst	eb569b389c	* cleanup combined bin/lib in gitbutler ... * gitbutler as a lib is `gblib` now and used accordingly by `butler` * use `cargo-cranky` for shared lints across workspace until cargo supports Cargo.toml lints section in 1.75	2023-10-18 16:39:14 +02:00
Nikita Galaiko	6fb3cba980	correctly track local references	2023-10-18 15:17:09 +02:00
Nikita Galaiko	b7e24fa4f4	move reset tests to integration	2023-10-18 13:23:55 +02:00
Nikita Galaiko	ab46442731	allow non unique branch names	2023-10-18 12:20:37 +02:00
Nikita Galaiko	c896d2b8f2	correctly handle empty file diffs	2023-10-16 15:30:24 +02:00
Nikita Galaiko	3e575482a9	fixup	2023-10-16 15:15:29 +02:00
Nikita Galaiko	9f83b61b2b	move more apply branch tests to integration	2023-10-16 14:44:09 +02:00
Nikita Galaiko	276e2d5b4f	typed project id	2023-10-13 11:00:00 +02:00
Nikita Galaiko	8a19c3550e	type assert	2023-10-12 15:45:29 +02:00
Nikita Galaiko	cba2d2fc4f	hide some methods under #cfg(test)	2023-10-12 15:35:50 +02:00
Nikita Galaiko	878c23c229	remove duplicated tests	2023-10-12 15:14:02 +02:00
Nikita Galaiko	93d8128301	better tests for conflict resolution	2023-10-12 15:07:43 +02:00
Nikita Galaiko	2700be6b50	virtual branches conflict test	2023-10-12 14:25:01 +02:00
Nikita Galaiko	3a397c110f	assert error types instead of messages	2023-10-12 10:59:52 +02:00
Nikita Galaiko	a71baaacb0	init integration tests	2023-10-12 10:36:48 +02:00