Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename git-status Conflict -> Unmerged #11024

Merged
merged 1 commit into from
Jun 9, 2023
Merged

Rename git-status Conflict -> Unmerged #11024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions GitCommands/Git/GitItemStatus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private enum Flags
IsIgnored = 1 << 5,
IsRenamed = 1 << 6,
IsCopied = 1 << 7,
IsConflict = 1 << 8,
IsUnmerged = 1 << 8,
IsAssumeUnchanged = 1 << 9,
IsSkipWorktree = 1 << 10,
IsSubmodule = 1 << 11,
Expand Down Expand Up @@ -119,10 +119,10 @@ public bool IsCopied
set => SetFlag(value, Flags.IsCopied);
}

public bool IsConflict
public bool IsUnmerged
{
get => HasFlag(Flags.IsConflict);
set => SetFlag(value, Flags.IsConflict);
get => HasFlag(Flags.IsUnmerged);
set => SetFlag(value, Flags.IsUnmerged);
}

// Flags below are not set from git-status parsing, but from other sources
Expand Down Expand Up @@ -271,9 +271,9 @@ public override string ToString()
str.Append(Name);
}

if (IsConflict)
if (IsUnmerged)
{
str.Append(" (Conflict)");
str.Append(" (Unmerged)");
}

if (Staged is not (StagedStatus.None or StagedStatus.Unset))
Expand Down
2 changes: 1 addition & 1 deletion GitCommands/Git/GitItemStatusConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static GitItemStatus FromStatusCharacter(StagedStatus staged, string file
IsCopied = x is CopiedStatus,
IsTracked = !(x is UntrackedStatus or IgnoredStatus or UnmodifiedStatus_v1) || !isNew,
IsIgnored = x is IgnoredStatus,
IsConflict = x is UnmergedStatus,
IsUnmerged = x is UnmergedStatus,
Staged = staged
};
}
Expand Down
2 changes: 1 addition & 1 deletion GitCommands/Git/GitModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@ public bool ResetChanges(IEnumerable<GitItemStatus> selectedItems, bool resetAnd
}
}

if (item.IsConflict)
if (item.IsUnmerged)
{
conflictsToReset.Add(item.Name);
}
Expand Down
2 changes: 1 addition & 1 deletion GitUI/CommandsDialogs/FormAddToGitIgnore.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion GitUI/CommandsDialogs/FormBrowse.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions GitUI/CommandsDialogs/RevisionDiffControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,15 +547,15 @@ private void ResetSelectedItemsTo(bool actsAsChild, bool deleteUncommittedAddedI
}

List<string> itemsToCheckout = selectedItems
.Where(item => !item.Item.IsNew && !(item.Item.IsConflict && parentId == ObjectId.IndexId) && item.FirstRevision?.ObjectId == parentId)
.Where(item => !item.Item.IsNew && !(item.Item.IsUnmerged && parentId == ObjectId.IndexId) && item.FirstRevision?.ObjectId == parentId)
.Select(item => RenamedIndexItem(item) ? item.Item.OldName : item.Item.Name)
.ToList();
Module.CheckoutFiles(itemsToCheckout, parentId, force: false);

// Special handling for conflicted files, shown in worktree (with the raw diff).
// Must be reset to HEAD as Index is just a status marker.
List<string> conflictsToCheckout = selectedItems
.Where(item => item.Item.IsConflict && parentId == ObjectId.IndexId)
.Where(item => item.Item.IsUnmerged && parentId == ObjectId.IndexId)
.Select(item => RenamedIndexItem(item) ? item.Item.OldName : item.Item.Name)
.ToList();
Module.CheckoutFiles(conflictsToCheckout, _revisionGrid.CurrentCheckout, force: false);
Expand Down
20 changes: 10 additions & 10 deletions GitUI/Properties/Images.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions GitUI/Properties/Images.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@
<data name="ArrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icons\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Conflict" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icons\Conflict.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Unmerged" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icons\Unmerged.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Pageant" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icons\Pageant.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Expand Down
0 GitUI/Resources/Icons/Conflict.png → GitUI/Resources/Icons/Unmerged.png
View file
Open in desktop
File renamed without changes
6 changes: 3 additions & 3 deletions GitUI/UserControls/FileStatusList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ ImageList CreateImageList()
(nameof(Images.FileStatusRemovedOnlyB), ScaleHeight(Images.FileStatusRemovedOnlyB)),
(nameof(Images.FileStatusRemovedSame), ScaleHeight(Images.FileStatusRemovedSame)),
(nameof(Images.FileStatusRemovedUnequal), ScaleHeight(Images.FileStatusRemovedUnequal)),
(nameof(Images.Conflict), ScaleHeight(Images.Conflict)),
(nameof(Images.Unmerged), ScaleHeight(Images.Unmerged)),
(nameof(Images.FileStatusRenamed), ScaleHeight(Images.FileStatusRenamed.AdaptLightness())),
(nameof(Images.FileStatusRenamedOnlyA), ScaleHeight(Images.FileStatusRenamedOnlyA)),
(nameof(Images.FileStatusRenamedOnlyB), ScaleHeight(Images.FileStatusRenamedOnlyB)),
Expand Down Expand Up @@ -1157,9 +1157,9 @@ static string GetItemImageKey(GitItemStatus gitItemStatus)
};
}

if (gitItemStatus.IsConflict)
if (gitItemStatus.IsUnmerged)
{
return nameof(Images.Conflict);
return nameof(Images.Unmerged);
}

if (gitItemStatus.IsSubmodule)
Expand Down
2 changes: 1 addition & 1 deletion ...tCommands.Tests/Git/GetAllChangedFilesOutputParserTest.TestGetDefaultStatus.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...OutputParserTest.TestGetStatusChangedFilesFromString_testName=added_by_them.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": true,
"IsUnmerged": true,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...esOutputParserTest.TestGetStatusChangedFilesFromString_testName=added_by_us.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": true,
"IsUnmerged": true,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...lesOutputParserTest.TestGetStatusChangedFilesFromString_testName=both_added.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...sOutputParserTest.TestGetStatusChangedFilesFromString_testName=both_deleted.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
2 changes: 1 addition & 1 deletion ...OutputParserTest.TestGetStatusChangedFilesFromString_testName=both_modified.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": true,
"IsUnmerged": true,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...tputParserTest.TestGetStatusChangedFilesFromString_testName=deleted_by_them.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": true,
"IsUnmerged": true,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...OutputParserTest.TestGetStatusChangedFilesFromString_testName=deleted_by_us.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": true,
"IsUnmerged": true,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
6 changes: 3 additions & 3 deletions ...esOutputParserTest.TestGetStatusChangedFilesFromString_testName=fatal_error.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -66,7 +66,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...arserTest.TestGetStatusChangedFilesFromString_testName=status_ignored_files.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...rserTest.TestGetStatusChangedFilesFromString_testName=status_modified_files.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": true,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": true,
Expand Down
6 changes: 3 additions & 3 deletions ...ParserTest.TestGetStatusChangedFilesFromString_testName=status_staged_files.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand All @@ -66,7 +66,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down
4 changes: 2 additions & 2 deletions ...serTest.TestGetStatusChangedFilesFromString_testName=status_untracked_files.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"IsIgnored": false,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": true,
Expand All @@ -40,7 +40,7 @@
"IsIgnored": true,
"IsRenamed": false,
"IsCopied": false,
"IsConflict": false,
"IsUnmerged": false,
"IsAssumeUnchanged": false,
"IsSkipWorktree": false,
"IsSubmodule": false,
Expand Down