mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-06-22 10:55:00 +00:00
Corrected spelling and wording in related code and exception msg
This commit is contained in:
parent
ee92f02dc8
commit
56f5218086
3 changed files with 14 additions and 14 deletions
|
@ -36,7 +36,7 @@ namespace SourceGit.Models
|
||||||
public string OriginalPath { get; set; } = "";
|
public string OriginalPath { get; set; } = "";
|
||||||
public ChangeDataForAmend DataForAmend { get; set; } = null;
|
public ChangeDataForAmend DataForAmend { get; set; } = null;
|
||||||
|
|
||||||
public bool IsConflit
|
public bool IsConflict
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
|
|
|
@ -243,7 +243,7 @@ namespace SourceGit.ViewModels
|
||||||
// Just force refresh selected changes.
|
// Just force refresh selected changes.
|
||||||
Dispatcher.UIThread.Invoke(() =>
|
Dispatcher.UIThread.Invoke(() =>
|
||||||
{
|
{
|
||||||
HasUnsolvedConflicts = _cached.Find(x => x.IsConflit) != null;
|
HasUnsolvedConflicts = _cached.Find(x => x.IsConflict) != null;
|
||||||
|
|
||||||
UpdateDetail();
|
UpdateDetail();
|
||||||
UpdateInProgressState();
|
UpdateInProgressState();
|
||||||
|
@ -275,7 +275,7 @@ namespace SourceGit.ViewModels
|
||||||
if (c.WorkTree != Models.ChangeState.None)
|
if (c.WorkTree != Models.ChangeState.None)
|
||||||
{
|
{
|
||||||
unstaged.Add(c);
|
unstaged.Add(c);
|
||||||
hasConflict |= c.IsConflit;
|
hasConflict |= c.IsConflict;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -379,7 +379,7 @@ namespace SourceGit.ViewModels
|
||||||
|
|
||||||
foreach (var change in changes)
|
foreach (var change in changes)
|
||||||
{
|
{
|
||||||
if (!change.IsConflit)
|
if (!change.IsConflict)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (change.WorkTree == Models.ChangeState.Deleted)
|
if (change.WorkTree == Models.ChangeState.Deleted)
|
||||||
|
@ -419,7 +419,7 @@ namespace SourceGit.ViewModels
|
||||||
|
|
||||||
foreach (var change in changes)
|
foreach (var change in changes)
|
||||||
{
|
{
|
||||||
if (!change.IsConflit)
|
if (!change.IsConflict)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (change.Index == Models.ChangeState.Deleted)
|
if (change.Index == Models.ChangeState.Deleted)
|
||||||
|
@ -592,7 +592,7 @@ namespace SourceGit.ViewModels
|
||||||
menu.Items.Add(openWith);
|
menu.Items.Add(openWith);
|
||||||
menu.Items.Add(new MenuItem() { Header = "-" });
|
menu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
|
|
||||||
if (change.IsConflit)
|
if (change.IsConflict)
|
||||||
{
|
{
|
||||||
var useTheirs = new MenuItem();
|
var useTheirs = new MenuItem();
|
||||||
useTheirs.Icon = App.CreateMenuIcon("Icons.Incoming");
|
useTheirs.Icon = App.CreateMenuIcon("Icons.Incoming");
|
||||||
|
@ -931,20 +931,20 @@ namespace SourceGit.ViewModels
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var hasConflicts = false;
|
var hasConflicts = false;
|
||||||
var hasNoneConflicts = false;
|
var hasNonConflicts = false;
|
||||||
foreach (var change in _selectedUnstaged)
|
foreach (var change in _selectedUnstaged)
|
||||||
{
|
{
|
||||||
if (change.IsConflit)
|
if (change.IsConflict)
|
||||||
hasConflicts = true;
|
hasConflicts = true;
|
||||||
else
|
else
|
||||||
hasNoneConflicts = true;
|
hasNonConflicts = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hasConflicts)
|
if (hasConflicts)
|
||||||
{
|
{
|
||||||
if (hasNoneConflicts)
|
if (hasNonConflicts)
|
||||||
{
|
{
|
||||||
App.RaiseException(_repo.FullPath, "You have selected both non-conflict changes with conflicts!");
|
App.RaiseException(_repo.FullPath, "Selection contains both conflict and non-conflict changes!");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1651,7 +1651,7 @@ namespace SourceGit.ViewModels
|
||||||
|
|
||||||
if (change == null)
|
if (change == null)
|
||||||
DetailContext = null;
|
DetailContext = null;
|
||||||
else if (change.IsConflit && isUnstaged)
|
else if (change.IsConflict && isUnstaged)
|
||||||
DetailContext = new Conflict(_repo, this, change);
|
DetailContext = new Conflict(_repo, this, change);
|
||||||
else
|
else
|
||||||
DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext);
|
DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext);
|
||||||
|
|
|
@ -93,7 +93,7 @@ namespace SourceGit.Views
|
||||||
string indicator;
|
string indicator;
|
||||||
if (IsUnstagedChange)
|
if (IsUnstagedChange)
|
||||||
{
|
{
|
||||||
if (Change.IsConflit)
|
if (Change.IsConflict)
|
||||||
{
|
{
|
||||||
background = Brushes.OrangeRed;
|
background = Brushes.OrangeRed;
|
||||||
indicator = "!";
|
indicator = "!";
|
||||||
|
@ -139,7 +139,7 @@ namespace SourceGit.Views
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isUnstaged)
|
if (isUnstaged)
|
||||||
ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]);
|
ToolTip.SetTip(this, c.IsConflict ? "Conflict" : TIPS[(int)c.WorkTree]);
|
||||||
else
|
else
|
||||||
ToolTip.SetTip(this, TIPS[(int)c.Index]);
|
ToolTip.SetTip(this, TIPS[(int)c.Index]);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue