Kiril Videlov
b2db0ca653
Merge pull request #4402 from gitbutlerapp/rename-trunk-to-target
...
rename Trunk to Target in the UI
2024-07-16 14:56:54 +02:00
Kiril Videlov
9263813a50
rename Trunk to Target in the UI
...
As it is more descriptive what it is. Added a tooltip for a good measure
2024-07-16 14:52:13 +02:00
Caleb Owens
2bd00f9b4c
Merge pull request #4401 from gitbutlerapp/rename-daft-names
...
Rename daft names
2024-07-16 13:59:58 +02:00
Caleb Owens
3c2dca92ae
Remove unused and inaccuratly named functions
2024-07-16 13:57:55 +02:00
Caleb Owens
5756235768
Rename RemoteCommit -> Commit
2024-07-16 12:00:19 +02:00
Caleb Owens
af3b82e9f8
Rename Commit -> DetailedCommit
2024-07-16 11:59:55 +02:00
Caleb Owens
f8261130dc
Rename RemoteBranchData -> BranchData
2024-07-16 11:59:15 +02:00
Caleb Owens
4d5ff2f888
Rename RemoteBranch -> Branch
2024-07-16 11:58:45 +02:00
Caleb Owens
43cfc39fbe
Rename Branch -> VirtualBranch
2024-07-16 11:58:09 +02:00
Caleb Owens
6f1b815735
Merge pull request #4400 from gitbutlerapp/extract-branch-normalization-into-service
...
Extracted js normalize branch name into a service
2024-07-16 11:48:58 +02:00
Caleb Owens
8f01e64301
Extracted js normalize branch name into a service
2024-07-16 11:47:11 +02:00
Pavel Laptev
b888fbc834
normilize-branch-name-update ( #4392 )
...
* refactor: Normalized branch name handling
* Refactor: use only one normalize function (rust)
* Deletion: unused `normalizeBranchName` function
* Update lib.rs
* Changed test to reflect new functionality
---------
Co-authored-by: Caleb Owens <caleb@gitbutler.com>
2024-07-16 11:23:09 +02:00
Kiril Videlov
fcce329118
Merge pull request #4399 from gitbutlerapp/Fix-for-the-something-went-wrong-situation
...
Fix for the "something went wrong" situation
2024-07-16 10:51:15 +02:00
Kiril Videlov
92fb462db9
rudamentary indication in UI when hunk is poisoned
...
While this is not great, it will hapen rarely, and its much better than "something went wrong"
2024-07-16 10:43:54 +02:00
Nico Domino
bc8d00bb88
fix: update wp.com csp to wildcard subdomain ( #4397 )
2024-07-16 08:35:27 +00:00
Kiril Videlov
b9c26df9a1
indicate when a hunk is poisoned
...
This means that the hunk is 'locked/depends on' multiple branches, and because of this, it cannot be manipulated
2024-07-16 10:34:32 +02:00
Kiril Videlov
dac6c118e0
dont explode when a patch failed to apply
...
This condition arises when a hunk in fact depends on hunks from two other commits from two separate branches (i.e. it's a hunk that fuses with both)
2024-07-16 10:33:18 +02:00
Caleb Owens
d72cbfd7fc
Merge pull request #4398 from gitbutlerapp/fix-infinite-recursion-in-share-modal
...
Remove recursion error in ShareissueModal
2024-07-16 10:27:53 +02:00
Caleb Owens
a3c4c6d748
Remove recursion error in ShareissueModal
2024-07-16 10:25:23 +02:00
Kiril Videlov
d6ec849f5e
let hunk locking discover all locks
2024-07-16 10:17:07 +02:00
Nico Domino
879746c665
feat: add io.wp.com to img-src CSP for gravatar / auth0 fallback avatars ( #4396 )
2024-07-16 08:15:38 +00:00
Kiril Videlov
8ccd8d511e
Merge pull request #4349 from Byron/refactor
...
refactor and PoC for worktree mutability handling
2024-07-15 23:02:01 +02:00
Sebastian Thiel
613a773c77
fix remaining tests that depend on the auto-creation of vbranches
2024-07-15 22:36:44 +02:00
Pavel Laptev
a127b157be
Merge pull request #4391 from gitbutlerapp/Fix-textarea-auto-height-on-message-generation
...
Fix: Improve textarea height updating in CommitMessageInput.
2024-07-15 21:56:57 +02:00
Pavel Laptev
7a7299545b
Fix: Improve textarea height updating in CommitMessageInput.
2024-07-15 21:51:57 +02:00
Sebastian Thiel
822fd92b9d
Enforce locking by making locks part of the public oplog API.
...
This way, all methods that care about the `oplog` also have to
care about choosing the right lock.
2024-07-15 21:09:33 +02:00
Mattias Granlund
b663c40423
chore: nit pick some things in fetchSignal.ts
2024-07-15 17:13:08 +01:00
Caleb Owens
05f9fa60a9
Merge pull request #4388 from gitbutlerapp/fix-commit-lines-on-different-frok-base
...
Fixed logic for removing the ghost line
2024-07-15 17:35:05 +02:00
Caleb Owens
09344ee8d1
Fixed logic for removing the ghost line
2024-07-15 17:34:30 +02:00
Mattias Granlund
8bc53a38d3
Fix for pr button not showing a selected action
...
- use graceful fall back if saved preference is not in enum
2024-07-15 15:59:16 +01:00
Mattias Granlund
a80612e947
Disable pr button when no gitHost available
...
- disabled button still prevents tooltip from displaying
2024-07-15 15:54:28 +01:00
Mattias Granlund
92f86c9b04
Fix: show pr number instead of pr id
2024-07-15 15:30:16 +01:00
Mattias Granlund
ced7394d7b
Fix bug in sync button
...
- it was fetching from remote but not re-fetching base branch data
2024-07-15 15:27:37 +01:00
Mattias Granlund
6692acd261
Simplify SystemEditor readable
2024-07-15 14:34:55 +01:00
Pavel Laptev
0d71c87cd6
Fix patch: auto-scroll while dragging ( #4383 )
2024-07-15 14:58:25 +02:00
Pavel Laptev
222618980d
CSS Fixes ( #4381 )
...
* Typo and cursor style fix
* Commit dialog seedup
2024-07-15 14:51:53 +02:00
Sebastian Thiel
09ca2d0284
enforce in-process-synchronization during worktree updates and prolonged reads in oplog
...
That way it's assured that reads and writes don't intersect, but assure we only
hold such lock for the shortest amount of time for reads and and for the
full duration of writes.
2024-07-15 14:21:15 +02:00
Nico Domino
09e75032ba
fix: add gha release docs fix ( #4380 )
2024-07-15 12:03:06 +00:00
Nico Domino
8b7f9ec349
fix: rm duplicate showError calls ( #4379 )
2024-07-15 11:16:20 +02:00
Sebastian Thiel
3e79238e7f
assure conflicts::mark() writes its file atomically
...
That way it can't be observed half-written, or remain in a half-written
state in case of crash.
2024-07-15 08:20:06 +02:00
Sebastian Thiel
b3b87b34a5
reduce tauri state
...
This is in preparation for making operations that access the filesystems
less stateful, which in turn makes it less akward to identify writing
methods with `&mut` lateron.
This includes accepting that all we really need is a single directory
to generate everything else we need on the fly. This simplifies commands.
For good measure, this also simplifies imports of smaller crates that are
involved.
2024-07-14 22:27:53 +02:00
Mattias Granlund
572d43f41b
Fix bug in gitHost factory
...
- you might have github enabled but not in a github repo
2024-07-14 21:21:31 +01:00
Sebastian Thiel
4a7b63a56e
various refactors in main functions called during project load
...
* use `ctx` as name instead of `project_repository` to make lines shorter
and more readable. This could be done everywhere once the type-name changes
as well.
* Where possible, avoid using `&self` for `VirtualBranchActions` as there is no state.
For now I avoided to remove its usage as field in the filesystem monitor.
* Use a more modern way to use state in `tauri` commands.
* Add the `Ext` suffix to what clearly is extension traits.
2024-07-14 21:32:55 +02:00
Sebastian Thiel
f48d0e2746
adapt to changes in gitbutler-branch crate
2024-07-14 21:32:55 +02:00
Sebastian Thiel
85b4e564cd
simplify module paths of gitbutler-branch crate
2024-07-14 21:32:55 +02:00
Sebastian Thiel
4501b5dd51
minimize the public API of the branch crate
...
Only keep public what needs to be public right now, which always
helps with refactoring later.
2024-07-14 21:32:55 +02:00
Sebastian Thiel
4805f6e7e7
adapt to changes in gitbutler-branch-actions
2024-07-14 21:32:55 +02:00
Sebastian Thiel
5e408f6b2d
Assure a single path to an item (struct, fn)
...
Also, simplify paths and optimize them (to some extend) to seem
non-redundant when `use`ing them.
2024-07-14 21:32:55 +02:00
Sebastian Thiel
0079f2bcbe
minimize the public API of gitbutler-branch-actions crate.
...
Also avoid private traits where functions would be easier to use.
2024-07-14 21:32:54 +02:00
Sebastian Thiel
6fb6201ab9
assure docs can be built without warnings by default.
...
It's a good way to review import paths and the public API.
2024-07-14 21:32:49 +02:00
