3145 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nikita Galaiko	6bb05f8cc9	Merge pull request #1417 from gitbutlerapp/Add-upstream-commits-test ... move upstream detection tests to integration	2023-10-19 10:07:41 +02:00
Nikita Galaiko	b73359fb57	Merge pull request #1418 from gitbutlerapp/Update-rust-cache-action ... do not cache rust in berlin	2023-10-19 10:05:02 +02:00
Nikita Galaiko	e5f928cea6	do not cache rust in berlin	2023-10-19 10:03:50 +02:00
Nikita Galaiko	6044cf874d	move upstream detection tests to integration	2023-10-19 09:59:57 +02:00
Nikita Galaiko	d8a54e5c49	Merge pull request #1416 from gitbutlerapp/make-vbranch-remote-a-branch ... Make vbranch remote a branch	2023-10-19 09:51:02 +02:00
Nikita Galaiko	5d9fe88b08	Merge pull request #1415 from gitbutlerapp/Virtual-branch ... 🔨 chore: improve error handling when writing alternates file	2023-10-19 09:48:37 +02:00
Nikita Galaiko	8cff188c6e	cranky fix!	2023-10-19 09:39:59 +02:00
Nikita Galaiko	a76ff7b988	🔨 chore: improve error handling when writing alternates file	2023-10-19 09:36:24 +02:00
Nikita Galaiko	36eea73e52	🔨 chore: update references to branch upstream and upstreamCommits in client code ... The changes in this commit update the references to the `branch.upstream` property and `branch.upstreamCommits` array in the client code. The code now uses the `branch.upstream.name` property instead of `branch.upstream` and `branch.upstream.commits` instead of `branch.upstreamCommits`. This change ensures that the code is compatible with the updated data structure.	2023-10-19 09:30:31 +02:00
Nikita Galaiko	474cfa2249	🔨 chore: refactor branch upstream handling	2023-10-19 09:12:20 +02:00
Nikita Galaiko	45dce1ecea	extract branch to remove branch	2023-10-19 08:50:53 +02:00
Nikita Galaiko	e3d8b850b6	Merge pull request #1413 from gitbutlerapp/cargo-cranky-fix-bin-and-lib ... fix bin/lib and use cargo cranky instead of clippy	2023-10-19 08:18:31 +02:00
extrawurst	eb5b7ea6d3	fix new tests	2023-10-18 17:26:54 +02:00
extrawurst	1cea6fb988	fix long line	2023-10-18 16:47:28 +02:00
extrawurst	36c4d104bc	fix weird long lines	2023-10-18 16:47:00 +02:00
extrawurst	bb56719d1e	fix merge conflict	2023-10-18 16:45:40 +02:00
dependabot[bot]	f0e71a1c43	Bump sha2 from 0.10.7 to 0.10.8 ... Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.10.7 to 0.10.8. - [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.10.7...sha2-v0.10.8) --- updated-dependencies: - dependency-name: sha2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-18 16:39:41 +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	6afa9ad187	Merge pull request #1412 from gitbutlerapp/correctly-track-references ... correctly track local references	2023-10-18 15:27:05 +02:00
Nikita Galaiko	6fb3cba980	correctly track local references	2023-10-18 15:17:09 +02:00
Kiril Videlov	0857b4483b	🔨 chore: add GitHub integration context to tray components	2023-10-18 14:50:37 +02:00
Kiril Videlov	1e23e77ffa	🔨 chore: move github context to page and inject into components	2023-10-18 14:50:37 +02:00
Kiril Videlov	3f74c66fb7	refactor: move remote branches out of tray and into their own component	2023-10-18 14:11:15 +02:00
Nikita Galaiko	b916eb8afe	Merge pull request #1409 from gitbutlerapp/allow-non-unique-branch-names ... move reset tests to integration	2023-10-18 13:37:03 +02:00
dependabot[bot]	94d5730135	Bump clap from 4.4.2 to 4.4.6 ... Bumps [clap](https://github.com/clap-rs/clap) from 4.4.2 to 4.4.6. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.4.2...v4.4.6) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-18 13:27:41 +02:00
extrawurst	cd44939926	bump sha2, tokio-util, tauri and bstr. for consistency i pinned the tauri version to the specific semver like the others	2023-10-18 13:26:01 +02:00
Nikita Galaiko	b7e24fa4f4	move reset tests to integration	2023-10-18 13:23:55 +02:00
extrawurst	c5f5dc015f	check unused dependencies in ci (#1406) ... also * remove unused `sentry-rust-minidump` * use maintained rust toolchain github action * make `init-env-rust` parameterized to allow picking `nightly`	2023-10-18 12:52:37 +02:00
Nikita Galaiko	71f391926b	Merge pull request #1407 from gitbutlerapp/allow-non-unique-branch-names ... allow non unique branch names	2023-10-18 12:33:41 +02:00
Nikita Galaiko	ab46442731	allow non unique branch names	2023-10-18 12:20:37 +02:00
extrawurst	f1d52adecb	cleanup since we have a handcrafted posthog implementation and this cargo dep only made sure chrono has the feature serde enabled	2023-10-18 10:45:31 +02:00
Nikita Galaiko	fe14df8c66	Merge pull request #1404 from gitbutlerapp/single-instance ... ensure single instance	2023-10-18 10:26:02 +02:00
Nikita Galaiko	50de344923	Merge pull request #1403 from gitbutlerapp/Refactor-fetch-result ... use backoff while fetching data in background	2023-10-18 10:25:28 +02:00
Nikita Galaiko	210e748d15	ensure single instance	2023-10-18 10:14:37 +02:00
Nikita Galaiko	18c7fe74bd	use backoff while fetching data in background	2023-10-18 09:59:58 +02:00
Nikita Galaiko	261ba4bf38	Merge pull request #1401 from gitbutlerapp/Fix-casts-and-types ... refactor: update type conversions and remove unnecessary clippy lints	2023-10-17 15:51:31 +02:00
Nikita Galaiko	11e052fc82	fixup	2023-10-17 15:46:38 +02:00
extrawurst	0f4a799882	reduce dynamic allocations (#1402) ... * reduce dynamic allocations	2023-10-17 15:30:46 +02:00
Nikita Galaiko	0cac4c29c0	refactor: update type conversions and remove unnecessary clippy lints	2023-10-17 15:05:40 +02:00
extrawurst	23741716f9	fix vbranch flushing to not flush non-applied vbranches (#1398) ... * fix vbranch flushing to not flush non-applied vbranches * do not use `flush_vbranch_as_tree` when flushing all vbranches	2023-10-17 15:03:19 +02:00
extrawurst	9bbfda975e	use !any(f) to simplify and remove allocating collect	2023-10-17 14:57:41 +02:00
Nikita Galaiko	99703261ea	Merge pull request #1399 from gitbutlerapp/use-github-token-for-fetching---pushing ... use github token for fetching / pushing	2023-10-17 14:45:11 +02:00
Nikita Galaiko	94f257e8b1	satisfy clippy	2023-10-17 14:40:11 +02:00
Nikita Galaiko	8795a9dd2a	cargo fmt	2023-10-17 14:32:09 +02:00
Nikita Galaiko	15fb05e7a2	use github token for fetching / pushing	2023-10-17 14:19:47 +02:00
Nikita Galaiko	d721bc7bcb	Merge pull request #1397 from gitbutlerapp/Add-cargo-check-and-clippy ... prettify scripts	2023-10-17 10:22:40 +02:00
Nikita Galaiko	5cf3fd931e	prettify scripts	2023-10-17 10:21:00 +02:00
Nikita Galaiko	29e4c90d12	Merge pull request #1389 from gitbutlerapp/Add-test-for-register-empty-new-file ... Add test for register empty new file	2023-10-17 09:54:45 +02:00
Nikita Galaiko	a20963def2	rewrite git diff printing	2023-10-17 09:20:15 +02:00
Nikita Galaiko	9dbf36f8f9	correctly handle multiple empty file diffs	2023-10-16 16:36:14 +02:00