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
idonahue
42b143c94e
Visual Studio Code branding name change from VS Code
2023-07-12 18:08:30 +02:00
Kiril Videlov
ea5fc09087
diff colors like in github
2023-07-12 16:45:58 +02:00
Scott Chacon
a2fb386263
fix checkout, fix some tests
2023-07-12 15:54:18 +02:00
Scott Chacon
24aaabfdab
different way of unapplying a branch
2023-07-12 14:19:00 +02:00
Nikita Galaiko
cb233d6288
do not assume target branch
2023-07-12 13:40:52 +02:00
Nikita Galaiko
6ea6e5e4ec
refresh target branch on set
2023-07-12 13:40:52 +02:00
Mattias Granlund
1d59ea805e
Fix formatting
2023-07-12 11:50:10 +02:00
Mattias Granlund
b619a0a4c7
Tilt hunks/files less, but with some randomness
...
Just because it's a bit fun, we can remove this at any time.
2023-07-12 11:50:10 +02:00
Mattias Granlund
31fc27000a
Change CSS px values to rem for better zoom
2023-07-12 11:50:10 +02:00
Mattias Granlund
48256ec795
Remove test data from tauri conf
2023-07-12 11:50:10 +02:00
Scott Chacon
01b85af2ef
keeping merged state in HEAD
2023-07-12 11:47:10 +02:00
Nikita Galaiko
194f1646cf
separate project repo revwalks
2023-07-12 11:25:19 +02:00
Kiril Videlov
3d95f78aba
hunk syntax hightlighting
2023-07-12 11:14:20 +02:00
Kiril Videlov
7be225914d
clarify settings copy around code descriptions
2023-07-12 11:06:23 +02:00
Ian Donahue
57dc6f4cdc
PR #684 from gitbutlerapp/ian/visual-changes-2023-07-11-1
...
Ian/visual changes 2023-07-11-1
2023-07-11 18:14:39 +02:00
Ian Donahue
b9c9b18aff
Merge branch 'master' into ian/visual-changes-2023-07-11-1
2023-07-11 18:09:50 +02:00
idonahue
c7d6582a83
pnpm format
2023-07-11 18:09:20 +02:00
idonahue
45563fad92
Fixed contextual menu color and width
2023-07-11 18:01:13 +02:00
idonahue
767d15fb9a
Greater contrast between contextual menu and background
2023-07-11 17:59:08 +02:00
idonahue
ea1d0cb848
Updated the input text focus color to purple
2023-07-11 17:58:45 +02:00
GitButler
53a1076e1f
Divider on context menu upddate
2023-07-11 17:21:12 +02:00
Mattias Granlund
2034254aae
Remove all "if (building) {}" checks
...
The main problem here was `invoke` being imported from `@tauri-app/api`
rather than `@tauri-app/api/tauri`.
2023-07-11 17:36:30 +03:00
Nikita Galaiko
9ba26fc5b0
store target upstream name separately
2023-07-11 15:35:20 +02:00
Nikita Galaiko
82939782eb
bump svelte-loadable-store
2023-07-11 15:17:49 +02:00
