Commit Graph

6791 Commits

Author SHA1 Message Date
Ani Betts
1c3d8d3997
Allow events to be explicitly flushed
This adds a new method to allow us to explicitly flush pending change
notifications
2024-05-15 20:27:25 +02:00
Ani Betts
fe35b1f65f
Import notify_debounce_full
We need to make some changes to notify_debounce_full and it seems like
the project is unmaintained, let's copy-paste some code
2024-05-15 20:27:25 +02:00
Scott Chacon
4b683828cd
Merge pull request #3721 from gitbutlerapp/add-commit-id
Add change-id property to commit
2024-05-15 13:37:11 +00:00
Scott Chacon
5becf4e6a6
small fixes 2024-05-15 15:24:08 +02:00
Scott Chacon
b0c5c07a57
some change-id based tests 2024-05-15 15:21:19 +02:00
Scott Chacon
2ce4e5bfd0
remove a bunch of debugging 2024-05-15 14:48:26 +02:00
Scott Chacon
d267dbc77d
rust is not my favorite language 2024-05-15 13:40:27 +02:00
Scott Chacon
a23253e57d
who committed this? 2024-05-15 11:14:05 +02:00
Scott Chacon
9e817b4d04
Merged origin/master into add-commit-id 2024-05-15 10:43:34 +02:00
Kiril Videlov
b2f8ab589e
Merge pull request #3764 from gitbutlerapp/update-restore-snapshot-functionality
snapshot of restores keeps more metadata
2024-05-14 16:57:07 +02:00
Scott
520d95aef2 merge upstream 2024-05-14 14:07:09 +00:00
Kiril Videlov
e93ddfac34
snapshot of restores keeps more metadata 2024-05-14 16:04:02 +02:00
Kiril Videlov
569b792b34
Merge pull request #3763 from gitbutlerapp/move-hunk-branch-updates-implementation
snapshots for move hunk include branch name
2024-05-14 15:10:48 +02:00
Kiril Videlov
8bae084518
snapshots for move hunk include branch name 2024-05-14 14:55:27 +02:00
Kiril Videlov
2110c26680
Merge pull request #3762 from gitbutlerapp/apply-unapply-branch-functions-fix
snapshots of (un)appy branches contains name
2024-05-14 14:48:39 +02:00
Kiril Videlov
631bc86031
snapshots of (un)appy branches contains name 2024-05-14 14:35:47 +02:00
Scott Chacon
4cde9ce71d
windows doesn't have permissions like this 2024-05-14 13:43:49 +02:00
Scott Chacon
202c551bc7
remove signing setting 2024-05-14 13:15:11 +02:00
Scott Chacon
b5c9f934d5
supporting gpg.ssh.program 2024-05-14 11:57:23 +02:00
Scott Chacon
d944cad533 merge upstream
temp
2024-05-14 10:25:29 +02:00
Scott Chacon
f106bfa246
basic ssh signing too 2024-05-14 10:08:22 +02:00
Kiril Videlov
158ed5c15d
Merge pull request #3760 from gitbutlerapp/update-snapshot-commit-creation-impl
update-snapshot-commit-creation-impl
2024-05-13 16:49:01 +02:00
Kiril Videlov
80148f50fe
add sha to undo commit snapshot 2024-05-13 16:37:37 +02:00
Kiril Videlov
8849c9845e
add sha to commit snapshot 2024-05-13 16:24:40 +02:00
Scott Chacon
b17ab37a01
actually run gpg if specified 2024-05-13 16:19:45 +02:00
Kiril Videlov
7c8b6beec6
Merge pull request #3759 from gitbutlerapp/project-subscribe-listen-ipc-delete
remove unused index subscription
2024-05-13 14:31:56 +02:00
Scott Chacon
4eaf7d2b1d
prettier 2024-05-13 14:19:59 +02:00
Kiril Videlov
62dadd96a8
remove unused index subscription 2024-05-13 14:18:56 +02:00
Kiril Videlov
b50ab35503
Merge pull request #3757 from gitbutlerapp/snapshot-commit-creation-update
add message trailer for commit snapshots
2024-05-13 01:24:38 +02:00
Kiril Videlov
06dfc95692
add message trailer for commit snapshots 2024-05-13 01:07:42 +02:00
Kiril Videlov
af95a898cb
Merge pull request #3756 from gitbutlerapp/dependabot/npm_and_yarn/npm-updates-495e94661d
Bump the npm-updates group across 1 directory with 13 updates
2024-05-13 00:23:17 +02:00
dependabot[bot]
91bc6f0a10
Bump the npm-updates group across 1 directory with 13 updates
Bumps the npm-updates group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@tauri-apps/cli](https://github.com/tauri-apps/tauri) | `1.5.12` | `1.5.13` |
| [openai](https://github.com/openai/openai-node) | `4.38.5` | `4.45.0` |
| [@codemirror/lang-python](https://github.com/codemirror/lang-python) | `6.1.5` | `6.1.6` |
| [@sentry/sveltekit](https://github.com/getsentry/sentry-javascript) | `7.112.2` | `7.114.0` |
| [@tauri-apps/api](https://github.com/tauri-apps/tauri) | `1.5.4` | `1.5.5` |
| [@types/diff](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff) | `5.2.0` | `5.2.1` |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.7.1` | `7.8.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.7.1` | `7.8.0` |
| [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) | `2.38.0` | `2.39.0` |
| [postcss-load-config](https://github.com/postcss/postcss-load-config) | `5.0.3` | `5.1.0` |
| [posthog-js](https://github.com/PostHog/posthog-js) | `1.130.1` | `1.131.4` |
| [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) | `4.2.15` | `4.2.16` |
| [svelte-check](https://github.com/sveltejs/language-tools) | `3.7.0` | `3.7.1` |



Updates `@tauri-apps/cli` from 1.5.12 to 1.5.13
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.12...@tauri-apps/cli-v1.5.13)

Updates `openai` from 4.38.5 to 4.45.0
- [Release notes](https://github.com/openai/openai-node/releases)
- [Changelog](https://github.com/openai/openai-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openai/openai-node/compare/v4.38.5...v4.45.0)

Updates `@codemirror/lang-python` from 6.1.5 to 6.1.6
- [Changelog](https://github.com/codemirror/lang-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-python/compare/6.1.5...6.1.6)

Updates `@sentry/sveltekit` from 7.112.2 to 7.114.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/7.114.0/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.112.2...7.114.0)

Updates `@tauri-apps/api` from 1.5.4 to 1.5.5
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/api-v1.5.4...@tauri-apps/api-v1.5.5)

Updates `@types/diff` from 5.2.0 to 5.2.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff)

Updates `@typescript-eslint/eslint-plugin` from 7.7.1 to 7.8.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.8.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.7.1 to 7.8.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.8.0/packages/parser)

Updates `eslint-plugin-svelte` from 2.38.0 to 2.39.0
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases)
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.38.0...v2.39.0)

Updates `postcss-load-config` from 5.0.3 to 5.1.0
- [Release notes](https://github.com/postcss/postcss-load-config/releases)
- [Changelog](https://github.com/postcss/postcss-load-config/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-load-config/compare/v5.0.3...5.1.0)

Updates `posthog-js` from 1.130.1 to 1.131.4
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.130.1...v1.131.4)

Updates `svelte` from 4.2.15 to 4.2.16
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/svelte@4.2.16/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.16/packages/svelte)

Updates `svelte-check` from 3.7.0 to 3.7.1
- [Release notes](https://github.com/sveltejs/language-tools/releases)
- [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.7.0...svelte-check-3.7.1)

---
updated-dependencies:
- dependency-name: "@tauri-apps/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: openai
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@codemirror/lang-python"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@sentry/sveltekit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@tauri-apps/api"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@types/diff"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: eslint-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: postcss-load-config
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-updates
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
- dependency-name: svelte-check
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-12 22:11:09 +00:00
Kiril Videlov
e2aa78dac2
Merge pull request #3696 from imcotton/patch-1
build: adopt to resolve.conditions: es2015
2024-05-12 23:59:04 +02:00
Kiril Videlov
c75d31f7c9
Merge pull request #3755 from gitbutlerapp/update-octokit-rest-version
fix octokit/rest type for new version
2024-05-12 23:55:23 +02:00
Kiril Videlov
1f01503657
Merge pull request #3753 from gitbutlerapp/Virtual-branch
enable the new oplog snapshotting by default
2024-05-12 23:54:38 +02:00
Kiril Videlov
1e14f5095c
fix octokit/rest type for new version
GitHub change their API in patch versions lol
2024-05-12 23:53:58 +02:00
Kiril Videlov
81e948774f
fix test 2024-05-12 23:42:04 +02:00
Pavel Laptev
28b5dd85d0
Refactor: remove wrong alt on file list items (#3754) 2024-05-12 23:34:36 +02:00
Kiril Videlov
336c7cb9bc
enable the new oplog snapshotting by default 2024-05-12 22:36:27 +02:00
Kiril Videlov
a6e24953de
Merge pull request #3752 from gitbutlerapp/snapshot-creation-branch-name-fix
snapshot-creation-branch-name-fix
2024-05-12 20:09:25 +02:00
Kiril Videlov
f8023ca735
refactor snapshotter trait
Implementing this on branch turned out ot be restrictive so implementing for Oplog
2024-05-12 19:57:42 +02:00
Kiril Videlov
262bbd8df7
on snapshot store branch name metadata 2024-05-12 19:49:51 +02:00
Kiril Videlov
d52a7f5e4f
fix an issue with incorrect snapshot metadata on branch update 2024-05-12 19:18:03 +02:00
Kiril Videlov
7ca912d1bd
Merge pull request #3751 from gitbutlerapp/remove-unused-creates
remove unused creates
2024-05-12 04:33:02 +02:00
Kiril Videlov
3e0914444f
remove unused crates in tauri 2024-05-12 04:19:19 +02:00
Kiril Videlov
0a12b3eac5
remove unused crates in core 2024-05-12 04:12:56 +02:00
Kiril Videlov
459d17f547
Merge pull request #3750 from gitbutlerapp/deltas-reader-file-session-listing
remove unused sessions / deltas implementation
2024-05-12 03:52:44 +02:00
Kiril Videlov
5b3273f542
remove unused sessions / deltas implementation
This is removed in favor of the new `ops` module
2024-05-12 03:39:04 +02:00
Kiril Videlov
d9c985db26
Merge pull request #3749 from gitbutlerapp/update-file-event-removal-of-session-id
remove sessions/deltas unused tauri events
2024-05-12 03:37:24 +02:00
Kiril Videlov
91e48c6730
remove sessions/deltas unused tauri events 2024-05-12 03:24:36 +02:00