Commit Graph

6820 Commits

Author SHA1 Message Date
Kiril Videlov
58c124627a
add an enpoint for getting the snapshot diff 2024-05-09 11:24:42 -07:00
Josh Junon
2006511a80
Merge pull request #3724 from gitbutlerapp/fork-exec-sign
add gitbutler_git::sign_commit()
2024-05-08 12:28:22 +02:00
Mattias Granlund
e7f25e29c5 Check we are on the right branch in verify_branch
Ensures we don't accidentally run commands while HEAD is pointing to something other than the gitbutler/integration branch.
2024-05-08 12:20:00 +02:00
Josh Junon
738e47a377
fix sync sign utility 2024-05-08 12:16:06 +02:00
Kiril Videlov
2911155e33
Merge pull request #3734 from gitbutlerapp/make-snapshot-lines-threshold-optional
Skip creating noop snapshots if there is no difference with parent
2024-05-08 03:27:07 +02:00
Kiril Videlov
885021a6fe
Merge pull request #3735 from gitbutlerapp/create-noop-snapshots-diff-check
feat: Optimize snapshot creation in Oplog.rs
2024-05-08 03:24:29 +02:00
Kiril Videlov
e6633df481
feat: Optimize snapshot creation in Oplog.rs
Check for differences between the current tree and the parent tree
before creating a new snapshot to prevent creating noop snapshots.
2024-05-08 03:12:17 +02:00
Kiril Videlov
0215e0649b
feat: Skip creating noop snapshots if there is no difference with parent tree 2024-05-08 03:11:38 +02:00
Kiril Videlov
2df5ee0f7d
Merge pull request #3733 from gitbutlerapp/make-snapshot-lines-threshold-optional
use default snapshot_lines_threshold
2024-05-08 03:11:13 +02:00
Kiril Videlov
903991eea7
use default snapshot_lines_threshold 2024-05-08 02:58:30 +02:00
Kiril Videlov
a1a546f8e1
Merge pull request #3732 from gitbutlerapp/rename-snapshots-module-names
rename snapshots module names
2024-05-08 01:54:04 +02:00
Kiril Videlov
8b6333237e add more details to undo ui 2024-05-08 01:35:24 +02:00
Kiril Videlov
7cddab8285
fix early return missing snaposhotting 🤦‍♂️ 2024-05-08 01:35:11 +02:00
Pavel Laptev
081ffb9377
Prevent default drop event (#3731) 2024-05-08 01:27:54 +02:00
Kiril Videlov
ef18dc029d
Merge pull request #3730 from gitbutlerapp/rename-snapshots-module-names
move snapshot creation on branch update to trait
2024-05-08 01:24:39 +02:00
Kiril Videlov
a942cb6f79
move snapshot creation on branch update to trait 2024-05-08 01:09:53 +02:00
Kiril Videlov
52f4cecbb1
Merge pull request #3729 from gitbutlerapp/update-branch-name-with-old-name
rename snapshots module names
2024-05-08 00:49:46 +02:00
Kiril Videlov
1ae1efeec0
rename tauri module for undo operations 2024-05-08 00:36:16 +02:00
Kiril Videlov
93d5e61530 rename module snapshots to ops 2024-05-08 00:29:38 +02:00
Kiril Videlov
289aafb496 rename snapshoter to snapshot 2024-05-08 00:29:38 +02:00
Kiril Videlov
2c065a602e rename module of oplog trait 2024-05-08 00:29:38 +02:00
Kiril Videlov
7cf237b8d6
Merge pull request #3728 from gitbutlerapp/update-branch-name-with-old-name
compose traits for nicer snapshotting functions
2024-05-08 00:26:27 +02:00
Kiril Videlov
f6e19e6c12
compose traits for nicer snapshotting functions 2024-05-08 00:00:18 +02:00
Mattias Granlund
e0a2985f37 Fix background switching between target.sha and integration commit 2024-05-07 16:59:06 +02:00
Josh Junon
ca714084b1
add synchronous signed git commit utility function 2024-05-07 16:37:52 +02:00
Josh Junon
b9aae21b97
add v4 features to uuid crate for gitbutler-git 2024-05-07 16:26:41 +02:00
Josh Junon
c564ccc7f7
add gitbutler_git::sign_commit() 2024-05-07 16:26:38 +02:00
Josh Junon
190a75eb5b
Merge pull request #3725 from gitbutlerapp/global-askpass
make askpass broker a global
2024-05-07 16:25:59 +02:00
Josh Junon
1fd0b1ecfc
make askpass broker a global 2024-05-07 16:07:37 +02:00
Scott Chacon
51f9769024 sign commits with real git
in the strangest possible way
2024-05-07 15:15:25 +02:00
Scott Chacon
ff11fcdb90 Add change-id property to commit
Each commit has a change-id added to it's header field so we can more easily track patches by unique ids
2024-05-07 10:28:29 +02:00
Josh Junon
f1e9e95a1a
Merge pull request #3720 from gitbutlerapp/remove-old-changesets
remove old changeset code
2024-05-07 07:17:09 +02:00
Josh Junon
6afd680781
remove old changeset code 2024-05-07 07:03:34 +02:00
Kiril Videlov
01576361aa
Merge pull request #3716 from gitbutlerapp/list-snapshots-with-optional-sha-1
snapshot list pagination
2024-05-07 01:15:17 +02:00
Pavel Laptev
f83fa5f669
Refactor: Remove vertical orientation as a prop (#3717) 2024-05-07 00:51:34 +02:00
Kiril Videlov
1bc41a9146 snapshot list pagination 2024-05-07 00:46:22 +02:00
Kiril Videlov
5bfb3395a0
Merge pull request #3714 from gitbutlerapp/fix-race-condition-issue
fixes a possible condition where if integration commit is not found a…
2024-05-07 00:16:50 +02:00
Kiril Videlov
80346af154 fixes a possible condition where if integration commit is not found a lot of integreated commits are added to a vbranch 2024-05-07 00:02:22 +02:00
Kiril Videlov
1c7ce2cfe0
Merge pull request #3712 from gitbutlerapp/update-gitbutler-watcher
fix ci: add missing job for watcher
2024-05-06 21:29:23 +02:00
Kiril Videlov
893439976c
Merge pull request #3705 from gitbutlerapp/blame-hunk-applied-status-fix
dont panic on commit not found in commit_to_branch
2024-05-06 21:25:10 +02:00
Kiril Videlov
cc642c4ea6
Merge pull request #3710 from gitbutlerapp/Don-t-parse-and-re-parse-branch_id
Don't reparse branch_id
2024-05-06 21:22:53 +02:00
Kiril Videlov
d7eccf78e2
fix ci: add missing job for watcher 2024-05-06 21:15:56 +02:00
Kiril Videlov
9fc3b97a6f
Merge pull request #3706 from gitbutlerapp/Add-cmd-R-page-reloads
Add cmd+R to reload the page
2024-05-06 21:11:16 +02:00
Caleb Owens
f13e827e33 Don't reparse branch_id
This should make the situation where an error occurs even more absurd. It should also be saving some extra work which is always a bonus
2024-05-06 19:50:07 +01:00
Josh Junon
0b903bcaef
Merge pull request #3697 from anaisbetts/clean-up-win32-menus
Clean up win32 menus
2024-05-06 20:44:40 +02:00
Josh Junon
0ba06e4292
Merge pull request #3709 from gitbutlerapp/cleanups
A few cleanups of virtual.rs
2024-05-06 20:36:06 +02:00
Josh Junon
dce8ead62f
use simpler virtual branch handle fetch in tests (and fix strange uncaught compilation error) 2024-05-06 20:22:40 +02:00
Josh Junon
da62926a30
simplify retrieving of the vb_state handle 2024-05-06 20:08:28 +02:00
Josh Junon
85d045362a
remove useless AsRef impl 2024-05-06 20:07:47 +02:00
Josh Junon
dffca846c4
remove empty else branch 2024-05-06 20:07:42 +02:00