Kiril Videlov
bd33ff1645
Merge pull request #3689 from gitbutlerapp/include-conflict-state-in-snapshots
...
include conflict state in snapshots
2024-05-05 17:52:47 +02:00
Kiril Videlov
a0a834b8bd
create and restore return the shas of the snapshots
2024-05-05 17:39:45 +02:00
Kiril Videlov
bd8b0bf246
improve docs
2024-05-05 17:32:00 +02:00
Kiril Videlov
c24da92b6f
test: snapshotting of conflict state
2024-05-05 17:31:52 +02:00
Kiril Videlov
0771efc52f
include conflict state in snapshots
2024-05-05 17:31:29 +02:00
Kiril Videlov
81bc5b327c
Merge pull request #3687 from gitbutlerapp/snapshot-on-file-changes
...
snapshot on file changes
2024-05-04 19:47:24 +02:00
Kiril Videlov
5e54e0ed01
make SNAPSHOT_LINES_THRESHOLD configurable
2024-05-04 19:34:54 +02:00
Kiril Videlov
ebae6bf8de
create a snapshot every 20 lines changed
2024-05-04 19:20:22 +02:00
Kiril Videlov
25b7acc59c
adds a new snapshot entry type FileChanges
2024-05-04 19:19:52 +02:00
Kiril Videlov
32e5b97495
create a GbRepo trait for building blocks gitbutler uses
...
As well as an implementation for git2::Repository
2024-05-04 19:19:09 +02:00
Kiril Videlov
f5915262e8
Merge pull request #3686 from gitbutlerapp/exclude-large-new-files
...
fix: only skip big files from snapshotting if they are untracked
2024-05-04 16:41:23 +02:00
Kiril Videlov
105a355e5d
fix: only skip big files from snapshotting if they are untracked
2024-05-04 16:28:34 +02:00
Kiril Videlov
027e0bec05
Merge pull request #3685 from gitbutlerapp/add-gitbutler-cli-cargo-toml
...
tiny cli for snapshots
2024-05-04 03:58:35 -07:00
Kiril Videlov
f8e05ec694
skip pager on windows
2024-05-04 12:14:24 +02:00
Kiril Videlov
539ba983b3
add cli crate to ci jobs
2024-05-04 11:31:28 +02:00
Kiril Videlov
9aee55c869
tiny cli for snapshots
...
this is a cli convinience tool for listing and restoring gitbutler snapshots even if the app can't start or if it's hung. of course this can be done with plain git, but this is more convinient
In the future we could add more functionality to it
2024-05-04 11:29:14 +02:00
Kiril Videlov
d2a51e84e9
Merge pull request #3682 from gitbutlerapp/improve-advanced-commit-options
...
Improve advanced commit options
2024-05-04 01:47:21 -07:00
Kiril Videlov
3bfc081b94
Merge pull request #3683 from gitbutlerapp/Update-branch-normalize-function
...
Update the normalizeBranchName function to match rust
2024-05-03 14:23:18 -07:00
Caleb Owens
32a8992af6
Add some basic test cases for normalizeBranchName
2024-05-03 20:16:02 +01:00
Caleb Owens
63ee99b647
Update the normalizeBranchName function to match rust
...
Before, uppercase letters and hashes were missing from the regex. I've now coppied the regex from the rust code so they are now identical
2024-05-03 20:09:22 +01:00
Caleb Owens
fe30db9760
Change metric for "undoable"
...
We have two types of commits "RemoteCommit" and "Commit". "RemoteCommit" are what we see in the "Upstream" section, and in branches. These commits can't be undone.
Commits of type "Commit" appear in the "Local" and "Remote" sections and are undoable
2024-05-03 19:49:40 +01:00
Caleb Owens
601d6ba809
Grey out commit buttons when title isnt present
2024-05-03 19:41:45 +01:00
Caleb Owens
c4108dc22c
Only show edit title option when commit is undoable
2024-05-03 19:32:30 +01:00
Caleb Owens
6982909689
Use stop propagation to prevent card closing
2024-05-03 19:14:24 +01:00
Caleb Owens
f8109368f3
Improve UI of advanced commit options
2024-05-03 19:10:28 +01:00
Kiril Videlov
8db8ec5641
Merge pull request #3676 from gitbutlerapp/update-virtual-branches-toml-on-restore
...
snapshots: use subtrees for virtual_branches.toml
2024-05-03 02:50:03 -07:00
Kiril Videlov
8ef46ce42c
snapshots: use subtrees for virtual_branches.toml
...
Instead of copying the file to the working directory, simply create a top level tree with a subtree for the workdir and a blob for the toml file
2024-05-03 11:13:55 +02:00
Mattias Granlund
5bb8c25aca
Fix bug in updating base branch
...
- drop "double lock across branches" test because it can't happen
- save correct tree when updating branch states
- use correct integration commit when updating base branch
2024-05-02 17:39:52 +02:00
Kiril Videlov
2e5684a965
Merge pull request #3671 from gitbutlerapp/advanced-commit-operations
...
puts advanced commit ops behind a feature flag
2024-05-02 05:59:03 -07:00
Kiril Videlov
c312e7a287
puts advanced commit ops behind a feature flag
2024-05-02 14:57:32 +02:00
Pavel Laptev
5ba8243fd7
Experimental features toggle card fix ( #3670 )
2024-05-02 14:16:27 +02:00
Pavel Laptev
a73089718d
Text case fix ( #3669 )
...
* Text case fix
2024-05-02 13:58:34 +02:00
Josh Junon
e3263774f6
Merge pull request #3668 from gitbutlerapp/simplify-default-target
...
simplify default target retrieval logic
2024-05-02 13:41:07 +02:00
Josh Junon
c9c3371ba2
Merge pull request #3665 from anaisbetts/better-npm-advice-2
...
Even Better npm advice
2024-05-02 13:33:01 +02:00
Josh Junon
c047e8bee4
Merge pull request #3667 from gitbutlerapp/remove-rust-init
...
eliminate rust-init step in CI
2024-05-02 13:30:04 +02:00
Josh Junon
6747da6e50
simplify default target retrieval logic
2024-05-02 13:28:21 +02:00
Josh Junon
77fbe558cc
only build gitbutler-git bins if testing
2024-05-02 13:07:33 +02:00
Josh Junon
bce6e48de8
init the rust env on windows check, too
2024-05-02 13:03:29 +02:00
Josh Junon
4625189cb9
remove use of cache
2024-05-02 13:00:25 +02:00
Josh Junon
f5ef57e74d
Merge pull request #3666 from gitbutlerapp/unix-timestamp
...
eliminate redundancy in unix timestamp retrieval
2024-05-02 12:56:48 +02:00
Josh Junon
6ae4f91ecc
eliminate rust-init step in CI
2024-05-02 12:52:44 +02:00
Josh Junon
664aadcd1c
eliminate redundancy in unix timestamp retrieval
2024-05-02 12:43:35 +02:00
Ani Betts
bcadd03b44
Fix a typo in our command
2024-05-02 12:22:51 +02:00
Ani Betts
ed15283c37
More notes, come correct with line lengths
2024-05-02 12:12:36 +02:00
Kiril Videlov
80d52153ae
Merge pull request #3664 from anaisbetts/better-npm-advice
...
Improve advice for npm prefix on Windows
2024-05-02 03:08:33 -07:00
Ani Betts
bce2754525
Improve advice for npm prefix on Windows
...
Instead of trouncing the Program Files permissions, let's set an npm prefix instead
2024-05-02 12:00:27 +02:00
Kiril Videlov
1fc12f0c78
Merge pull request #3663 from gitbutlerapp/add-telemetry-sidebar-menu-item
...
add-telemetry-sidebar-menu-item
2024-05-02 02:59:55 -07:00
Kiril Videlov
3b7387a4b3
put base branch switching behind a feature flag
2024-05-02 11:58:31 +02:00
Kiril Videlov
3326ae6b81
feat: a place in the settings for feature flags
2024-05-02 11:51:06 +02:00
Scott Chacon
ac4188819a
Merge pull request #3661 from gitbutlerapp/base-branch-commit-card-fix
...
Base branch commit cards should not be editable
2024-05-02 11:36:37 +02:00
