Skip to content

Commit 6dac26d

Browse files
committed
refactor: since there is a hotkey to stage and commit, remove the unsafe auto-stage configure
1 parent 31e7bef commit 6dac26d

File tree

10 files changed

+7
-33
lines changed

10 files changed

+7
-33
lines changed

src/Models/RepositorySettings.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@ public bool CheckoutBranchOnCreateBranch
7070
set;
7171
} = true;
7272

73-
public bool AutoStageBeforeCommit
74-
{
75-
get;
76-
set;
77-
} = false;
78-
7973
public AvaloniaList<string> Filters
8074
{
8175
get;

src/Resources/Locales/de_DE.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,6 @@
622622
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignoriere Dateien im selben Ordner</x:String>
623623
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignoriere nur diese Datei</x:String>
624624
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Amend</x:String>
625-
<x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">Auto-Stage</x:String>
626625
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Du kannst diese Datei jetzt stagen.</x:String>
627626
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
628627
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>

src/Resources/Locales/en_US.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,6 @@
631631
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignore files in the same folder</x:String>
632632
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignore this file only</x:String>
633633
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Amend</x:String>
634-
<x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">Auto-Stage</x:String>
635634
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">You can stage this file now.</x:String>
636635
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
637636
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>

src/Resources/Locales/fr_FR.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,6 @@
582582
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignorer les fichiers dans le même dossier</x:String>
583583
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">N'ignorer que ce fichier</x:String>
584584
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Amender</x:String>
585-
<x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">Auto-Index</x:String>
586585
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Vous pouvez indexer ce fichier.</x:String>
587586
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
588587
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>

src/Resources/Locales/pt_BR.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@
575575
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignorar arquivos na mesma pasta</x:String>
576576
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignorar apenas este arquivo</x:String>
577577
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Corrigir</x:String>
578-
<x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">Auto-Stage</x:String>
579578
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Você pode stagear este arquivo agora.</x:String>
580579
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
581580
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>

src/Resources/Locales/ru_RU.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,6 @@
634634
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Игнорировать файлы в том же каталоге</x:String>
635635
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Игнорировать только эти файлы</x:String>
636636
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Изменить</x:String>
637-
<x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">Автоподготовка</x:String>
638637
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Теперь вы можете подготовитть этот файл.</x:String>
639638
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">ЗАФИКСИРОВАТЬ</x:String>
640639
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">ЗАФИКСИРОВАТЬ и ОТПРАВИТЬ</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,6 @@
629629
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">忽略同目录下所有文件</x:String>
630630
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">忽略本文件</x:String>
631631
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">修补(--amend)</x:String>
632-
<x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">自动暂存</x:String>
633632
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">现在您已可将其加入暂存区中</x:String>
634633
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">提交</x:String>
635634
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交并推送</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,6 @@
634634
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">忽略同路徑下所有檔案</x:String>
635635
<x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">忽略本檔案</x:String>
636636
<x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">修補 (--amend)</x:String>
637-
<x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">自動暫存</x:String>
638637
<x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">現在您已可將其加入暫存區中</x:String>
639638
<x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">提 交</x:String>
640639
<x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交並推送</x:String>

src/ViewModels/WorkingCopy.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ public bool IsCommitting
7979
private set => SetProperty(ref _isCommitting, value);
8080
}
8181

82-
public bool AutoStageBeforeCommit
83-
{
84-
get => _repo.Settings.AutoStageBeforeCommit;
85-
set => _repo.Settings.AutoStageBeforeCommit = value;
86-
}
87-
8882
public bool UseAmend
8983
{
9084
get => _useAmend;
@@ -416,7 +410,7 @@ public void Discard(List<Models.Change> changes)
416410

417411
public void Commit()
418412
{
419-
DoCommit(AutoStageBeforeCommit, false);
413+
DoCommit(false, false);
420414
}
421415

422416
public void CommitWithAutoStage()
@@ -426,7 +420,7 @@ public void CommitWithAutoStage()
426420

427421
public void CommitWithPush()
428422
{
429-
DoCommit(AutoStageBeforeCommit, true);
423+
DoCommit(false, true);
430424
}
431425

432426
public ContextMenu CreateContextMenuForUnstagedChanges()

src/Views/WorkingCopy.axaml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<v:CommitMessageTextBox Grid.Row="2" Text="{Binding CommitMessage, Mode=TwoWay}"/>
186186

187187
<!-- Commit Options -->
188-
<Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto">
188+
<Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto">
189189
<Button Grid.Column="0"
190190
Classes="icon_button"
191191
Margin="4,0,0,0" Padding="0"
@@ -217,22 +217,15 @@
217217
</Button>
218218

219219
<CheckBox Grid.Column="3"
220-
Height="24"
221-
Margin="4,0,0,0"
222-
HorizontalAlignment="Left"
223-
IsChecked="{Binding AutoStageBeforeCommit, Mode=TwoWay}"
224-
Content="{DynamicResource Text.WorkingCopy.AutoStage}"/>
225-
226-
<CheckBox Grid.Column="4"
227220
Height="24"
228221
Margin="8,0,0,0"
229222
HorizontalAlignment="Left"
230223
IsChecked="{Binding UseAmend, Mode=TwoWay}"
231224
Content="{DynamicResource Text.WorkingCopy.Amend}"/>
232225

233-
<v:LoadingIcon Grid.Column="6" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
226+
<v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
234227

235-
<Button Grid.Column="7"
228+
<Button Grid.Column="6"
236229
Classes="flat primary"
237230
Content="{DynamicResource Text.WorkingCopy.Commit}"
238231
Height="28"
@@ -257,13 +250,13 @@
257250
</Button>
258251

259252
<!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage -->
260-
<Button Grid.Column="8"
253+
<Button Grid.Column="7"
261254
Width="0" Height="0"
262255
Background="Transparent"
263256
Command="{Binding CommitWithAutoStage}"
264257
HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"/>
265258

266-
<Button Grid.Column="9"
259+
<Button Grid.Column="8"
267260
Classes="flat"
268261
Content="{DynamicResource Text.WorkingCopy.CommitAndPush}"
269262
Height="28"

0 commit comments

Comments
 (0)