964 Commits

Author	SHA1	Message	Date
Kiril Videlov	bb826edf94	remove the vec of local branch entries from branch data ... It is no longer the case that the same logical branch would have multiple trees	2024-07-27 17:13:43 +02:00
Kiril Videlov	baf754aa07	Merge pull request #4507 from Byron/stable-on-unix ... avoid nightly compiler on unix	2024-07-27 15:43:35 +02:00
Sebastian Thiel	ad3e15dae4	Avoid using nightly by default. ... Instead, use it only where needed, which at this time is Windows for some nightly-only access to file-descriptors.	2024-07-27 14:35:26 +02:00
Nico Domino	1ced81fd06	fix: cleanup repo organisation (#4503)	2024-07-27 13:29:32 +02:00
Kiril Videlov	874710e221	Add todo comment for branch listing	2024-07-27 12:17:00 +02:00
Kiril Videlov	19cf35698a	fix lint	2024-07-27 11:32:55 +02:00
Kiril Videlov	ef6a4c71ce	update the definition of own_branch	2024-07-27 11:24:55 +02:00
Kiril Videlov	099a2159d1	do less work when only own branches are returned	2024-07-27 10:33:10 +02:00
Kiril Videlov	dd3ec7ddcc	remote expensive parts of branch listing	2024-07-26 14:22:22 +02:00
Kiril Videlov	c7a8ef99c8	branch listing - allow filtering ... fix matching	2024-07-26 15:00:08 +02:00
Kiril Videlov	c2fafb35ff	handle the case of maaaany branches	2024-07-25 21:28:52 +02:00
Kiril Videlov	7e482437a1	HEAD is not of interest when listing refs	2024-07-25 21:08:03 +02:00
Kiril Videlov	7e660782ad	update docs	2024-07-25 21:03:28 +02:00
Kiril Videlov	116de17c0c	fix the identity detection for Virtual branches	2024-07-25 20:57:18 +02:00
Kiril Videlov	d7f19e5633	revert back to git2 for branch listing	2024-07-25 20:30:41 +02:00
Kiril Videlov	b47530af3a	Merged origin/master into new branch list api	2024-07-25 19:29:26 +02:00
Kiril Videlov	69b7aa3d8a	refactor - move given_name_for_branch from the context to an extension on git2::Reference	2024-07-25 19:29:13 +02:00
Nico Domino	bce53ba383	feat: move @gitbutler/cloud into monorepo (#4494)	2024-07-25 15:53:28 +00:00
Kiril Videlov	3afabc2a30	merge conflict fix	2024-07-25 16:34:18 +02:00
GitButler	62f0712399	GitButler WIP Commit	2024-07-25 16:32:39 +02:00
Kiril Videlov	970c193696	fix an incorrect assumption about gix reference remotes work	2024-07-25 15:49:44 +02:00
Caleb Owens	7a6c7472a4	Always overwrite local references	2024-07-25 15:49:22 +02:00
Kiril Videlov	6eea8d2993	trying to get branch remote name	2024-07-25 15:36:16 +02:00
Caleb Owens	2f54e51a33	Don't create unrequired wip commits	2024-07-25 15:25:51 +02:00
Caleb Owens	c1c5d88303	Specify the correct branch to be the upstream ... asdf	2024-07-25 15:11:07 +02:00
Kiril Videlov	e5729fe56d	use the correct oxide api for getting the branch given name	2024-07-25 14:54:21 +02:00
Caleb Owens	2540642aaa	Update context spelling	2024-07-25 14:20:20 +02:00
Caleb Owens	c6badd9f3e	Update sidebar grouping of branches	2024-07-25 14:07:21 +02:00
Kiril Videlov	a0c724077a	handle the case when a branch is only a virtual branch and a remote is not yet set	2024-07-25 13:53:02 +02:00
Kiril Videlov	5147638d74	avoids a gix panic with symbolic references	2024-07-24 23:29:57 +02:00
Kiril Videlov	187a3c22fe	create a tauri commant for the new branch listing	2024-07-24 22:51:14 +02:00
Kiril Videlov	d0545a219e	implement branch listings stats calculation	2024-07-24 15:53:49 +02:00
Kiril Videlov	bbd3aea3d0	reimplement with gitoxide	2024-07-23 17:33:28 +02:00
Kiril Videlov	4e4326d42b	remove unnecessary branch reference chack ... We already had that info, use an enum variant to encode it	2024-07-23 15:48:37 +02:00
Kiril Videlov	a3b865a7f4	implement list branches	2024-07-23 10:45:16 +02:00
Kiril Videlov	0863e3b68d	New branch listing API - create types	2024-07-22 20:46:38 +02:00
Kiril Videlov	d8a1b4bc6b	get_workspace_head exit early when there are no applied branches ... Avoids erroring out	2024-07-22 11:25:02 +02:00
Kiril Videlov	54ae0cf9e8	more possible mitigations for the "failed to apply" problemt related to merge conflicts	2024-07-21 22:30:24 +02:00
Kiril Videlov	581a793773	possible mitigation for the case when a conflicting branch is incorrectly not unapplied base update	2024-07-21 22:04:46 +02:00
Kiril Videlov	ea4f47da1b	get_applied_status returns VirtualBranchFiles instead of a tuple of path and hunks	2024-07-21 20:12:54 +02:00
Kiril Videlov	c25e48877b	move hunk related functions and structs to a module	2024-07-21 18:22:50 +02:00
Kiril Videlov	c2d135872a	rename files module to singular for consistency	2024-07-21 18:09:15 +02:00
Kiril Videlov	880ac13f21	move commit related functions and struct to a module	2024-07-21 18:06:52 +02:00
Kiril Videlov	6e27756098	move file related operations out of virtual.rs	2024-07-21 17:59:17 +02:00
Kiril Videlov	0f00f0425a	move tree writing out of virtual branch actions crate	2024-07-21 16:15:41 +02:00
Kiril Videlov	38e01c931c	rename tree writer functions to be actually descriptive of what they do	2024-07-21 15:59:30 +02:00
Kiril Videlov	9b9bd0b2e8	make virtual.rs functions operate on VirtualBranchHunk ... Instead of the Hunk type from gitbutler_diff	2024-07-21 15:38:46 +02:00
Kiril Videlov	63863f9de5	Merge pull request #4452 from Byron/fix-4389 ... fix 4389	2024-07-20 23:12:07 +02:00
Kiril Videlov	8bfd897579	rename new_compute_locks function	2024-07-20 23:01:50 +02:00
Kiril Videlov	591552f625	get_applied_status now returns a more clear struct	2024-07-20 23:00:06 +02:00