Kiril Videlov
f86935d335
measure rust performance in dev and nightly
2024-01-26 13:59:38 +01:00
Nikita Galaiko
4532334874
use latest session when reading default target
2024-01-26 10:01:00 +01:00
Kiril Videlov
975729d409
chore: update terminology from "applied branches" to "workspace"
2024-01-24 17:50:36 +01:00
Kiril Videlov
4b55839fce
feat: add periodic update check every 6 hours to ensure app is up to date
2024-01-24 17:41:31 +01:00
Kiril Videlov
29b5499869
hunk context lines are computed against the correct head
2024-01-24 14:09:59 +01:00
Nikita Galaiko
83d6d8dd3e
Merge pull request #2377 from gitbutlerapp/refactor-target-and-branch-writers
...
Refactor target and branch writers
2024-01-23 10:10:17 +01:00
Kiril Videlov
3c9408a253
🔧 fix: remove unnecessary TODO comment in hunk_with_context function
2024-01-22 20:48:21 +01:00
Kiril Videlov
6548bdfa21
always add old line number when building hunk context
2024-01-22 20:06:18 +01:00
Nikita Galaiko
4fda8370a4
make sure nothing is flashed when idle
2024-01-22 15:37:42 +01:00
Nikita Galaiko
143b8f6c3e
remove unused variable
2024-01-22 13:13:54 +01:00
Nikita Galaiko
0d723554e6
handle applying branch that should become the target
2024-01-22 10:54:28 +01:00
Kiril Videlov
0439559a5c
Improved hunk locking
...
Adds a lockedBy property to hunks on the API, containing a commit id to whitch the hunk is considered locked
2024-01-19 22:03:26 +01:00
Nikita Galaiko
9670c863c0
always explicitly mark selected_for_changes
2024-01-19 11:07:22 +01:00
Nikita Galaiko
9898e7bf43
speed up is_remote check by assuming parents are remote
2024-01-19 08:08:59 +01:00
Kiril Videlov
1e50bbd708
update tests
2024-01-18 15:31:53 +01:00
Kiril Videlov
27347f66fb
serialize enum with lowercase
2024-01-18 15:31:53 +01:00
Kiril Videlov
8d564a6b45
skip types that we dont need for frontend
2024-01-18 15:31:53 +01:00
Kiril Videlov
b9b72fe7e2
🔨 chore: refactor diff printing to include change type information
2024-01-18 15:31:53 +01:00
Nikita Galaiko
ed1feccca3
assume integrated commits's parents are integrated
2024-01-18 12:56:10 +01:00
Nikita Galaiko
f7bf028090
refactor: don't expose annotated commit
2024-01-17 13:42:56 +01:00
Kiril Videlov
8b8fbde33d
fix hunk context line injection corner cases
2024-01-17 13:20:19 +02:00
Kiril Videlov
2c102dd957
🔨 chore: add tests for removed and new files in hunk_with_context function
2024-01-16 23:27:29 +02:00
Kiril Videlov
1fc6aabde2
more tests for injecting of hunk context
2024-01-16 18:12:28 +02:00
Kiril Videlov
c981a10abe
test: add more tests for the hunk context injection
2024-01-16 13:14:54 +02:00
Kiril Videlov
d59a78aa52
unit tests for hunk context lines
2024-01-16 12:38:25 +02:00
Kiril Videlov
310d80394b
🐛 fix: handle potential index out of bounds error in context lines generation
2024-01-15 23:34:33 +02:00
Kiril Videlov
f26321065e
safe usize subtraction
2024-01-15 23:15:46 +02:00
Kiril Videlov
acf487a907
fix line context for commit diffs
...
when a file is new, we cant expect the parent commit to have the file
2024-01-15 22:29:10 +02:00
Kiril Videlov
6d96b0bf23
🔨 chore: fix out of bounds error in context_before loop
2024-01-15 15:37:22 +02:00
Kiril Videlov
7d9360662f
🐛 fix: off-by-one error in context lines calculation
2024-01-15 15:22:39 +02:00
Kiril Videlov
f5da2f012d
🐛 fix: fix index out of bounds error in context line generation
2024-01-15 15:22:39 +02:00
Nikita Galaiko
e70cf60cca
ensure key is file
2024-01-15 09:45:40 +01:00
Nikita Galaiko
cc17805694
validate preferred key on the backend
2024-01-15 08:19:54 +01:00
Kiril Videlov
90e71e6458
use zero context hunks internally
...
Use hunks with zero context lines for virtual branch ownership. Reconstruct the context lines before returning hunks to the frontend
working on tests WIP
handle new files
cleanup comments
skip binary files
🐛 fix: add trailing newline to diff string in hunk_with_context function
handle empty diffs
fix diff header expectations
2024-01-14 23:42:34 +02:00
Kiril Videlov
5b7f63739b
🔨 chore: update remote URLs in tests to match new repository location
2024-01-13 17:40:47 +01:00
Nikita Galaiko
ab7e4eb73f
Merge pull request #2234 from gitbutlerapp/push-all-refs
...
Push all refs
2024-01-12 09:04:25 +01:00
Nikita Galaiko
43b071fb18
do not hide network error
2024-01-12 08:56:29 +01:00
Nikita Galaiko
fd3b443899
avoid race conditions by using timestamp instead of bool
2024-01-11 15:39:30 +01:00
Nikita Galaiko
38647d20a5
refactor: is_default -> selected_for_changes
2024-01-11 14:58:57 +01:00
Nikita Galaiko
3fd0936f54
fix: distribute hunks to the correct virtual branch based on default branch position
2024-01-11 12:37:50 +01:00
Nikita Galaiko
c376549a1f
feat: add support for setting a virtual branch as the default branch
2024-01-11 10:38:22 +01:00
Nikita Galaiko
e1ee69a348
fix integrating fully merge branch while being behind
2024-01-10 12:37:23 +01:00
Nikita Galaiko
5c49311a49
Merge pull request #2214 from gitbutlerapp/remove-wd-reader
...
Remove wd reader
2024-01-10 09:55:03 +01:00
Nikita Galaiko
3eb3a40097
do not lock project directory
2024-01-10 09:49:37 +01:00
Nikita Galaiko
fb858fa936
refactor: simplify tree walk callback and use custom TreeWalkResult
2024-01-10 09:32:43 +01:00
Nikita Galaiko
a22319009f
use batch write for virtual branches
2024-01-08 09:02:19 +01:00
Nikita Galaiko
11f4956503
sessions writer to use batch writer
2024-01-08 09:02:19 +01:00
Nikita Galaiko
9b00ef5339
use lock in writer
2024-01-08 09:02:19 +01:00
Nikita Galaiko
9070bb3373
use branch in branch target reader
2024-01-08 09:02:19 +01:00
Nikita Galaiko
118f598845
use batch in branch reader
2024-01-08 09:02:19 +01:00
