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
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
Josh Junon
53aeb8a1a4
remove build warnings
2024-03-01 18:40:39 +01: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
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
94a5eb6be2
Turn normal comment into doc comment
2024-03-01 12:35:41 +01: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
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
