Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Fix to properly assess if file is locked/unlocked in context menu #47

Merged
shana merged 2 commits into from
Jun 28, 2017
Merged

Fix to properly assess if file is locked/unlocked in context menu #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36bf23d
Converting path to NPath to perform path equality
StanleyGoldman Jun 28, 2017
1076e8a
Merge branch 'master' into fixes/unlock-context-menu
StanleyGoldman Jun 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ private static bool ContextMenu_CanLock()

var alreadyLocked = locks.Any(x =>
{
return repositoryPath == x.Path;
return repositoryPath == x.Path.ToNPath();

});
GitFileStatus status = GitFileStatus.None;
if (entries != null)
{
status = entries.FirstOrDefault(x => repositoryPath == x.Path).Status;
status = entries.FirstOrDefault(x => repositoryPath == x.Path.ToNPath()).Status;
}
return !alreadyLocked && status != GitFileStatus.Untracked && status != GitFileStatus.Ignored;
}
Expand Down Expand Up @@ -100,7 +100,7 @@ private static bool ContextMenu_CanUnlock()
NPath assetPath = AssetDatabase.GetAssetPath(selected.GetInstanceID()).ToNPath();
NPath repositoryPath = EntryPoint.Environment.GetRepositoryPath(assetPath);

var isLocked = locks.Any(x => repositoryPath == x.Path);
var isLocked = locks.Any(x => repositoryPath == x.Path.ToNPath());
return isLocked;
}

Expand Down