Skip to content

Commit 09d0122

Browse files
committed
refactor: rewrite git pull command
If we do not provide pulling remote branch, it will auto fetch all branches first. Signed-off-by: leo <[email protected]>
1 parent 7728f4f commit 09d0122

File tree

16 files changed

+7
-96
lines changed

16 files changed

+7
-96
lines changed

src/Commands/Pull.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public class Pull : Command
44
{
5-
public Pull(string repo, string remote, string branch, bool useRebase, bool noTags)
5+
public Pull(string repo, string remote, string branch, bool useRebase)
66
{
77
WorkingDirectory = repo;
88
Context = repo;
@@ -12,9 +12,6 @@ public Pull(string repo, string remote, string branch, bool useRebase, bool noTa
1212
if (useRebase)
1313
Args += "--rebase=true ";
1414

15-
if (noTags)
16-
Args += "--no-tags ";
17-
1815
Args += $"{remote} {branch}";
1916
}
2017
}

src/Models/RepositorySettings.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,6 @@ public bool PreferRebaseInsteadOfMerge
8080
set;
8181
} = true;
8282

83-
public bool FetchWithoutTagsOnPull
84-
{
85-
get;
86-
set;
87-
} = false;
88-
89-
public bool FetchAllBranchesOnPull
90-
{
91-
get;
92-
set;
93-
} = true;
94-
9583
public bool CheckSubmodulesOnPush
9684
{
9785
get;

src/Resources/Locales/de_DE.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,12 +526,10 @@
526526
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Worktree Informationen in `$GIT_COMMON_DIR/worktrees` löschen</x:String>
527527
<x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
528528
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Remote-Branch:</x:String>
529-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Alle Branches fetchen</x:String>
530529
<x:String x:Key="Text.Pull.Into" xml:space="preserve">Lokaler Branch:</x:String>
531530
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Lokale Änderungen:</x:String>
532531
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
533532
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
534-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Ohne Tags fetchen</x:String>
535533
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
536534
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
537535
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Rebase anstatt Merge verwenden</x:String>

src/Resources/Locales/en_US.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,12 +531,10 @@
531531
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Prune worktree information in `$GIT_COMMON_DIR/worktrees`</x:String>
532532
<x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
533533
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Remote Branch:</x:String>
534-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Fetch all branches</x:String>
535534
<x:String x:Key="Text.Pull.Into" xml:space="preserve">Into:</x:String>
536535
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Local Changes:</x:String>
537536
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
538537
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
539-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch without tags</x:String>
540538
<x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">Update all submodules</x:String>
541539
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String>
542540
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>

src/Resources/Locales/es_ES.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,12 +529,10 @@
529529
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Podar información de worktree en `$GIT_COMMON_DIR/worktrees`</x:String>
530530
<x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
531531
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Rama Remota:</x:String>
532-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Fetch todas las ramas</x:String>
533532
<x:String x:Key="Text.Pull.Into" xml:space="preserve">En:</x:String>
534533
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Cambios Locales:</x:String>
535534
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
536535
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
537-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch sin etiquetas</x:String>
538536
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
539537
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
540538
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Usar rebase en lugar de merge</x:String>

src/Resources/Locales/fr_FR.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,12 +508,10 @@
508508
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve"> Élaguer les information de worktree dans `$GIT_COMMON_DIR/worktrees`</x:String>
509509
<x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
510510
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branche distante :</x:String>
511-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Fetch toutes les branches</x:String>
512511
<x:String x:Key="Text.Pull.Into" xml:space="preserve">Dans :</x:String>
513512
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Changements locaux :</x:String>
514513
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
515514
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Réappliquer</x:String>
516-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Fetch sans les tags</x:String>
517515
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Dépôt distant :</x:String>
518516
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; Merge)</x:String>
519517
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Utiliser rebase au lieu de merge</x:String>

src/Resources/Locales/it_IT.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,12 +529,10 @@
529529
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Potatura delle informazioni di worktree in `$GIT_COMMON_DIR/worktrees`</x:String>
530530
<x:String x:Key="Text.Pull" xml:space="preserve">Scarica</x:String>
531531
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branch Remoto:</x:String>
532-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Recupera tutti i branch</x:String>
533532
<x:String x:Key="Text.Pull.Into" xml:space="preserve">In:</x:String>
534533
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Modifiche Locali:</x:String>
535534
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Scarta</x:String>
536535
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Stasha e Riapplica</x:String>
537-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Recupera senza tag</x:String>
538536
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
539537
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Scarica (Recupera e Unisci)</x:String>
540538
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Riallineare anziché unire</x:String>

src/Resources/Locales/ja_JP.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,12 +508,10 @@
508508
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">`$GIT_DIR/worktrees` の作業ツリー情報を削除</x:String>
509509
<x:String x:Key="Text.Pull" xml:space="preserve">プル</x:String>
510510
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">ブランチ:</x:String>
511-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">すべてのブランチをフェッチ</x:String>
512511
<x:String x:Key="Text.Pull.Into" xml:space="preserve">宛先:</x:String>
513512
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">ローカルの変更:</x:String>
514513
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">破棄</x:String>
515514
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">スタッシュして再適用</x:String>
516-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">タグなしでフェッチ</x:String>
517515
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">リモート:</x:String>
518516
<x:String x:Key="Text.Pull.Title" xml:space="preserve">プル (フェッチ &amp; マージ)</x:String>
519517
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">マージの代わりにリベースを使用</x:String>

src/Resources/Locales/pt_BR.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,12 +464,10 @@
464464
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Podar informações de worktree em `$GIT_COMMON_DIR/worktrees`</x:String>
465465
<x:String x:Key="Text.Pull" xml:space="preserve">Puxar</x:String>
466466
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Branch Remoto:</x:String>
467-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Buscar todos os branches</x:String>
468467
<x:String x:Key="Text.Pull.Into" xml:space="preserve">Para:</x:String>
469468
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Alterações Locais:</x:String>
470469
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
471470
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Guardar &amp; Reaplicar</x:String>
472-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Buscar sem tags</x:String>
473471
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remoto:</x:String>
474472
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Puxar (Buscar &amp; Mesclar)</x:String>
475473
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Usar rebase em vez de merge</x:String>

src/Resources/Locales/ru_RU.axaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,12 +531,10 @@
531531
<x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">Информация об обрезке рабочего каталога в «$GIT_COMMON_DIR/worktrees»</x:String>
532532
<x:String x:Key="Text.Pull" xml:space="preserve">Загрузить</x:String>
533533
<x:String x:Key="Text.Pull.Branch" xml:space="preserve">Ветка внешнего репозитория:</x:String>
534-
<x:String x:Key="Text.Pull.FetchAllBranches" xml:space="preserve">Извлечь все ветки</x:String>
535534
<x:String x:Key="Text.Pull.Into" xml:space="preserve">В:</x:String>
536535
<x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Локальные изменения:</x:String>
537536
<x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Отклонить</x:String>
538537
<x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">Отложить и применить повторно</x:String>
539-
<x:String x:Key="Text.Pull.NoTags" xml:space="preserve">Загрузить без меток</x:String>
540538
<x:String x:Key="Text.Pull.Remote" xml:space="preserve">Внешний репозиторий:</x:String>
541539
<x:String x:Key="Text.Pull.Title" xml:space="preserve">Загрузить (Получить и слить)</x:String>
542540
<x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Использовать перемещение вместо слияния</x:String>

0 commit comments

Comments
 (0)