Commit Graph

2314 Commits

Author SHA1 Message Date
Nikita Galaiko
ebfe63cd7e display error on wrong branch 2023-08-09 13:32:26 +02:00
Nikita Galaiko
1fd72a678b fix git file watcher check 2023-08-09 13:19:30 +02:00
Nikita Galaiko
f8494c856c define svelte error class 2023-08-09 12:07:07 +02:00
Nikita Galaiko
0918d7e982 merge upstream 2023-08-09 10:45:32 +02:00
Nikita Galaiko
dd28ca3c6b fix clippy 2023-08-09 08:28:45 +00:00
Nikita Galaiko
1a160ca9a5 fix tests 2023-08-09 08:28:45 +00:00
Nikita Galaiko
6334ce03be fix proxying 2023-08-09 08:28:45 +00:00
Nikita Galaiko
425d542533 use buffered channel in wathcher 2023-08-09 07:08:28 +00:00
Nikita Galaiko
37783cf928 cargo clippy --fix 2023-08-09 08:36:13 +02:00
Nikita Galaiko
14c3f54dcd cargo clippy fix 2023-08-09 08:35:36 +02:00
Nikita Galaiko
49ca3fbbf1 rm debug print 2023-08-09 08:34:49 +02:00
Nikita Galaiko
be944fad73 fix error convertion 2023-08-09 08:33:22 +02:00
Nikita Galaiko
5876bc8ed3 verify user is on gitbutler/integration 2023-08-08 16:25:59 +02:00
Nikita Galaiko
c15c0d8982 format 2023-08-08 13:53:52 +00:00
Nikita Galaiko
30d1f8e394 static codes for backend errors 2023-08-08 13:53:52 +00:00
Nikita Galaiko
ecfb6e4c1e remove commented code 2023-08-08 12:58:22 +00:00
Nikita Galaiko
c80a49b801 extract locking wrapper 2023-08-08 12:35:48 +00:00
Nikita Galaiko
44059e6617 move the rest 2023-08-08 12:35:48 +00:00
Nikita Galaiko
c6c865c7c4 move unapply_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
bd896f2fa5 move apply_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
6a4d71936d move delete_virtual_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
3a0875c58c move update_virtual_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
6801a8897d move update_base_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
b2e8461ad3 move set_base_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
d60d6ca683 move get_base_branch_data 2023-08-08 12:35:48 +00:00
Nikita Galaiko
8e7cb18b52 extract create_virtual_branch_from_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
6797cd27e9 extract create_virtual_branch 2023-08-08 12:35:48 +00:00
Nikita Galaiko
fab6faeec9 extract list_virtual_branches 2023-08-08 12:35:48 +00:00
Nikita Galaiko
a2aaf01295 cargo fmt 2023-08-08 12:35:48 +00:00
Nikita Galaiko
c0173af2f7 start extracting vbranch commands 2023-08-08 12:35:48 +00:00
Nikita Galaiko
632d2683de rm get_target 2023-08-08 10:46:59 +00:00
Nikita Galaiko
590e25c329 cargo fmt 2023-08-08 10:38:44 +00:00
Nikita Galaiko
360232bcfa introduce logUntil 2023-08-08 10:38:44 +00:00
Scott Chacon
92b1688f2a
Merge pull request #968 from gitbutlerapp/Virtual-branch
add integration check for virtual branches
2023-08-08 11:51:55 +02:00
Scott Chacon
f4717a2fcc fix tests, add some basic integrated text 2023-08-08 11:47:23 +02:00
Scott Chacon
9282dca6a3 I see 2023-08-08 11:37:07 +02:00
Scott Chacon
85174b5685 add integration check for virtual branches 2023-08-08 11:30:38 +02:00
Nikita Galaiko
48c46ec0be split some base branch operations into a separate module 2023-08-08 08:42:34 +00:00
Nikita Galaiko
e7082ca683 fix logs 2023-08-08 07:49:19 +00:00
Nikita Galaiko
eee20c0a1c more logs when handling watcher events 2023-08-08 07:38:06 +00:00
Nikita Galaiko
c8f449eac7 cargo fmt 2023-08-08 07:05:35 +00:00
Nikita Galaiko
08961cde42 do not fail when removing deleted project 2023-08-08 07:05:35 +00:00
dependabot[bot]
e65ac1735f Bump anyhow from 1.0.71 to 1.0.72 in /src-tauri
Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.71 to 1.0.72.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.71...1.0.72)

---
updated-dependencies:
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-08 06:20:27 +00:00
dependabot[bot]
9934399acf Bump tempfile from 3.6.0 to 3.7.1 in /src-tauri
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.6.0 to 3.7.1.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.6.0...v3.7.1)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-08 06:08:46 +00:00
dependabot[bot]
613e985511 Bump tauri-plugin-log from cdb77c4 to 700549a in /src-tauri
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace) from `cdb77c4` to `700549a`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](cdb77c4b65...700549ab02)

---
updated-dependencies:
- dependency-name: tauri-plugin-log
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-08 06:08:25 +00:00
dependabot[bot]
3abea6717b Bump serde from 1.0.179 to 1.0.183 in /src-tauri
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.179 to 1.0.183.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.179...v1.0.183)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-08 06:08:14 +00:00
dependabot[bot]
0f4d35920c Bump tokio from 1.28.2 to 1.29.1 in /src-tauri
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.28.2 to 1.29.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.28.2...tokio-1.29.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-08 06:07:58 +00:00
Mattias Granlund
d294b9d6ce Fix error in store signatures 2023-08-07 23:22:08 +01:00
Mattias Granlund
e936ad4086 Fix mistake that broke delta updates 2023-08-07 23:22:08 +01:00
Mattias Granlund
e266827bee Simplify svelte store related function params 2023-08-07 23:22:08 +01:00