beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo git: Move conflicted files to right subfolder. Fixes #1736

Browse source
This commit is contained in:
Hylke Bons 2017-12-16 14:52:38 +01:00
parent c36ab4454b
commit f737a5bcc3
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Sparkles/Git/GitRepository.cs
View file

@ -497,10 +497,8 @@ namespace Sparkles.Git {
// Remove possible rename indicators
string [] separators = {" -> \"", " -> "};
foreach (string separator in separators) {
if (conflicting_path.Contains (separator)) {
conflicting_path = conflicting_path.Substring (
conflicting_path.IndexOf (separator) + separator.Length);
}
if (conflicting_path.Contains (separator))
conflicting_path = conflicting_path.Substring (conflicting_path.IndexOf (separator) + separator.Length);
}
Logger.LogInfo ("Git", Name + " | Conflict type: " + line);
@ -517,7 +515,7 @@ namespace Sparkles.Git {
if (File.Exists (abs_conflicting_path))
File.SetAttributes (abs_conflicting_path, FileAttributes.Hidden);
continue;
}
@ -535,11 +533,12 @@ namespace Sparkles.Git {
// Windows doesn't allow colons in the file name, so
// we use "h" between the hours and minutes instead.
string timestamp = DateTime.Now.ToString ("MMM d H\\hmm");
string our_path = Path.GetFileNameWithoutExtension (conflicting_path) +
" (" + base.local_config.User.Name + ", " + timestamp + ")" + Path.GetExtension (conflicting_path);
string abs_conflicting_path = Path.Combine (LocalPath, conflicting_path);
string abs_our_path = Path.Combine (LocalPath, our_path);
string abs_our_path = Path.Combine (Path.GetDirectoryName (abs_conflicting_path), our_path);
if (File.Exists (abs_conflicting_path) && !File.Exists (abs_our_path))
File.Move (abs_conflicting_path, abs_our_path);