Kiril Videlov
3eba2c9bdb
feat: add caching mechanism for pull requests list to improve performance and handle offline scenarios
2023-10-27 17:52:15 +03:00
Kiril Videlov
b0374e2f7a
chore: remove duplicate RemoteBranches component
2023-10-25 22:24:38 +02:00
Kiril Videlov
8b5b37102e
feat: add support for displaying and interacting with pull requests in the branch peek component
2023-10-25 22:24:38 +02:00
Nikita Galaiko
2d64d29c47
refactor: avoid mutation
2023-10-24 14:51:24 +02:00
Nikita Galaiko
304ee291aa
Merge pull request #1454 from gitbutlerapp/add-merge-function-and-integrated-commits-test
...
fix integrated commit detection
2023-10-24 14:18:03 +02:00
Nikita Galaiko
f66c1e4db7
cranky fixes
2023-10-24 14:10:06 +02:00
Nikita Galaiko
687d73897a
cargo fmt
2023-10-24 13:57:43 +02:00
Nikita Galaiko
52757a4ad5
better imitate a real remote merge
2023-10-24 13:57:22 +02:00
Nikita Galaiko
c0c8ac8133
fix integrated commit detection
2023-10-24 13:49:06 +02:00
Nikita Galaiko
7c56f41ab1
when choosing upstream branch name, ignore case
2023-10-24 12:46:59 +02:00
Nikita Galaiko
48b16b8881
Merge pull request #1443 from gitbutlerapp/add-cherry-pick-method
...
feat: cherry pick onto virtual branch
2023-10-24 08:45:46 +02:00
Nikita Galaiko
04007e5e87
expose cherry pick api
2023-10-23 15:57:44 +02:00
Nikita Galaiko
552fe0c5cd
cherry-pick onto virtual branch
2023-10-23 15:51:31 +02:00
Nikita Galaiko
c3f63b5b3a
Merge pull request #1444 from gitbutlerapp/proxy-virtual-branch-with-upstream
...
🔨 chore: add support for proxying upstream branch in `proxy_virtual_b…
2023-10-23 15:29:04 +02:00
Nikita Galaiko
40d24641db
🔨 chore: add support for proxying upstream branch in proxy_virtual_branch method
2023-10-23 15:22:32 +02:00
extrawurst
0dadd38809
GB-623: make sure integration is up to date after flushing all vbranches ( #1442 )
...
make sure the integration update happens after flushing the vbranch trees
2023-10-23 13:18:37 +00:00
extrawurst
1925a06ce0
run cranky locally in nightly + clippy fixes ( #1441 )
...
* cleanup one `partial_pub_fields` lint
* run cranky locally in nightly too to align CI lints
2023-10-23 10:45:25 +00:00
Nikita Galaiko
2addf81189
fix cranky
2023-10-23 10:05:20 +02:00
Nikita Galaiko
3d14551ed2
add validation error code
2023-10-23 09:37:54 +02:00
Nikita Galaiko
638620337e
open less repos when reindexing
2023-10-20 15:01:43 +02:00
Nikita Galaiko
2b68cd23ce
bring back index handler
2023-10-20 14:52:29 +02:00
Nikita Galaiko
7d2dbb1b8a
log app name on start
2023-10-20 14:24:40 +02:00
Nikita Galaiko
6ee208c611
rm tantivy dependency
2023-10-20 13:34:33 +02:00
Nikita Galaiko
8a568e5737
cargo fmt
2023-10-20 13:18:56 +02:00
Nikita Galaiko
519a7e7a25
rm search from rust
2023-10-20 13:11:48 +02:00
Nikita Galaiko
01180178fb
rm search from ui
2023-10-20 13:07:18 +02:00
Nikita Galaiko
54a4bc204e
ensure gravatars are always cached
2023-10-20 09:42:23 +02:00
Nikita Galaiko
9f9d1e4149
dark mode: fix upstream commit bg
2023-10-20 09:07:14 +02:00
Nikita Galaiko
048b118569
cleanup some cranky rules
2023-10-19 15:25:27 +02:00
Nikita Galaiko
0c88552d00
fix cranky
2023-10-19 14:52:56 +02:00
Nikita Galaiko
aefc469b97
refactor: rm extra mut
2023-10-19 14:32:57 +02:00
Nikita Galaiko
e1fcc5546f
show force push when upstream commits present
2023-10-19 13:41:42 +02:00
Nikita Galaiko
701937ea06
only add disk alternate when creating gb_repo
...
it will be read from disk otherwise
2023-10-19 11:29:20 +02:00
Nikita Galaiko
0fe5f109c3
Merge pull request #1421 from gitbutlerapp/handle-upstream-branch-not-found
...
🔨 chore: improve error handling when finding upstream branch for list…
2023-10-19 10:54:04 +02:00
Nikita Galaiko
f395c541db
🔨 chore: improve error handling when finding upstream branch for listing virtual branches
2023-10-19 10:48:57 +02:00
Nikita Galaiko
cddc3e0fff
cranky
2023-10-19 10:37:09 +02:00
Nikita Galaiko
f3decc57e0
return upstream name too
2023-10-19 10:29:33 +02:00
Nikita Galaiko
df098e8d57
fix local branch name serialization
2023-10-19 10:23:58 +02:00
Nikita Galaiko
6044cf874d
move upstream detection tests to integration
2023-10-19 09:59:57 +02:00
Nikita Galaiko
d8a54e5c49
Merge pull request #1416 from gitbutlerapp/make-vbranch-remote-a-branch
...
Make vbranch remote a branch
2023-10-19 09:51:02 +02:00
Nikita Galaiko
8cff188c6e
cranky fix!
2023-10-19 09:39:59 +02:00
Nikita Galaiko
a76ff7b988
🔨 chore: improve error handling when writing alternates file
2023-10-19 09:36:24 +02:00
Nikita Galaiko
36eea73e52
🔨 chore: update references to branch upstream and upstreamCommits in client code
...
The changes in this commit update the references to the `branch.upstream` property and `branch.upstreamCommits` array in the client code. The code now uses the `branch.upstream.name` property instead of `branch.upstream` and `branch.upstream.commits` instead of `branch.upstreamCommits`. This change ensures that the code is compatible with the updated data structure.
2023-10-19 09:30:31 +02:00
Nikita Galaiko
474cfa2249
🔨 chore: refactor branch upstream handling
2023-10-19 09:12:20 +02:00
Nikita Galaiko
45dce1ecea
extract branch to remove branch
2023-10-19 08:50:53 +02:00
extrawurst
eb5b7ea6d3
fix new tests
2023-10-18 17:26:54 +02:00
extrawurst
bb56719d1e
fix merge conflict
2023-10-18 16:45:40 +02:00
dependabot[bot]
f0e71a1c43
Bump sha2 from 0.10.7 to 0.10.8
...
Bumps [sha2](https://github.com/RustCrypto/hashes ) from 0.10.7 to 0.10.8.
- [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.10.7...sha2-v0.10.8 )
---
updated-dependencies:
- dependency-name: sha2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-10-18 16:39:41 +02:00
extrawurst
eb569b389c
* cleanup combined bin/lib in gitbutler
...
* gitbutler as a lib is `gblib` now and used accordingly by `butler`
* use `cargo-cranky` for shared lints across workspace until cargo supports Cargo.toml lints section in 1.75
2023-10-18 16:39:14 +02:00
Nikita Galaiko
6afa9ad187
Merge pull request #1412 from gitbutlerapp/correctly-track-references
...
correctly track local references
2023-10-18 15:27:05 +02:00
