gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 00:21:35 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,891 Commits 157 Branches 1,064 Tags 61 MiB
87f03bf5d4
Commit Graph

301 Commits

Author SHA1 Message Date
Kiril Videlov
9a3fc86a8e fix test 2024-03-11 22:44:19 +01:00
Kiril Videlov
6aabf37b2c refactor: when fetching hunks by file return a map of DiffFile 
Adding stonger types to the result will allow us to more easily propagate information like old/new files paths, size etc
 2024-03-11 22:44:19 +01:00
Josh Junon
2e13650a7f
fixup many instances of poor path handling 2024-03-11 19:06:22 +01:00
Josh Junon
940059ef95
Merge pull request #3112 from gitbutlerapp/dont-use-results-in-tests 
don't use results in tests
 2024-03-11 18:41:15 +01:00
Josh Junon
86a621f2b2
don't use results in tests 2024-03-11 18:28:04 +01:00
Josh Junon
4c6d40da6e
use simpler path representation at call site 2024-03-11 18:23:06 +01:00
Josh Junon
a5e71b6903
fix test alternates test to be more robust 2024-03-11 16:40:02 +01:00
Josh Junon
bc626e4e92
Merge pull request #3108 from gitbutlerapp/fix-windows-gbrepo-path-filtering 
fix gbrepo path filtering on windows
 2024-03-11 16:25:44 +01:00
Josh Junon
8928920d47
fix gbrepo path filtering on windows 2024-03-11 15:45:00 +01:00
Josh Junon
2fe29e6f42
Merge pull request #3107 from gitbutlerapp/refactor-dedupe-fmt 
refactor dedupe logic to be a bit more rusty
 2024-03-11 15:44:30 +01:00
Josh Junon
c026dc9898
refactor dedupe logic to be a bit more rusty 2024-03-11 15:30:02 +01:00
Josh Junon
4e2fbd2b08
remove needless vec copy 2024-03-11 14:53:31 +01:00
Kiril Videlov
54507a0ce0 refactor: Add check for empty paths array in mark function. 2024-03-10 21:52:12 +01:00
Kiril Videlov
cb128df06b feat: Add last commit timestamp and author to RemoteBranch struct and use it in CombinedBranch for display purposes. 2024-03-08 22:22:40 +01:00
Nikita Galaiko
c309d96919 remove unapply logic during branch verification 2024-03-07 19:14:32 +01:00
Nikita Galaiko
aeb076630d make sure set_base_branch preserves active status 2024-03-07 19:14:32 +01:00
Nikita Galaiko
a4768de8bb remove gitbutler/integration reference when user switches away from it 2024-03-07 19:14:32 +01:00
Nikita Galaiko
b0e63d7259 re-construct tree from scratch when going back to integration 2024-03-07 19:14:32 +01:00
Nikita Galaiko
e2ff8e7d20 do not allow dirty working directory when going back to default target 2024-03-07 19:14:32 +01:00
Nikita Galaiko
82ae6d454a make go back to integration more predictable 2024-03-07 19:14:32 +01:00
Kiril Videlov
f4843750e1 feat: adds a git_test_fetch command to check if fetch can be performed for a given remote 2024-03-07 19:04:17 +01:00
Kiril Videlov
bbee89c95b refactor(virtual_branches): Remove unused import 2024-03-07 18:56:02 +01:00
Kiril Videlov
6c0d19d716 adds remote name and branch name as parameters to the git_test_push command 2024-03-07 18:42:41 +01:00
Josh Junon
8979e35d9e
fix fs notify on windows 2024-03-07 18:05:24 +01:00
Josh Junon
7ba6bd259a remove unused imports 2024-03-07 15:30:17 +01:00
Kiril Videlov
66fc956a9a feat: test push command 2024-03-06 21:59:41 +01:00
Josh Junon
df3944106f refactor remaining low-hanging-fruit TryFrom implementations 2024-03-06 15:47:08 +01:00
Josh Junon
7905903c5d more refactors of TryFrom 2024-03-06 15:19:51 +01:00
Josh Junon
d72002c7f5 remove several TryFrom cases for initializing type with path 2024-03-06 14:44:08 +01:00
Josh Junon
f8ad417c04 first set of TryFrom impl removals 2024-03-06 14:21:13 +01:00
Kiril Videlov
f2b13e5632 chore: add serde attribute to rename fields to camelCase in VirtualBranches struct 2024-03-06 13:51:04 +01:00
Kiril Videlov
99df783a0a
when locking hunks only consider commits from applied branches 2024-03-05 18:32:59 +01:00
Josh Junon
c4f4b4cc75 move most TryFrom initialization into main instead of initialization on-demand 2024-03-05 17:54:27 +01:00
Josh Junon
8384648228
fix warnings on non-macos systems 2024-03-04 17:00:33 +01:00
Josh Junon
c6e3477a86 set gc.pruneExpire to never when opening repositories 2024-03-04 14:03:11 +01:00
Josh Junon
0f4b195e56 eliminate unused variable 2024-03-04 12:09:11 +01:00
Kiril Videlov
292a9e1128
fixes a bug where committed diffs may show additional context lines 2024-03-03 22:14:55 +01:00
Kiril Videlov
f0062516ea
support the new posthog endpoint 2024-03-03 20:16:29 +01:00
Kiril Videlov
aab694df48
Merge pull request #2946 from gitbutlerapp/Update-unapply-files-function 
✨ feat: adds reset_files command to revert files
 2024-03-03 17:56:50 +01:00
