Skip to content

Handle case sensitive directory renames. #52

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

Open
penenin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle case sensitive directory renames. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78d508b
Handle case sensitive directory renames.
penenin Jun 28, 2019
af8d6a5
Handle case sensitive directory renames.
penenin Jun 28, 2019
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
47 changes: 17 additions & 30 deletions Vss2Git/GitExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
Expand Down Expand Up @@ -381,15 +382,15 @@ private bool ReplayRevision(VssPathMapper pathMapper, Revision revision,
{
// renaming a file or a project that contains files?
var projectInfo = itemInfo as VssProjectInfo;
if (projectInfo == null || projectInfo.ContainsFiles())
if (projectInfo == null || (projectInfo.ContainsFiles() && projectInfo.Items.All(x => !x.Destroyed)))
{
CaseSensitiveRename(sourcePath, targetPath, git.Move);
needCommit = true;
}
else
{
// git doesn't care about directories with no files
CaseSensitiveRename(sourcePath, targetPath, Directory.Move);
CaseSensitiveRename(sourcePath, targetPath, CaseSensitiveDirectoryMove);
}
}
else
Expand All @@ -415,15 +416,16 @@ private bool ReplayRevision(VssPathMapper pathMapper, Revision revision,
{
if (sourcePath != null && Directory.Exists(sourcePath))
{
var isSamePath = sourcePath.Equals(targetPath, StringComparison.OrdinalIgnoreCase);
if (projectInfo.ContainsFiles())
{
git.Move(sourcePath, targetPath);
git.Move(sourcePath, targetPath, isSamePath);
needCommit = true;
}
else
{
// git doesn't care about directories with no files
Directory.Move(sourcePath, targetPath);
CaseSensitiveDirectoryMove(sourcePath, targetPath, isSamePath);
}
}
else
Expand Down Expand Up @@ -733,39 +735,24 @@ private void WriteStream(Stream inputStream, string path)
}
}

private delegate void RenameDelegate(string sourcePath, string destPath);
private delegate void RenameDelegate(string sourcePath, string destPath, bool force);

private void CaseSensitiveRename(string sourcePath, string destPath, RenameDelegate renamer)
{
if (sourcePath.Equals(destPath, StringComparison.OrdinalIgnoreCase))
{
// workaround for case-only renames on case-insensitive file systems:

var sourceDir = Path.GetDirectoryName(sourcePath);
var sourceFile = Path.GetFileName(sourcePath);
var destDir = Path.GetDirectoryName(destPath);
var destFile = Path.GetFileName(destPath);

if (sourceDir != destDir)
{
// recursively rename containing directories that differ in case
CaseSensitiveRename(sourceDir, destDir, renamer);

// fix up source path based on renamed directory
sourcePath = Path.Combine(destDir, sourceFile);
}
renamer(sourcePath, destPath, sourcePath.Equals(destPath, StringComparison.OrdinalIgnoreCase));
}

if (sourceFile != destFile)
{
// use temporary filename to rename files that differ in case
var tempPath = sourcePath + ".mvtmp";
CaseSensitiveRename(sourcePath, tempPath, renamer);
CaseSensitiveRename(tempPath, destPath, renamer);
}
private void CaseSensitiveDirectoryMove(string sourcePath, string targetPath, bool force)
{
if (force)
{
var tmpPath = targetPath + ".mvtmp";
Directory.Move(sourcePath, tmpPath);
Directory.Move(tmpPath, targetPath);
}
else
{
renamer(sourcePath, destPath);
Directory.Move(sourcePath, targetPath);
}
}
}
Expand Down
13 changes: 11 additions & 2 deletions Vss2Git/GitWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,18 @@ public void Remove(string path, bool recursive)
GitExec("rm " + (recursive ? "-r " : "") + "-- " + Quote(path));
}

public void Move(string sourcePath, string destPath)
public void Move(string sourcePath, string destPath, bool force)
{
GitExec("mv -- " + Quote(sourcePath) + " " + Quote(destPath));
if (force)
{
var tempPath = destPath + ".mvtmp";
GitExec("mv -- " + Quote(sourcePath) + " " + Quote(tempPath));
GitExec("mv -- " + Quote(tempPath) + " " + Quote(destPath));
}
else
{
GitExec("mv -- " + Quote(sourcePath) + " " + Quote(destPath));
}
}

class TempFile : IDisposable
Expand Down