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

Tweak some debug output

Browse source
This commit is contained in:
Hylke Bons 2012-06-09 16:27:34 +01:00
parent f436a8b4f4
commit fe3f28d7c4
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -135,7 +135,6 @@ namespace SparkleLib.Git {
public override string CurrentRevision {
get {
// Remove stale rebase-apply files because it
// makes the method return the wrong hashes.
string rebase_apply_file = SparkleHelpers.CombineMore (LocalPath, ".git", "rebase-apply");
@ -160,6 +159,8 @@ namespace SparkleLib.Git {
public override bool HasRemoteChanges {
get {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Checking for remote changes...");
string current_revision = CurrentRevision;
SparkleGit git = new SparkleGit (LocalPath, "ls-remote \"" + RemoteUrl + "\" master");
git.Start ();
@ -169,14 +170,19 @@ namespace SparkleLib.Git {
return false;
string remote_revision = git.StandardOutput.ReadToEnd ().TrimEnd ();
remote_revision = remote_revision.Substring (0, 40);
if (!remote_revision.StartsWith (CurrentRevision)) {
if (!remote_revision.StartsWith (current_revision)) {
SparkleHelpers.DebugInfo ("Git",
"[" + Name + "] Remote changes found. (" + remote_revision + ")");
"[" + Name + "] Remote changes detected (local: " +
current_revision + ", remote: " + remote_revision + ")");
return true;
} else {
SparkleHelpers.DebugInfo ("Git",
"[" + Name + "] No remote changes detected (local+remote: " + current_revision + ")");
return false;
}
}
@ -427,12 +433,12 @@ namespace SparkleLib.Git {
git.WaitForExit ();
if (git.ExitCode != 0) {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected, trying to get out...");
while (HasLocalChanges)
ResolveConflict ();
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved");
OnConflictResolved ();
}

4
SparkleLib/SparkleRepoBase.cs
View file

@ -277,7 +277,7 @@ namespace SparkleLib {
}
SparkleHelpers.DebugInfo ("Event", "[" + Name + "] " + wct.ToString () + " '" + args.Name + "'");
SparkleHelpers.DebugInfo ("Event", "[" + Name + "] Changes found, checking if settled.");
SparkleHelpers.DebugInfo ("Event", "[" + Name + "] Activity detected, waiting for it to settle...");
this.remote_timer.Stop ();
@ -491,7 +491,7 @@ namespace SparkleLib {
this.size_buffer [1].Equals (this.size_buffer [2]) &&
this.size_buffer [2].Equals (this.size_buffer [3])) {
SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Changes have settled.");
SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Activities have settled");
this.is_buffering = false;
this.has_changed = false;

2
SparkleShare/SparkleControllerBase.cs
View file

@ -746,7 +746,7 @@ namespace SparkleShare {
process.WaitForExit ();
SparkleHelpers.DebugInfo ("Auth",
"The following keys will be used by SparkleShare: " + Environment.NewLine + keys_in_use);
"The following keys will be available to SparkleShare: " + Environment.NewLine + keys_in_use);
}