File tree Expand file tree Collapse file tree 24 files changed +37
-173
lines changed
Expand file tree Collapse file tree 24 files changed +37
-173
lines changed Original file line number Diff line number Diff line change @@ -7,14 +7,16 @@ namespace SourceGit.Commands
77{
88 public partial class QueryUpdatableSubmodules : Command
99 {
10- [ GeneratedRegex ( @"^([U \-\+ ])([0-9a-f]+)\s(.*?)(\s\(.*\))?$" ) ]
10+ [ GeneratedRegex ( @"^([\-\+])([0-9a-f]+)\s(.*?)(\s\(.*\))?$" ) ]
1111 private static partial Regex REG_FORMAT_STATUS ( ) ;
1212
13- public QueryUpdatableSubmodules ( string repo )
13+ public QueryUpdatableSubmodules ( string repo , bool includeUninited )
1414 {
1515 WorkingDirectory = repo ;
1616 Context = repo ;
1717 Args = "submodule status" ;
18+
19+ _includeUninited = includeUninited ;
1820 }
1921
2022 public async Task < List < string > > GetResultAsync ( )
@@ -30,12 +32,16 @@ public async Task<List<string>> GetResultAsync()
3032 {
3133 var stat = match . Groups [ 1 ] . Value ;
3234 var path = match . Groups [ 3 ] . Value ;
33- if ( ! stat . StartsWith ( ' ' ) )
34- submodules . Add ( path ) ;
35+ if ( ! _includeUninited && stat . StartsWith ( '-' ) )
36+ continue ;
37+
38+ submodules . Add ( path ) ;
3539 }
3640 }
3741
3842 return submodules ;
3943 }
44+
45+ private bool _includeUninited = false ;
4046 }
4147}
Original file line number Diff line number Diff line change @@ -107,12 +107,6 @@ public bool CheckoutBranchOnCreateBranch
107107 set ;
108108 } = true ;
109109
110- public bool UpdateSubmodulesOnCheckoutBranch
111- {
112- get ;
113- set ;
114- } = true ;
115-
116110 public AvaloniaList < CommitTemplate > CommitTemplates
117111 {
118112 get ;
Original file line number Diff line number Diff line change 109109 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >Lokale Änderungen:</x : String >
110110 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >Verwerfen</x : String >
111111 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >Stashen & wieder anwenden</x : String >
112- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >Alle Submodule updaten</x : String >
113112 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >Branch:</x : String >
114113 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >Dein aktueller HEAD enthält Commit(s) ohne Verbindung zu einem Branch/Tag. Möchtest du trotzdem fortfahren?</x : String >
115114 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >Auschecken & Fast-Forward</x : String >
645644 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >Lokale Änderungen:</x : String >
646645 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >Verwerfen</x : String >
647646 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >Stashen & wieder anwenden</x : String >
648- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >Alle Submodule aktualisieren</x : String >
649647 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >Remote:</x : String >
650648 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Pull (Fetch & Merge)</x : String >
651649 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >Rebase anstatt Merge verwenden</x : String >
Original file line number Diff line number Diff line change 105105 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >Local Changes:</x : String >
106106 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >Discard</x : String >
107107 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >Stash & Reapply</x : String >
108- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >Update all submodules</x : String >
109108 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >Branch:</x : String >
110109 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >Your current HEAD contains commit(s) not connected to any branches/tags! Do you want to continue?</x : String >
111110 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >Checkout & Fast-Forward</x : String >
648647 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >Local Changes:</x : String >
649648 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >Discard</x : String >
650649 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >Stash & Reapply</x : String >
651- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >Update all submodules</x : String >
652650 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >Remote:</x : String >
653651 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Pull (Fetch & Merge)</x : String >
654652 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >Use rebase instead of merge</x : String >
Original file line number Diff line number Diff line change 109109 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >Cambios Locales:</x : String >
110110 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >Descartar</x : String >
111111 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >Stash & Reaplicar</x : String >
112- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >Actualizar todos los submódulos</x : String >
113112 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >Rama:</x : String >
114113 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >¡Tu HEAD actual contiene commit(s) que no están conectados a ningunas ramas/etiquetas! ¿Quieres continuar?</x : String >
115114 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >Checkout & Fast-Forward</x : String >
643642 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >Cambios Locales:</x : String >
644643 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >Descartar</x : String >
645644 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >Stash & Reaplicar</x : String >
646- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >Actualizar todos los submódulos</x : String >
647645 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >Remoto:</x : String >
648646 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Pull (Fetch & Merge)</x : String >
649647 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >Usar rebase en lugar de merge</x : String >
Original file line number Diff line number Diff line change 108108 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >Changements locaux :</x : String >
109109 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >Annuler</x : String >
110110 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >Mettre en stash et réappliquer</x : String >
111- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >Mettre à jour tous les sous-modules</x : String >
112111 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >Branche :</x : String >
113112 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >Votre HEAD actuel contient un ou plusieurs commits non connectés à une branche/tag ! Voulez-vous continuer ?</x : String >
114113 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >Récupérer & Fast-Forward</x : String >
637636 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >Changements locaux :</x : String >
638637 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >Rejeter</x : String >
639638 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >Stash & Réappliquer</x : String >
640- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >Mettre à jour tous les sous-modules</x : String >
641639 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >Dépôt distant :</x : String >
642640 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Pull (Fetch & Merge)</x : String >
643641 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >Utiliser rebase au lieu de merge</x : String >
Original file line number Diff line number Diff line change 104104 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >Perubahan Lokal:</x : String >
105105 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >Buang</x : String >
106106 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >Stash & Terapkan Ulang</x : String >
107- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >Perbarui semua submodule</x : String >
108107 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >Branch:</x : String >
109108 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >HEAD saat ini mengandung commit yang tidak terhubung ke branch/tag manapun! Lanjutkan?</x : String >
110109 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >Checkout & Fast-Forward</x : String >
612611 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >Perubahan Lokal:</x : String >
613612 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >Buang</x : String >
614613 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >Stash & Terapkan Ulang</x : String >
615- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >Perbarui semua submodule</x : String >
616614 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >Remote:</x : String >
617615 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Pull (Fetch & Merge)</x : String >
618616 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >Gunakan rebase alih-alih merge</x : String >
Original file line number Diff line number Diff line change 9898 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >Modifiche Locali:</x : String >
9999 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >Scarta</x : String >
100100 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >Stasha e Ripristina</x : String >
101- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >Aggiorna tutti i sottomoduli</x : String >
102101 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >Branch:</x : String >
103102 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >Il tuo HEAD attuale contiene commit non connessi ad alcun branch/tag! Sicuro di voler continuare?</x : String >
104103 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >Checkout & Avanzamento Veloce</x : String >
593592 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >Modifiche Locali:</x : String >
594593 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >Scarta</x : String >
595594 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >Stasha e Riapplica</x : String >
596- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >Aggiorna tutti i sottomoduli</x : String >
597595 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >Remoto:</x : String >
598596 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Scarica (Recupera e Unisci)</x : String >
599597 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >Riallineare anziché unire</x : String >
Original file line number Diff line number Diff line change 101101 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >로컬 변경 사항:</x : String >
102102 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >폐기</x : String >
103103 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >스태시 & 재적용</x : String >
104- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >모든 서브모듈 업데이트</x : String >
105104 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >브랜치:</x : String >
106105 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >현재 HEAD에 브랜치/태그에 연결되지 않은 커밋이 있습니다! 계속하시겠습니까?</x : String >
107106 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >체크아웃 & Fast-Forward</x : String >
613612 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >로컬 변경 사항:</x : String >
614613 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >폐기</x : String >
615614 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >스태시 & 재적용</x : String >
616- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >모든 서브모듈 업데이트</x : String >
617615 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >원격:</x : String >
618616 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Pull (Fetch & 병합)</x : String >
619617 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >병합 대신 리베이스 사용</x : String >
Original file line number Diff line number Diff line change 109109 <x : String x : Key =" Text.Checkout.LocalChanges" xml : space =" preserve" >Локальные изменения:</x : String >
110110 <x : String x : Key =" Text.Checkout.LocalChanges.Discard" xml : space =" preserve" >Отклонить</x : String >
111111 <x : String x : Key =" Text.Checkout.LocalChanges.StashAndReapply" xml : space =" preserve" >Отложить и применить повторно</x : String >
112- <x : String x : Key =" Text.Checkout.RecurseSubmodules" xml : space =" preserve" >Обновить все подкаталоги</x : String >
113112 <x : String x : Key =" Text.Checkout.Target" xml : space =" preserve" >Ветка:</x : String >
114113 <x : String x : Key =" Text.Checkout.WarnLostCommits" xml : space =" preserve" >Ваша текущая ГОЛОВА содержит ревизию(и), не связанные ни с к какими ветками или метками! Вы хотите продолжить?</x : String >
115114 <x : String x : Key =" Text.Checkout.WithFastForward" xml : space =" preserve" >Переключиться и перемотать</x : String >
652651 <x : String x : Key =" Text.Pull.LocalChanges" xml : space =" preserve" >Локальные изменения:</x : String >
653652 <x : String x : Key =" Text.Pull.LocalChanges.Discard" xml : space =" preserve" >Отклонить</x : String >
654653 <x : String x : Key =" Text.Pull.LocalChanges.StashAndReapply" xml : space =" preserve" >Отложить и применить повторно</x : String >
655- <x : String x : Key =" Text.Pull.RecurseSubmodules" xml : space =" preserve" >Обновить все подмодули</x : String >
656654 <x : String x : Key =" Text.Pull.Remote" xml : space =" preserve" >Внешний репозиторий:</x : String >
657655 <x : String x : Key =" Text.Pull.Title" xml : space =" preserve" >Загрузить (Получить и слить)</x : String >
658656 <x : String x : Key =" Text.Pull.UseRebase" xml : space =" preserve" >Использовать перемещение вместо слияния</x : String >
You can’t perform that action at this time.
0 commit comments