gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 11:32:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,709 Commits 148 Branches 1,028 Tags 65 MiB
7ad43dfff7
Commit Graph

2709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
42aa15a96c fix linter 2023-08-29 11:24:06 +02:00
Nikita Galaiko
62f00beacc manually index session created by virtual branches 2023-08-29 10:39:36 +02:00
Kiril Videlov
1e35aab885 Update base branch conditionally in button click event 
The button click event was modified to show a modal only if a certain condition is not met; otherwise, it will immediately update the base branch. The condition depends on the state of the `mergeUpstreamWarningDismissed` variable. 

Changes:
- Replaced the direct function call `updateTargetModal.show` upon button click with a conditional function.
- Now, on button click, if `mergeUpstreamWarningDismissed` is true, the base branch gets updated using `branchController.updateBaseBranch()`.
- If `mergeUpstreamWarningDismissed` is false, the previous functionality remains, i.e., `updateTargetModal.show` gets called
 2023-08-29 10:39:32 +02:00
Nikita Galaiko
919cdc6e5b store watcher manager inside the state 2023-08-29 10:30:19 +02:00
Nikita Galaiko
ec2131baf4
Merge pull request #1115 from gitbutlerapp/fetch-single 
make sure one fetch at a time
 2023-08-29 08:07:37 +02:00
Nikita Galaiko
92069577c2 make sure one fetch at a time 2023-08-29 08:03:32 +02:00
Mattias Granlund
be036dd852 Add missing change for file explorer 2023-08-29 00:27:56 +01:00
Mattias Granlund
b47132b278 Add file explorer to branch lane 
- can be resized
- only appears for n >= 2 changed files
 2023-08-29 00:27:56 +01:00
Mattias Granlund
2adee3ed2b Fix bug that can freeze ui 
- solving problem for now, but that variable should not be undefined..
 2023-08-28 22:39:14 +01:00
dependabot[bot]
f8b0437d21 Bump posthog-js from 1.77.1 to 1.77.2 
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.77.1 to 1.77.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.77.1...v1.77.2)

---
updated-dependencies:
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-28 22:38:52 +01:00
Mattias Granlund
1e7856385e Fix broken commit links 
- stopPropagation on parent container prevents normal link from opening
- added on:click handler workaround

I tried for a while to figure out a different way around this, but I wasn't able
to both prevent bubbling (closing peek tray) while also opening the browser.
 2023-08-28 22:38:40 +01:00