Kiril Videlov
f262f0f0cd
chore: fix tests 2024-03-03 17:41:49 +01:00
Kiril Videlov
27bd07600b
chore: add clippy lint exceptions for type_complexity warnings 2024-03-03 17:40:12 +01:00
Kiril Videlov
19e586dbb2 feat(UI): handle list vbranches returning an object 2024-03-03 17:34:02 +01:00
Kiril Videlov
e088ac5b2d
feat(vbranches api): returns a list of any files skipped due to size 2024-03-03 16:27:24 +01:00
Kiril Videlov
33572ea955
perf: ommit files larger than 50mb from being processed 2024-03-02 23:15:06 +01:00
Scott Chacon
d4f89e8588 Merged origin/master into Update unapply files function 2024-03-01 22:15:03 +01:00
Kiril Videlov
a51f56de87
Merge pull request #2970 from gitbutlerapp/dependabot/cargo/rust-updates-c15be7964f 
Bump the rust-updates group with 10 updates
 2024-03-01 22:03:29 +01:00
Josh Junon
53aeb8a1a4 remove build warnings 2024-03-01 18:40:39 +01:00
dependabot[bot]
2af685d388
Bump the rust-updates group with 10 updates 
Bumps the rust-updates group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [serde](https://github.com/serde-rs/serde) | `1.0.196` | `1.0.197` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.56` | `1.0.57` |
| [anyhow](https://github.com/dtolnay/anyhow) | `1.0.79` | `1.0.80` |
| [bstr](https://github.com/BurntSushi/bstr) | `1.9.0` | `1.9.1` |
| [chrono](https://github.com/chronotope/chrono) | `0.4.33` | `0.4.34` |
| [governor](https://github.com/boinkor-net/governor) | `0.6.0` | `0.6.3` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.113` | `1.0.114` |
| [tauri](https://github.com/tauri-apps/tauri) | `1.5.4` | `1.6.0` |
| [log](https://github.com/rust-lang/log) | `0.4.20` | `0.4.21` |
| [tempfile](https://github.com/Stebalien/tempfile) | `3.10.0` | `3.10.1` |


Updates `serde` from 1.0.196 to 1.0.197
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.196...v1.0.197)

Updates `thiserror` from 1.0.56 to 1.0.57
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.56...1.0.57)

Updates `anyhow` from 1.0.79 to 1.0.80
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.79...1.0.80)

Updates `bstr` from 1.9.0 to 1.9.1
- [Commits](https://github.com/BurntSushi/bstr/compare/1.9.0...1.9.1)

Updates `chrono` from 0.4.33 to 0.4.34
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.33...v0.4.34)

Updates `governor` from 0.6.0 to 0.6.3
- [Release notes](https://github.com/boinkor-net/governor/releases)
- [Changelog](https://github.com/boinkor-net/governor/blob/master/release.toml)
- [Commits](https://github.com/boinkor-net/governor/compare/v0.6.0...v0.6.3)

Updates `serde_json` from 1.0.113 to 1.0.114
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.113...v1.0.114)

Updates `tauri` from 1.5.4 to 1.6.0
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.5.4...tauri-v1.6.0)

Updates `log` from 0.4.20 to 0.4.21
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/compare/0.4.20...0.4.21)

Updates `tempfile` from 3.10.0 to 3.10.1
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.10.0...v3.10.1)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: governor
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tauri
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-updates
- dependency-name: log
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-01 17:12:15 +00:00
Josh Junon
5c6ce60833 initial round of dead code removal 2024-03-01 17:39:42 +01:00
Josh Junon
2b53662775 fix remaining clippy errors after main.rs refactor 2024-03-01 15:49:33 +01:00
Josh Junon
d9187c8891 switch global config methods to static methods 2024-03-01 15:35:09 +01:00
Scott Chacon
748630b262 some docs and fixups 2024-03-01 15:25:20 +01:00
Josh Junon
502645eaac move from lib+bin to bin, refactor tests into crate 2024-03-01 15:14:30 +01:00
Scott Chacon
77e07e2308 Merged origin/master into Update unapply files function 2024-03-01 13:36:19 +01:00
Josh Junon
04ce762dc8 fix build/clippy warnings and flakey whitespace-sensitive tests 2024-03-01 13:31:49 +01:00
Scott Chacon
740e0477da Merged origin/master into Update unapply files function 2024-03-01 13:11:24 +01:00
Josh Junon
73faf32b29 automatically create gitbutler-ui/build 2024-03-01 13:00:31 +01:00
Josh Junon
94a5eb6be2 Turn normal comment into doc comment 2024-03-01 12:35:41 +01:00
Pavel Laptev
e58356bd14 detect OS 
in order to remove/add sidebar padding on the Sidebar
 2024-02-29 21:51:39 +02:00
Kiril Videlov
e8c7f53685
adds file logging of UI errors 2024-02-29 19:28:45 +01:00
Josh Junon
44c4365903
create windows gb repo path upon creation 2024-02-29 16:07:52 +01:00
Josh Junon
5c88e3db89
remove gitbutler-git from builds 2024-02-29 15:44:07 +01:00
Scott Chacon
c2571fd715 ✨ feat: adds reset_files command to revert files 
The "Revert File" function cheated a bit by undoing all the hunks, but that doesn't work for added or removed files. 

Added files are not removed, just contents cleared. Removed files are not restored.

This changes the implementation to just pass file paths and have git2 run the equivalent to `git checkout -- path` from the index.
 2024-02-29 13:19:16 +01:00
Nikita Galaiko
f147f12db0 merge upstream 2024-02-27 10:21:12 +01:00
Nikita Galaiko
4b4f6e210f prefer rebase when merging upstream into vbranch 2024-02-27 09:32:40 +01:00
AbhishekThorat
9eb1660af2 - Add support to remove .git/gitbutler.json file while deleting project 2024-02-26 23:45:21 +01:00
Kiril Videlov
093f003890 disallow adding of repositories with submodules due incomplete support 2024-02-26 14:17:56 +01:00
Mattias Granlund
0862d766bf Add back custom app updater 
- native one doesn't work on all platforms
 2024-02-26 13:03:23 +02:00
Kiril Videlov
c83e39ec5c update tests to reflect using the hunk context 2024-02-25 23:24:58 +01:00
Kiril Videlov
000ddeff91 chore: remove user-facing config for using diff contexts infavor of automatic migration 2024-02-25 23:24:58 +01:00
Kiril Videlov
08d22de40e if a project has not virtual branches migrate it to using diffs with context 2024-02-25 23:24:58 +01:00
Kiril Videlov
9d53268a5d use diff context lines internally if configured 2024-02-25 23:24:58 +01:00
Kiril Videlov
91885eac6b adds a config for using diffs with context lines internallyl 2024-02-25 23:24:58 +01:00
Kiril Videlov
a2e945d0b9 perf: optimize patch application for virtual branches 2024-02-25 15:54:08 +01:00
Kiril Videlov
e5bbf9298a perf: apply string patches instead of binary 2024-02-24 17:30:51 +01:00
Kiril Videlov
392cff5a42 feat: verify push results 
adds a callback checking the push result status from the remote
 2024-02-23 15:12:55 +01:00
Naman Garg
b305cdb86e Close App on Linux 2024-02-21 23:50:50 +01:00
Pranav2612000
0084b1b0ec fix: show better error message when loading a repository without commits 2024-02-21 22:22:41 +01:00
Kiril Videlov
30a72cd2f7 fix: closing the window should terminate the process for non-mac installations 2024-02-21 11:27:06 +01:00
Kiril Videlov
03b85e63c2 fix: lower the filesystem filter handling threshold 
There could be an application (e.g an IDE) which is constantly writing, so the threshold cant be too high
 2024-02-20 16:00:49 +01:00
Kiril Videlov
fb56cad857
Merge pull request #2750 from gitbutlerapp/Move-commit-to-vbranch-tests 
move commit functionality
 2024-02-20 14:55:40 +01:00
Kiril Videlov
3bc56d6c1f
chore: replace app internal scheduled fetching with UI triggered fetching on per-project basis 2024-02-20 00:52:30 +01:00
Kiril Videlov
fdac245acd chore: remove tray menu 2024-02-19 21:59:06 +01:00
Kiril Videlov
35cba464dc
Merge pull request #2689 from namanlp/replace-context-menu-plugin 
Replace fork of Context Menu Plugin with Upstream
 2024-02-19 18:59:36 +01:00
Naman Garg
aa27f8d3a8
Fix the Linux window show issue 2024-02-19 14:47:29 +05:30
Nikita Galaiko
2a07acf46e implement move_commit api 2024-02-19 09:21:12 +01:00
Federico Giovagnoli
10ae89202d
Merge branch 'master' into discard-entire-file-via-contextmenu 2024-02-18 14:18:26 +01:00
Caleb Owens
77ddeb79ec Move comments to a rust FMT approved location 2024-02-18 13:44:30 +01:00
Caleb Owens
fa5d938590 Updated comments in context.rs 2024-02-18 13:44:30 +01:00
Caleb Owens
f790ca1b3d Add tests to verify changes 2024-02-18 13:44:30 +01:00
Caleb Owens
1378a8a8ca Change weird_testcase to not panic when it fails 2024-02-18 13:44:30 +01:00
Caleb Owens
df2e1e22c9 Fix "weird_testcase" whitespace 2024-02-18 13:44:30 +01:00
Caleb Owens
f90463c26f Fix most of the tests 2024-02-18 13:44:30 +01:00
Caleb Owens
ada7bee5d0 Fix clippy issues 2024-02-18 13:44:30 +01:00
Caleb Owens
894f9adb3b Remove whitespace 
Run rust FMT
 2024-02-18 13:44:30 +01:00
Caleb Owens
be051d7840 Fix line number calculations 2024-02-18 13:44:30 +01:00
Caleb Owens
2749ea1ccb Remove extra logic 
(the start_line_XXX_no_ctx) are the same as the hunk_XXX_start_line values
 2024-02-18 13:44:30 +01:00
Caleb Owens
29886f3290 Don't reverse before context 2024-02-18 13:44:30 +01:00
Caleb Owens
cf55bff6bf Clean up increment then decrement into one if expression 2024-02-18 13:44:30 +01:00
Caleb Owens
cf4c5609ba Fix surrounding logic 2024-02-18 13:44:30 +01:00