Nikita Galaiko
e48c8b02bb
use channel in the release updater url
2023-07-14 15:01:49 +02:00
Nikita Galaiko
4dc5f66873
rm channel from s3 dist
2023-07-14 14:14:30 +02:00
GitButler
be9adcea51
Remove pathline if no commits on virtual branch
2023-07-14 14:05:04 +02:00
Mattias Granlund
c9872f70d6
Improve UX around resolving merge conflicts
...
- resolve conflict button updates state
- message at top changes when only commit is left
- actually close modal after going ahead with conflicts
2023-07-14 13:51:44 +02:00
Nikita Galaiko
4d343b4849
fix nightly action
2023-07-14 13:09:00 +02:00
Kiril Videlov
61a4695194
fix vbranch file contents to include deltas
2023-07-14 13:07:39 +02:00
Nikita Galaiko
556db1290d
nightly builds
2023-07-14 13:06:22 +02:00
Nikita Galaiko
dd16428451
rm duplicated diff calculation
2023-07-14 12:36:55 +02:00
Nikita Galaiko
9054c004cf
extract diff to a separate mod
2023-07-14 12:36:55 +02:00
Kiril Videlov
28cc3e545a
add file content to the vbranch files
2023-07-14 11:45:45 +02:00
Mattias Granlund
4643d4e796
Remove unnecessary ipc.ts file
2023-07-14 10:21:07 +02:00
Nikita Galaiko
8dabbc29d4
move conflicts to a separate mod
2023-07-14 10:12:40 +02:00
Mattias Granlund
8a6314eb27
Use bundled tailwind nesting plugin
...
See documentation at:
https://tailwindcss.com/docs/using-with-preprocessors#nesting
2023-07-14 09:48:33 +02:00
Nikita Galaiko
e5d8282339
rm usnused code
2023-07-14 09:32:37 +02:00
Nikita Galaiko
c16b772739
do not cache rust on aarch
2023-07-14 08:53:11 +02:00
Scott Chacon
d80dbb1c44
fix conflict thing ( #707 )
...
* fix conflict thing
* test failed correctly
2023-07-13 17:57:41 +02:00
Mattias Granlund
503921f7bf
Add logging for ipc calls
2023-07-13 17:53:54 +02:00
Mattias Granlund
d243b24458
Some flow control for merge conflicts
2023-07-13 17:53:54 +02:00
Mattias Granlund
c04a8f717c
Use setContext/getContext for BranchController
2023-07-13 17:53:54 +02:00
Mattias Granlund
fecd3fe67d
Change where setContext is called for userSettings
2023-07-13 17:53:54 +02:00
Kiril Videlov
14c2164d9d
no message no commit button
2023-07-13 17:29:05 +02:00
Kiril Videlov
af32173fdd
only run rust checks if rust code changed
2023-07-13 16:08:20 +02:00
Nikita Galaiko
a7a1a12f5c
fix tests
2023-07-13 16:04:49 +02:00
idonahue
e45808e8a2
All branches in the swimming pool are now called "Virtual branch" + a number
2023-07-13 16:04:49 +02:00
Nikita Galaiko
59f05e0953
check for result
2023-07-13 16:02:22 +02:00
Nikita Galaiko
51fcd4e2ed
move tests to a separate file
2023-07-13 15:37:37 +02:00
Nikita Galaiko
8c0d263933
do not create default branch when not needed
2023-07-13 15:28:41 +02:00
idonahue
763e72d45c
Changed button to "Set base branch"
2023-07-13 15:21:19 +02:00
idonahue
db9f0f9c82
Changed "target" branch to "base"
2023-07-13 15:21:19 +02:00
Mattias Granlund
4ddf2ef73e
Update postcss path in histoire setup
2023-07-13 13:57:22 +02:00
Mattias Granlund
2fb176ab06
Fix warnings about aria roles
2023-07-13 13:57:22 +02:00
Mattias Granlund
65a80554af
Fix eslint errors related to .cjs files
2023-07-13 13:57:22 +02:00
Mattias Granlund
fd0d301b08
Prettier format with new rules from v4 upgrade
2023-07-13 13:57:22 +02:00
Mattias Granlund
c2dd6f9db3
Refactor some postcss stuff
...
- put global files in /styles
- add postcss-nested plugin
- change runtime import for .dark enclosed classes
2023-07-13 13:57:22 +02:00
Scott Chacon
3951a6a77e
Merge pull request #696 from gitbutlerapp/sc-merge-ui
...
Very basic merge conflict resolution
2023-07-13 13:50:51 +02:00
Scott Chacon
eb456fa0f8
lock stuff until the conflict resolutions are committed
2023-07-13 13:45:34 +02:00
Nikita Galaiko
b7d211e6dd
make clippy happier
2023-07-13 12:59:21 +02:00
Scott Chacon
f6bae4ee5d
very basic merge conflict resolution
2023-07-13 12:36:53 +02:00
Scott Chacon
b67d288e8a
Merge pull request #660 from gitbutlerapp/sc-mergey-merge-merge
...
* re-applying vbranches after getting out of date works
* can be in a multi-stage merge state
* determine if a vbranch is current, also dont apply conflicting vbranches
* got most of an epic test setup
* some small fixes and debugging, should be close
* getting write_tree to base properly
* keeping merged state in HEAD
* different way of unapplying a branch
* fix checkout, fix some tests
* almost working, problem with hunk committing vs proper status applying
* can get a vbranch list that ignores commits
* remove debugging, better integration commit message
* fix tests, take out dup
* clean up unused vars, add test back
* small fixes
* ipc to mark file as resolved
2023-07-13 11:36:07 +02:00
Scott Chacon
ce90f86e31
ipc to mark file as resolved
2023-07-13 11:29:52 +02:00
Nikita Galaiko
e871d04790
update/cleanup deps
2023-07-13 11:23:41 +02:00
Scott Chacon
808764d0dc
small fixes
2023-07-13 11:09:22 +02:00
Scott Chacon
7753965717
clean up unused vars, add test back
2023-07-13 11:04:53 +02:00
Scott Chacon
3fa1c86093
fix tests, take out dup
2023-07-13 10:55:07 +02:00
Scott Chacon
d14b5e16a1
Merge remote-tracking branch 'origin/master' into sc-mergey-merge-merge
2023-07-13 10:49:40 +02:00
Nikita Galaiko
0eae781c46
disable sentry load() instrumentation
2023-07-13 10:46:10 +02:00
Scott Chacon
5dfc1f9266
remove debugging, better integration commit message
2023-07-13 10:37:25 +02:00
Nikita Galaiko
5bce726477
upgrade svelte-related libs
2023-07-13 09:27:40 +02:00
Scott Chacon
64ef025971
can get a vbranch list that ignores commits
2023-07-13 08:10:45 +02:00
Scott Chacon
c49a287d3c
almost working, problem with hunk committing vs proper status applying
2023-07-12 18:47:58 +02:00