dependabot[bot]
e4d99cae1f Bump @codemirror/lang-javascript from 6.1.9 to 6.2.1 
Bumps [@codemirror/lang-javascript](https://github.com/codemirror/lang-javascript) from 6.1.9 to 6.2.1.
- [Changelog](https://github.com/codemirror/lang-javascript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-javascript/compare/6.1.9...6.2.1)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-javascript"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-28 22:34:36 +01:00
dependabot[bot]
dddd3754f3 Bump @codemirror/lang-html from 6.4.5 to 6.4.6 
Bumps [@codemirror/lang-html](https://github.com/codemirror/lang-html) from 6.4.5 to 6.4.6.
- [Changelog](https://github.com/codemirror/lang-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-html/compare/6.4.5...6.4.6)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-html"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-28 22:31:51 +01:00
dependabot[bot]
e8c6942b47 Bump vitest from 0.34.2 to 0.34.3 
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 0.34.2 to 0.34.3.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.34.3/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-28 22:31:22 +01:00
dependabot[bot]
4464197ad4 Bump typescript from 5.1.6 to 5.2.2 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.1.6 to 5.2.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.1.6...v5.2.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-28 22:28:10 +01:00
Mattias Granlund
0b8d7a5eda Force https over ssh in ci 
- auth fails withou ssh key, even for public repos
 2023-08-28 21:43:49 +01:00
Mattias Granlund
0a40b7d61d Fix some more fileSummaries test stuff 2023-08-28 20:46:58 +01:00
Mattias Granlund
936001bd4a Fix fileSelections tests 2023-08-28 20:46:58 +01:00
Mattias Granlund
8aeb85fee1 Fix file tree tests 2023-08-28 20:46:58 +01:00
Mattias Granlund
92b0ed9a65 Improve file tree UI things 
- sort folder first
- better spacing between chevron and folder icon
- color files by their status
 2023-08-28 20:46:58 +01:00
Mattias Granlund
16c72cd399 Shows added and removed lines by file in vbranch peek 
- also changes the FileTree component to accept single node prop
 2023-08-28 20:46:58 +01:00
Kiril Videlov
e29f508bf3 Add dismissable warning for merging upstream work 
This update introduces a dismissable warning for merging upstream work from the base branch. The user can now choose not to show this warning again, and this choice is remembered by the system. This is achieved by adding a checkbox that triggers a new function, `projectMergeUpstreamWarningDismissed`, altering the interface's vertical space, and tweaking the execution of the `branchController.updateBaseBranch` method.

Detailed changes:
- Introduced a checkbox to the warning modal, binded to `mergeUpstreamWarningDismissedCheckbox`.
- Adjusted the vertical spacing between elements in the warning modal, from `space-y-2` to `space-y-4`.
- Modified the onclick method of the merge button to call `mergeUpstreamWarningDismissed.set(true)`, if `mergeUpstreamWarningDismissedCheckbox` is checked.
- Added `mergeUpstreamWarningDismissed` and `mergeUpstreamWarningDismissedCheckbox` variables to control the checkbox state, using the new `projectMergeUpstreamWarningDismissed` method.
- New `projectMergeUpstreamWarningDismissed` method added to handle persistent dismissal of the warning across sessions
 2023-08-28 13:28:48 +02:00
Kiril Videlov
d3d69096a9 remove unused top bar component 2023-08-28 13:05:15 +02:00
Kiril Videlov
beeab32656 remove upstream branch name component 2023-08-28 13:04:10 +02:00
Nikita Galaiko
86a1691430
Merge pull request #1096 from gitbutlerapp/test-utils 
test_utils::commit_all
 2023-08-28 10:32:46 +02:00
Nikita Galaiko
cfcfa79316 test_utils::commit_all 2023-08-28 10:28:26 +02:00
Nikita Galaiko
fb9cf8eebb
Merge pull request #1095 from gitbutlerapp/test-utils 
init test_utils
 2023-08-28 09:56:53 +02:00
Nikita Galaiko
c458fb145f cargo fmt 2023-08-28 09:44:04 +02:00
Nikita Galaiko
40d101a075 init test_utils 2023-08-28 09:34:30 +02:00
Nikita Galaiko
605c3e0dc1
Merge pull request #1094 from gitbutlerapp/if-locked--return 
if locked, return
 2023-08-28 09:02:06 +02:00
Nikita Galaiko
8e013dcfde if locked, return 2023-08-28 08:57:34 +02:00
Mattias Granlund
8732110d7a Fix small UI issues in vbranch peek file tree 2023-08-25 11:50:41 +01:00
Nikita Galaiko
f74cbdee1c
Merge pull request #1092 from gitbutlerapp/limit-gb-concurrency 
limit number of concurrent gb connections
 2023-08-25 10:15:09 +02:00
Nikita Galaiko
6dc17898d8 just use a lock 2023-08-25 10:10:42 +02:00
Nikita Galaiko
eeef217c63 limit number of concurrent gb connections 2023-08-25 09:06:49 +02:00
Kiril Videlov
ce7aecc026 fix lint 2023-08-24 17:15:02 +02:00
Kiril Videlov
670ed4eca0 rename config 2023-08-24 17:15:02 +02:00
Kiril Videlov
14bee31cc3 show a banner for repos with https remotes informing the user to create an ssh key 2023-08-24 17:15:02 +02:00
Mattias Granlund
d767728350 Update butler/Cargo.lock 
- rust-analyzer wants this
 2023-08-24 15:45:47 +01:00
Mattias Granlund
08e12d54e0 Show changed files in vbranch peek 
- adds a component for rendering a file tree
- needs a bit more iteration
 2023-08-24 15:29:12 +01:00
Kiril Videlov
3a85c50bcb base branch peek tray - call local commits local 2023-08-24 10:02:16 +02:00
Nikita Galaiko
91647507b0
Merge pull request #1087 from gitbutlerapp/refactor 
extract is_integrated calculation
 2023-08-24 09:57:44 +02:00
Nikita Galaiko
d141446d18 extract is_integrated calculation 2023-08-24 09:54:06 +02:00
Mattias Granlund
1aafe95943 Renaming TrayNext -> Tray, and FileCardNext -> FileCard 2023-08-23 15:42:53 +01:00
Mattias Granlund
19a023f455 Fixes all current eslint warnings 2023-08-23 15:33:21 +01:00
Mattias Granlund
d9f9e36ba5 Drop redundant refreshes of stores 
- we rely on dependencies between stores for most updates
 2023-08-23 15:03:46 +01:00
Mattias Granlund
ec7ea4cb6b Refresh vbranches when trunk changes 
- this will make sure "branch is integrated" becomes visible when repo is fetched
 2023-08-23 15:03:46 +01:00
Nikita Galaiko
bfc6f9f9ee
Merge pull request #1084 from gitbutlerapp/refactor 
simplify branch list
 2023-08-23 15:36:22 +02:00
Nikita Galaiko
32fc7a3783 simplify branch list 2023-08-23 15:17:59 +02:00
Mattias Granlund
47dadf3903 Removes the "New virtual branch" button 
- looks quite ugly
- in empty state we do not show it
 2023-08-23 13:52:08 +01:00