Josh Junon
f119ea60ab
add crate to manifests
2024-01-17 15:36:00 +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
dbe83d5f2d
cargo fmt
2024-01-11 12:40:35 +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
Kiril Videlov
f3d93c79b6
🔨 chore: add test case for locking disjointed hunks in virtual branches
...
🔧 fix: update line range to use i32 type in create_commit test
2024-01-09 14:58:45 +01:00
Nikita Galaiko
0779243272
Merged origin/master into refactor-reader-writer
2024-01-09 12:57:54 +01:00
dependabot[bot]
8ded38eae1
chore(deps): bump anyhow from 1.0.75 to 1.0.79
...
Bumps [anyhow](https://github.com/dtolnay/anyhow ) from 1.0.75 to 1.0.79.
- [Release notes](https://github.com/dtolnay/anyhow/releases )
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.75...1.0.79 )
---
updated-dependencies:
- dependency-name: anyhow
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 11:41:40 +00:00
Nikita Galaiko
16d4c85988
Merge pull request #2193 from gitbutlerapp/dependabot/cargo/tempfile-3.9.0
...
chore(deps): bump tempfile from 3.8.1 to 3.9.0
2024-01-09 12:40:23 +01:00
Nikita Galaiko
143c1ad207
Merge pull request #2195 from gitbutlerapp/dependabot/cargo/async-trait-0.1.77
...
chore(deps): bump async-trait from 0.1.74 to 0.1.77
2024-01-09 12:40:06 +01:00
Nikita Galaiko
ffb7351593
Merge pull request #2196 from gitbutlerapp/dependabot/cargo/thiserror-1.0.56
...
chore(deps): bump thiserror from 1.0.53 to 1.0.56
2024-01-09 12:39:59 +01:00
dependabot[bot]
ccf702c9ab
chore(deps): bump similar from 2.3.0 to 2.4.0
...
Bumps [similar](https://github.com/mitsuhiko/similar ) from 2.3.0 to 2.4.0.
- [Changelog](https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mitsuhiko/similar/compare/2.3.0...2.4.0 )
---
updated-dependencies:
- dependency-name: similar
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 15:37:51 +00:00
dependabot[bot]
274b3e7ce1
chore(deps): bump thiserror from 1.0.53 to 1.0.56
...
Bumps [thiserror](https://github.com/dtolnay/thiserror ) from 1.0.53 to 1.0.56.
- [Release notes](https://github.com/dtolnay/thiserror/releases )
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.53...1.0.56 )
---
updated-dependencies:
- dependency-name: thiserror
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 15:37:36 +00:00
dependabot[bot]
fc01c451a6
chore(deps): bump async-trait from 0.1.74 to 0.1.77
...
Bumps [async-trait](https://github.com/dtolnay/async-trait ) from 0.1.74 to 0.1.77.
- [Release notes](https://github.com/dtolnay/async-trait/releases )
- [Commits](https://github.com/dtolnay/async-trait/commits )
---
updated-dependencies:
- dependency-name: async-trait
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 15:37:15 +00:00
dependabot[bot]
58fdc447a6
chore(deps): bump tempfile from 3.8.1 to 3.9.0
...
Bumps [tempfile](https://github.com/Stebalien/tempfile ) from 3.8.1 to 3.9.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.8.1...v3.9.0 )
---
updated-dependencies:
- dependency-name: tempfile
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 15:36:35 +00:00
Nikita Galaiko
4a92abdd9e
Merge pull request #2191 from gitbutlerapp/unapply-ownership-hunks
...
GB-776: Unapply ownership hunks
2024-01-08 16:02:20 +01:00
Nikita Galaiko
aefeba8c7c
support unapplying locked ownerships
2024-01-08 15:39:22 +01:00
Nikita Galaiko
7c8f8cc68d
chore: update notify dependency to version 6.1.1
2024-01-08 12:21:45 +01:00
Nikita Galaiko
6fe7fbda95
Merge pull request #2152 from gitbutlerapp/dependabot/cargo/bstr-1.9.0
...
chore(deps): bump bstr from 1.8.0 to 1.9.0
2024-01-08 12:16:46 +01:00
Nikita Galaiko
6503a15309
refactor: with_reader for readers, open for writers
2024-01-08 10:00:38 +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
Nikita Galaiko
91c1a86bda
read files via batch reader
2024-01-08 09:02:19 +01:00
Nikita Galaiko
118ebe9654
use batch reader for sessions
2024-01-08 09:02:19 +01:00
