gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-19 15:41:31 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,871 Commits 151 Branches 1,064 Tags 60 MiB
e91bd7e605
Commit Graph

113 Commits

Author SHA1 Message Date
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
Nikita Galaiko
49af066180 satisfy clippy 2024-01-08 09:02:19 +01:00
Nikita Galaiko
bcbf2f4d5e use batch reader for deltas reader 2024-01-08 09:02:19 +01:00
Nikita Galaiko
6c6c86de82 implement reader::batch that auto-locks directories 2024-01-08 09:02:19 +01:00
Nikita Galaiko
b6a8411841 lock::Dir implementation 2024-01-08 09:02:19 +01:00
Nikita Galaiko
b72c6317ef refactor Reader implementation to use enum instead of trait and remove unnecessary public functions 2024-01-08 09:02:19 +01:00
Nikita Galaiko
4e52086aa1 refactor writer module to remove unnecessary trait and consolidate methods 2024-01-08 09:02:19 +01:00
Nikita Galaiko
c032f01f82 chore: refactor branch and target readers to use generic reader type 2024-01-08 09:02:19 +01:00
Nikita Galaiko
ab93d48e73 remove unused is_dir method from Reader trait and its implementations 2024-01-08 09:02:19 +01:00
Pavel Laptev
44e02739c9 - updated app icons 2024-01-07 23:57:21 +01:00
Pavel Laptev
12f05dbca6 - updated app icons 2024-01-07 23:03:57 +01:00
Mattias Granlund
b13132b4a6 Slugify branch names differently 
- user requested / in branch names
 2024-01-07 15:24:21 +01:00
Mattias Granlund
54773d0bfe Enable remote branch naming 2024-01-04 19:13:00 +02:00
Qix
4fcce6a0be
Merge pull request #2155 from gitbutlerapp/dependabot/cargo/reqwest-0.11.23 
chore(deps): bump reqwest from 0.11.22 to 0.11.23
 2024-01-03 21:25:05 +01:00
dependabot[bot]
0aa52506e0
chore(deps): bump thiserror from 1.0.50 to 1.0.53 
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.50 to 1.0.53.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.50...1.0.53)

---
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-01 16:04:21 +00:00
dependabot[bot]
266d763f40
chore(deps): bump reqwest from 0.11.22 to 0.11.23 
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.22 to 0.11.23.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.22...v0.11.23)

---
updated-dependencies:
- dependency-name: reqwest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-01 16:03:41 +00:00
dependabot[bot]
fcd311f70f
chore(deps): bump bstr from 1.8.0 to 1.9.0 
Bumps [bstr](https://github.com/BurntSushi/bstr) from 1.8.0 to 1.9.0.
- [Commits](https://github.com/BurntSushi/bstr/compare/1.8.0...1.9.0)

---
updated-dependencies:
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-01 16:02:58 +00:00
Qix
c2ae876d9f
Merge pull request #2089 from gitbutlerapp/dependabot/cargo/filetime-0.2.23 
Bump filetime from 0.2.22 to 0.2.23
 2023-12-28 15:41:24 +01:00
Qix
96d66f2812
Merge pull request #2090 from gitbutlerapp/dependabot/cargo/once_cell-1.19.0 
Bump once_cell from 1.18.0 to 1.19.0
 2023-12-28 15:40:54 +01:00
Qix
489c270dc2
Merge pull request #2129 from gitbutlerapp/dependabot/cargo/tauri-1.5.4 
Bump tauri from 1.5.2 to 1.5.4
 2023-12-28 15:27:38 +01:00
Qix
e443f944e4
Merge pull request #2130 from gitbutlerapp/dependabot/cargo/tokio-1.35.1 
Bump tokio from 1.34.0 to 1.35.1
 2023-12-28 15:27:28 +01:00
Josh Junon
768934231d add gitbutler-core package and move IDs to it 2023-12-28 14:53:29 +01:00
Josh Junon
6397d12b89 don’t emit ANSI escapes to log files 2023-12-28 14:15:40 +01:00
dependabot[bot]
7541fe7f2e
Bump tokio from 1.34.0 to 1.35.1 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.34.0 to 1.35.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.34.0...tokio-1.35.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-22 13:29:49 +00:00
dependabot[bot]
27606fdf5e
Bump once_cell from 1.18.0 to 1.19.0 
Bumps [once_cell](https://github.com/matklad/once_cell) from 1.18.0 to 1.19.0.
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matklad/once_cell/compare/v1.18.0...v1.19.0)

---
updated-dependencies:
- dependency-name: once_cell
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-22 13:29:46 +00:00
dependabot[bot]
39543b900f
Bump tauri from 1.5.2 to 1.5.4 
Bumps [tauri](https://github.com/tauri-apps/tauri) from 1.5.2 to 1.5.4.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.5.2...tauri-v1.5.4)

---
updated-dependencies:
- dependency-name: tauri
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-22 13:29:41 +00:00
dependabot[bot]
e7e093411e
Bump filetime from 0.2.22 to 0.2.23 
Bumps [filetime](https://github.com/alexcrichton/filetime) from 0.2.22 to 0.2.23.
- [Commits](https://github.com/alexcrichton/filetime/compare/0.2.22...0.2.23)

---
updated-dependencies:
- dependency-name: filetime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-22 13:29:34 +00:00
Josh Junon
0e33410ed4 update configuration to reflect new paths 2023-12-22 14:22:54 +01:00
Josh Junon
c5c51c9254 move packages/* into root as crates 2023-12-22 14:20:02 +01:00