Kiril Videlov
f62883ffdb
Series UI: update copy to speak about branches
...
At least for now, its more familiar terminology
2024-10-18 14:10:33 +02:00
Esteban Vega
7624ef5e01
Merge pull request #5202 from gitbutlerapp/branch
...
PR cards: Remove the mergeable state message
2024-10-18 13:58:24 +02:00
ndom91
09bcfe5547
fix: update svelte checks of 'vritual branch'
2024-10-18 13:57:33 +02:00
ndom91
ce3ac1a079
feat: update default stack name to 'Lane'
2024-10-18 13:57:33 +02:00
estib
9abc6b72b4
PR cards: Remove the mergeable state message
...
Remove the status message regarding the mergeable state in the PR card.
2024-10-18 13:37:36 +02:00
ndom91
d14c3e9387
fix: revert adding tooltip prop to ContextMenuItem
2024-10-18 12:57:28 +02:00
ndom91
fa2954798d
fix: instead of disabling+tooltip, just dont show invalid items in contextMenu
2024-10-18 12:57:28 +02:00
ndom91
2bc44d6433
chore: convert remaining ContextMenuItems to runes / snippets
2024-10-18 12:57:28 +02:00
ndom91
6804bfb6ef
feat: add tooltips to series header contextMenu items to explain why they're disabled
2024-10-18 12:57:28 +02:00
ndom91
c760a0b482
feat: add tooltip option to ContextMenuItem
2024-10-18 12:57:28 +02:00
Esteban Vega
a9ecf285f6
add-branch-to-stack-update ( #5188 )
...
* Button: Add more styling props
- Choose the border radius style
- Set a max-width
- Ignore children (helps with the animation in between having no children and having a large child)
* StackingAddSeriesButton
Replace the 'new series' card with a button that appears on hover.
Also:
The modal displays more information, like what the resulting branch name will be called
* style updates
* button center align
* fix tooltip positioning
* some UI fixes
* added focus trap to the context menu
* styles updated
* update: transition time
---------
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
2024-10-18 12:55:08 +02:00
Kiril Videlov
86b70a30a7
Merge pull request #5198 from gitbutlerapp/one-more-condition-for-requires-force
...
fix - stack / requires force
2024-10-18 12:07:20 +02:00
Kiril Videlov
74e35f86cf
fix - stack / requires force
...
Toggle on 'requires force push' if there are upstream only patches (so that they can be overriden)
2024-10-18 12:01:46 +02:00
ndom91
1e3f9ecd8a
fix: update label to 'Push All' when there are multiple series
2024-10-18 11:32:35 +02:00
ndom91
99ada05663
feat: add token for branch_name in custom prompts
2024-10-17 23:00:03 +02:00
Kiril Videlov
97937e242f
Merge pull request #5193 from gitbutlerapp/stack-api-light-refactor
...
Stack api - small refactor
2024-10-17 20:23:20 +02:00
Kiril Videlov
de6de23155
Stack api - small refactor
...
Remove duplications, typos etc
2024-10-17 20:03:13 +02:00
Kiril Videlov
2dc86e85bd
Merge pull request #5192 from gitbutlerapp/refactor-branch-actions-stack-module
...
Move a series converion function in branch-actions to separate module
2024-10-17 19:17:52 +02:00
Kiril Videlov
a4693c1fee
Merge pull request #5191 from gitbutlerapp/fix-stack-upstream-commit-listing
...
Stack: fix upstream commit listing
2024-10-17 18:57:20 +02:00
Kiril Videlov
6b3f80e157
Move a series converion function in branch-actions to separate module
2024-10-17 18:56:48 +02:00
Kiril Videlov
0aac619791
Stack: fix upstream commit listing
2024-10-17 18:51:25 +02:00
Caleb Owens
6b4660f9d9
Merge pull request #5185 from gitbutlerapp/Patch-stack-listing
...
Patch stack listing and creation
2024-10-17 16:50:18 +02:00
Caleb Owens
eea2f32220
Prevent undesirable if can't talk to server
2024-10-17 16:13:16 +02:00
ndom91
c5c54b672f
fix: in series delete confirmation modal show correct seriesName
2024-10-17 14:35:44 +02:00
Caleb Owens
73f458738b
Fix race condition in listing patch stacks
2024-10-17 14:27:28 +02:00
ndom91
2005e04346
fix: update copy for feature flag for enabling multi-series stacking support
2024-10-17 14:23:41 +02:00
Caleb Owens
538c19671b
Make sure feature flag works
2024-10-17 14:07:39 +02:00
Kiril Videlov
8176ebbba3
Merge pull request #5183 from gitbutlerapp/fix-series-header-disable-rename-once-pushed
...
fix: also disable series 'rename' via contextMenu once pushed
2024-10-17 13:10:58 +02:00
Caleb Owens
92c1188759
Patch stack creation
2024-10-17 12:59:14 +02:00
Kiril Videlov
5d28c1a76a
Merge pull request #5162 from gitbutlerapp/kvs-branch
...
Implement 'integrate upstream changes' for the stacked flow
2024-10-17 12:34:56 +02:00
ndom91
032a0dfe48
fix: stacking dont show PR cards/btns if no service exists
2024-10-17 12:08:51 +02:00
ndom91
f94ea35629
fix: also disable series 'rename' via contextMenu once pushed
2024-10-17 12:06:07 +02:00
ndom91
b26b30d8d0
fix: ensure commit-lines.css works for both stacking/original lanes
2024-10-17 12:03:09 +02:00
Kiril Videlov
dd6d62cf42
Add tests for integrate_upstream_commits_for_series assuring same behavior
2024-10-17 11:30:07 +02:00
Kiril Videlov
169fe207ce
Reimplement integrate_upstream_commits_for_series to do a two-pass rebase
2024-10-17 11:29:43 +02:00
Kiril Videlov
6a056f9ad7
refactor integrate_upstream_commits_for_series
2024-10-16 22:09:59 +02:00
Kiril Videlov
60b365d988
Merge pull request #5178 from gitbutlerapp/stack-compute-upstream-only-correctly
...
stack: improvve computing of upstream only commits
2024-10-16 20:30:41 +02:00
Kiril Videlov
5fbf242f86
Update virtual.rs
2024-10-16 20:25:08 +02:00
Kiril Videlov
98c537f5ec
stack: improvve computing of upstream only commits
...
It is necessary to compare against commits from either side of merge commits
2024-10-16 20:22:37 +02:00
Esteban Vega
08b29a7176
Merge pull request #5177 from gitbutlerapp/branch
...
fix: New branch dropzone only accepts uncommited files
2024-10-16 19:50:42 +02:00
Kiril Videlov
64fd3b893d
Merge pull request #5165 from Byron/fixup-5089
...
Some improvements on top of #5089
2024-10-16 19:19:46 +02:00
estib
73f81332a3
fix: New branch dropzone only accepts uncommited files
...
When creating a brand new branch, don't let commited files or hunks create new branches
2024-10-16 19:15:56 +02:00
Kiril Videlov
9a8dfa4eaa
Merge pull request #5176 from gitbutlerapp/branch
...
fix comment on a test assertion
2024-10-16 19:08:18 +02:00
Kiril Videlov
d8f10e1513
fix comment on a test assertion
2024-10-16 18:55:06 +02:00
Kiril Videlov
666c167e5e
Merge pull request #5174 from gitbutlerapp/revwalk-simplify-first-parent
...
When revwalking only get the commits from the first parent
2024-10-16 18:51:51 +02:00
Kiril Videlov
64d2641e70
fix an missed call site
2024-10-16 18:46:01 +02:00
Kiril Videlov
99ebced634
fix correct test expectations
2024-10-16 18:36:12 +02:00
Kiril Videlov
3bd4428f35
When revwalking only get the commits from the first parent
...
Also adding an option for getting all
2024-10-16 18:28:32 +02:00
Caleb Owens
2c00d5f869
Listing series
2024-10-16 17:49:55 +02:00
Esteban Vega
740479861b
Merge pull request #5169 from gitbutlerapp/add-pr-details-and-refetch
...
PR card updates
2024-10-16 17:47:04 +02:00
