michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-25 21:07:20 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix bug that stuck auto fetch when pull failed & make stage area resizeable (#627)

Browse source 
* fix watcher stuck by pull
* make stage area resizeable

---------

Co-authored-by: yindf <yindf@mail.jj.cn>
(cherry picked from commit a842aca042a73cb5fa3995794aae2a2e3540b37f)
This commit is contained in:
yindf 2024-10-30 17:59:14 +08:00 committed by leo
parent fe03512c5c
commit 2d7ea561e2
No known key found for this signature in database
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ViewModels/Pull.cs
View file

@ -149,7 +149,10 @@ namespace SourceGit.ViewModels
SetProgressDescription($"Fetching remote: {_selectedRemote.Name}..."); SetProgressDescription($"Fetching remote: {_selectedRemote.Name}...");
rs = new Commands.Fetch(_repo.FullPath, _selectedRemote.Name, NoTags, SetProgressDescription).Exec(); rs = new Commands.Fetch(_repo.FullPath, _selectedRemote.Name, NoTags, SetProgressDescription).Exec();
if (!rs) if (!rs)
{
CallUIThread(() => _repo.SetWatcherEnabled(true));
return false; return false;
}
_repo.MarkFetched(); _repo.MarkFetched();

9
src/Views/WorkingCopy.axaml
View file

@ -80,6 +80,15 @@
ChangeDoubleTapped="OnUnstagedChangeDoubleTapped" ChangeDoubleTapped="OnUnstagedChangeDoubleTapped"
KeyDown="OnUnstagedKeyDown"/> KeyDown="OnUnstagedKeyDown"/>
<!-- Splitter -->
<GridSplitter Grid.Row="2"
MinWidth="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"
BorderThickness="0,0,1,0"
BorderBrush="{DynamicResource Brush.Border0}"/>
<!-- Staged Toolbar --> <!-- Staged Toolbar -->
<Border Grid.Row="2" BorderThickness="0,1" BorderBrush="{DynamicResource Brush.Border0}"> <Border Grid.Row="2" BorderThickness="0,1" BorderBrush="{DynamicResource Brush.Border0}">
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto"> <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">