655 Commits

Author	SHA1	Message	Date
Pavel Laptev	0dfb591ac4	Revert "Added hotkey and the accelerator to the top menu (#4097)" (#4099) ... This reverts commit e09810bfff.	2024-06-17 14:20:38 +02:00
Pavel Laptev	e09810bfff	Added hotkey and the accelerator to the top menu (#4097)	2024-06-17 12:46:04 +02:00
Caleb Owens	58ea9879ba	Add a shortcut and menu item to access settings ... Co-authored-by: Louis <h1ghbre4k3r@dev.bre4k3r.de>	2024-06-17 11:05:47 +02:00
Kiril Videlov	64729a9a17	improve performance of workidir diff	2024-06-16 01:54:23 +02:00
Kiril Videlov	41c2ab5908	Merge pull request #4086 from gitbutlerapp/add-mempack-backend-reset-oops ... feat: Add in-memory method to open temporary repository for comparing or getting diffs.	2024-06-15 21:49:15 +02:00
Kiril Videlov	be975b7038	refactor: Remove commented-out code for conflict handling in virtual branches.	2024-06-15 21:36:56 +02:00
Kiril Videlov	b01f35bf26	feat: Add in-memory method to open temporary repository for comparing or getting diffs.	2024-06-15 21:21:11 +02:00
Mattias Granlund	650a463a16	Fix empty commit marked as integrated ... - we can't say an empty commit is integrated based on tree ids	2024-06-11 23:38:51 +02:00
Kiril Videlov	a5f3649654	remove repeat tree creation when history is being listed	2024-06-11 20:05:13 +02:00
Kiril Videlov	119107c12b	getting the snapshot diff uses workdir from applied vbranches	2024-06-11 19:51:36 +02:00
Kiril Videlov	8e8a0ffce7	list snapshots uses workdir tree from applied vbranches	2024-06-11 19:09:45 +02:00
Kiril Videlov	f36be87f8a	add the ability to get workdir tree from merging all applied virtual branches from a snapshot	2024-06-11 17:07:04 +02:00
Kiril Videlov	c15125833d	performance: creating an oplog entry does not save a workdir tree ... We are already storing the virtual branch trees separately, and merging them together can be a slow operation if the index is large.	2024-06-11 13:21:51 +02:00
Caleb Owens	a4f548e411	Diff the correct way round	2024-06-10 15:20:28 +02:00
Kiril Videlov	88e13bd89e	apply hunks in one go for submodules too	2024-06-10 11:23:36 +02:00
Kiril Videlov	ad48640347	set timeout of 2 sec when caching assets	2024-06-09 21:38:20 +02:00
Sebastian Thiel	788958ee08	hide sensitive information from ever being debug-logged	2024-06-09 08:58:17 +02:00
Kiril Videlov	c0710a05e7	captrure update branch errors in snapshot	2024-06-08 22:31:23 +02:00
Luke Carrier	c3242a5a5a	fix: subs{ i => e }quently	2024-06-07 22:39:53 +01:00
Kiril Videlov	1e253b8a59	feat(project): enable new locking by default	2024-06-06 18:08:10 +02:00
Kiril Videlov	5922ed7459	remove error type core::Error	2024-06-06 16:49:33 +02:00
Kiril Videlov	113d238753	cleanup config.rs unused functions	2024-06-06 16:41:19 +02:00
Kiril Videlov	462a98e5d1	remove unused variants of core::Error	2024-06-06 16:38:02 +02:00
Kiril Videlov	61dd48f915	on commit sign failure, set signing to false ... This way, subsequent attempts will succeed	2024-06-06 14:52:25 +02:00
Pavel Laptev	6ee2bee101	text case updated to the Sentance case (#4016) ... * text case updated to the Sentance case * text case update continue	2024-06-06 14:38:11 +02:00
Sebastian Thiel	d7c8586159	fix serde and some find-replace errors ... The first problem was that serde needed to see an extra annotation for deserialzation of Options to work - maybe not the most optimal, but it works. The second and bigger issue was a find-replace error where `branch.tree` was replaced with `branch.head`.	2024-06-06 09:24:53 +02:00
Kiril Videlov	4d2798a1fd	remove unused oid file	2024-06-06 00:45:41 +02:00
Kiril Videlov	0e694c7823	use serde with	2024-06-06 00:43:44 +02:00
Kiril Videlov	9c56a5f040	remove proxy core::Oid	2024-06-05 22:56:03 +02:00
Caleb Owens	67aad4e597	Filter out unapplied branches ... We don't have any unstaged changes for unapplied branches, so there is nothing there to lock.	2024-06-05 22:21:50 +02:00
Caleb Owens	d61879c2a1	Rust... just... please.... 😢	2024-06-05 17:31:37 +02:00
Caleb Owens	ed3294a692	Make clippy a happy clippy	2024-06-05 17:23:11 +02:00
Caleb Owens	31b240265b	Undo all extra refactoring	2024-06-05 17:22:22 +02:00
Caleb Owens	9d93bd8d9d	Defactor workdir	2024-06-05 17:19:26 +02:00
Caleb Owens	c3e9a22454	Put new implementation behind a feature flag	2024-06-05 17:18:12 +02:00
Caleb Owens	d9822be161	Reimplement compute_locks	2024-06-05 17:17:36 +02:00
Kiril Videlov	f915304e34	Merged origin/master into commit-signing-settings	2024-06-05 15:10:06 +02:00
Kiril Videlov	665ab4952a	rm some accidentally duplicated code	2024-06-05 14:41:09 +02:00
Kiril Videlov	f4ec31f81b	fix a bug in handling the case of remote refname being none	2024-06-05 14:31:26 +02:00
Scott Chacon	b8f897e3ae	gotta love rust	2024-06-05 13:41:58 +02:00
Scott Chacon	b60a66452d	merge upstream	2024-06-05 10:17:03 +02:00
Scott Chacon	a6e5abb620	can check commit signing	2024-06-05 10:14:49 +02:00
Kiril Videlov	4a54f74aa2	remove field access	2024-06-05 01:19:23 +02:00
Kiril Videlov	e63081c69d	remove core::Repository shell type	2024-06-05 01:11:10 +02:00
Kiril Videlov	65a22691ee	Merge pull request #3958 from TheGB0077/vscodium-patch ... feat: Open with VS Code also opens VS Codium if available, partial fix for #3646	2024-06-04 16:28:55 +02:00
Kiril Videlov	802e3419bd	introduce a convinience GbConfig type	2024-06-04 15:35:29 +02:00
Mattias Granlund	d0993b8acd	Update updated_at timestamp after mutations ... - also drops unnecessary `.context()` from most `vb_state.set_branch(...)` calls	2024-06-04 13:52:58 +02:00
Kiril Videlov	76284b0620	when the branch being applied has a merge commit do merge only	2024-06-04 10:10:32 +02:00
TheGB0077	848e33ac45	revert back to any	2024-06-04 04:27:51 -03:00
Mattias Granlund	30c1370140	Include fork point when getting remote branch data	2024-06-04 00:52:09 +02:00