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
Kiril Videlov
b1ecafcd8c
Merge pull request #5170 from gitbutlerapp/update-github-pull-request-source-branch
...
fix: Get the right PR source branch
2024-10-16 17:34:50 +02:00
Kiril Videlov
5cd9d77fec
Merge pull request #5173 from gitbutlerapp/fix-issues-with-series-listing
...
Stack - correctly flag remote commits when no changeid
2024-10-16 17:34:30 +02:00
Kiril Videlov
e587ee3dde
Merge pull request #5171 from gitbutlerapp/Fix-rebasers
...
Fix issue where incoming commit headers were caried into merge commit headers
2024-10-16 17:33:11 +02:00
Kiril Videlov
b3313fb60b
make it compile lol
2024-10-16 17:27:21 +02:00
Caleb Owens
10b7ab9471
Fix issue where incoming commit headers were caried into merge commit headers
2024-10-16 16:58:33 +02:00
ndom91
d9e103d898
fix: hide images > 5mb
2024-10-16 16:55:28 +02:00
ndom91
833d8510ce
fix: disable image contextMenu in file preview
2024-10-16 16:55:28 +02:00
ndom91
5b09278807
fix: binary image display styling
2024-10-16 16:55:28 +02:00
Sebastian Thiel
201ceec88b
Adapt the UI implementation to deal with the lack of the FileInfo::status field
2024-10-16 16:49:44 +02:00
estib
af625080db
fix: Get the right PR source branch
...
We were setting the PR **base branch** (e.g. main or master) as the source branch, instead of the head, as intended
2024-10-16 16:46:20 +02:00
Sebastian Thiel
f7d5380687
Some improvements on top of #5089
...
The PR was merged earlier to not hold it after a passed review,
yet I personally feel strongly enough about the backend portions
to give it another round of polish.
2024-10-16 16:35:06 +02:00
estib
fb152bcc96
PR card updates
2024-10-16 16:20:02 +02:00
Kiril Videlov
055a653979
Stack - correctly flag remote commits when no changeid
2024-10-16 15:53:56 +02:00
Esteban Vega
05e812ca88
Merge pull request #5167 from gitbutlerapp/default-target-on-fresh-install
...
fix: Swallow the default target not found
2024-10-16 15:49:35 +02:00
ndom91
eaa785e3bb
fix: do not allow commit editing for upstream-only commits
2024-10-16 15:42:15 +02:00
estib
dec689c6ab
fix: Swallow the default target not found
...
Don't surface the default target not found. This already is caught at the top level and the user is taken to the 'target not found' page.
2024-10-16 15:35:00 +02:00
Pavel Laptev
a7eef8ff38
center dots
2024-10-16 15:22:27 +02:00
ndom91
6b89ffdecf
fix: bottom commitLine dashed
2024-10-16 15:22:27 +02:00
ndom91
4a3a67ffa5
feat: add seriesDividerLine between series
2024-10-16 15:22:27 +02:00
ndom91
7f63a34925
fix: rename stackingBranch* components to stackingSeries*
2024-10-16 15:22:27 +02:00
Esteban Vega
a2af3bb560
Merge pull request #5161 from gitbutlerapp/fix-input-auto-select-on-start-commit
...
fix: Auto-focus on 'Start commit'
2024-10-16 12:34:37 +02:00
