Skip to content

Commit ef40e4b

Browse files
love-lingerlove-linger
committed
enhance: show source branch/tag/commit in banner while merging request in progress
1 parent e1df5c5 commit ef40e4b

File tree

7 files changed

+66
-7
lines changed

7 files changed

+66
-7
lines changed

‎src/Commands/Branch.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
{
33
public static class Branch
44
{
5+
public static string ShowCurrent(string repo)
6+
{
7+
var cmd = new Command();
8+
cmd.WorkingDirectory = repo;
9+
cmd.Context = repo;
10+
cmd.Args = $"branch --show-current";
11+
return cmd.ReadToEnd().StdOut.Trim();
12+
}
13+
514
public static bool Create(string repo, string name, string basedOn)
615
{
716
var cmd = new Command();

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@
394394
<x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick in progress.</x:String>
395395
<x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Processing commit</x:String>
396396
<x:String x:Key="Text.InProgress.Merge" xml:space="preserve">Merge request in progress.</x:String>
397+
<x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">Operating</x:String>
397398
<x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">Rebase in progress.</x:String>
398399
<x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">Stopped at</x:String>
399400
<x:String x:Key="Text.InProgress.Revert" xml:space="preserve">Revert in progress.</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@
397397
<x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">挑选（Cherry-Pick）操作进行中。</x:String>
398398
<x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">正在处理提交</x:String>
399399
<x:String x:Key="Text.InProgress.Merge" xml:space="preserve">合并操作进行中。</x:String>
400+
<x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">正在处理</x:String>
400401
<x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">变基（Rebase）操作进行中。</x:String>
401402
<x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">当前停止于</x:String>
402403
<x:String x:Key="Text.InProgress.Revert" xml:space="preserve">回滚提交操作进行中。</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@
397397
<x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">揀選 (cherry-pick) 操作進行中。</x:String>
398398
<x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">正在處理提交</x:String>
399399
<x:String x:Key="Text.InProgress.Merge" xml:space="preserve">合併操作進行中。</x:String>
400+
<x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">正在處理</x:String>
400401
<x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">重定基底 (rebase) 操作進行中。</x:String>
401402
<x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">当前停止于</x:String>
402403
<x:String x:Key="Text.InProgress.Revert" xml:space="preserve">復原提交操作進行中。</x:String>

‎src/ViewModels/InProgressContexts.cs‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,52 @@ public override bool Continue()
129129

130130
public class RevertInProgress : InProgressContext
131131
{
132-
public RevertInProgress(string repo) : base(repo, "revert", false) { }
132+
public RevertInProgress(Repository repo) : base(repo.FullPath, "revert", false) { }
133133
}
134134

135135
public class MergeInProgress : InProgressContext
136136
{
137-
public MergeInProgress(string repo) : base(repo, "merge", false) { }
137+
public string Current
138+
{
139+
get;
140+
private set;
141+
}
142+
143+
public string SourceName
144+
{
145+
get;
146+
private set;
147+
}
148+
149+
public Models.Commit Source
150+
{
151+
get;
152+
private set;
153+
}
154+
155+
public MergeInProgress(Repository repo) : base(repo.FullPath, "merge", false)
156+
{
157+
Current = Commands.Branch.ShowCurrent(repo.FullPath);
158+
159+
var sourceSHA = File.ReadAllText(Path.Combine(repo.GitDir, "MERGE_HEAD")).Trim();
160+
Source = new Commands.QuerySingleCommit(repo.FullPath, sourceSHA).Result();
161+
if (Source == null)
162+
return;
163+
164+
var branchDecorator = Source.Decorators.Find(x => x.Type == Models.DecoratorType.LocalBranchHead || x.Type == Models.DecoratorType.RemoteBranchHead);
165+
if (branchDecorator != null)
166+
{
167+
SourceName = branchDecorator.Name;
168+
return;
169+
}
170+
171+
var tagDecorator = Source.Decorators.Find(x => x.Type == Models.DecoratorType.Tag);
172+
if (tagDecorator != null)
173+
{
174+
SourceName = tagDecorator.Name;
175+
}
176+
177+
SourceName = Source.SHA.Substring(0, 10);
178+
}
138179
}
139180
}

‎src/ViewModels/WorkingCopy.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ public void SetData(List<Models.Change> changes)
241241
else if (File.Exists(Path.Combine(_repo.GitDir, "REBASE_HEAD")) && Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")))
242242
inProgress = new RebaseInProgress(_repo);
243243
else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
244-
inProgress = new RevertInProgress(_repo.FullPath);
244+
inProgress = new RevertInProgress(_repo);
245245
else if (File.Exists(Path.Combine(_repo.GitDir, "MERGE_HEAD")))
246-
inProgress = new MergeInProgress(_repo.FullPath);
246+
inProgress = new MergeInProgress(_repo);
247247

248248
HasUnsolvedConflicts = _cached.Find(x => x.IsConflit) != null;
249249
InProgressContext = inProgress;
@@ -314,9 +314,9 @@ public void SetData(List<Models.Change> changes)
314314
else if (File.Exists(Path.Combine(_repo.GitDir, "REBASE_HEAD")) && Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")))
315315
inProgress = new RebaseInProgress(_repo);
316316
else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
317-
inProgress = new RevertInProgress(_repo.FullPath);
317+
inProgress = new RevertInProgress(_repo);
318318
else if (File.Exists(Path.Combine(_repo.GitDir, "MERGE_HEAD")))
319-
inProgress = new MergeInProgress(_repo.FullPath);
319+
inProgress = new MergeInProgress(_repo);
320320

321321
InProgressContext = inProgress;
322322

‎src/Views/Repository.axaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,13 @@
583583
</DataTemplate>
584584

585585
<DataTemplate DataType="vm:MergeInProgress">
586-
<TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Merge}"/>
586+
<StackPanel Orientation="Horizontal">
587+
<TextBlock FontWeight="Bold" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Merge}"/>
588+
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="{DynamicResource Text.InProgress.Merge.Operating}"/>
589+
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.Accent}" Text="{Binding SourceName}" ToolTip.Tip="{Binding Source}"/>
590+
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.ConflictForeground}" Text="→"/>
591+
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Foreground="{DynamicResource Brush.Accent}" Text="{Binding Current}"/>
592+
</StackPanel>
587593
</DataTemplate>
588594
</ContentControl.DataTemplates>
589595
</ContentControl>

0 commit comments

Comments
 (0)