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

Use 'revision' instead of 'hash'

Browse source
This commit is contained in:
Hylke Bons 2011-05-17 11:43:02 +01:00
parent 1eac6ea67b
commit f887b28e45
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleLib/SparkleChangeSet.cs
View file

@ -24,7 +24,7 @@ namespace SparkleLib {
public string UserName; public string UserName;
public string UserEmail; public string UserEmail;
public string Hash; public string Revision;
public DateTime Timestamp; public DateTime Timestamp;
public bool IsMerge = false; public bool IsMerge = false;
public List<string> Added = new List<string> (); public List<string> Added = new List<string> ();

18
SparkleLib/SparkleRepo.cs
View file

@ -34,7 +34,7 @@ namespace SparkleLib {
SyncDownStarted, SyncDownStarted,
SyncDownFinished, SyncDownFinished,
SyncDownFailed SyncDownFailed
} } // TODO: Idle, Error, SyncingUp, SyncingDown
public class SparkleRepo { public class SparkleRepo {
@ -106,7 +106,7 @@ namespace SparkleLib {
} }
} }
public delegate void SyncStatusChangedEventHandler (SyncStatus status); public delegate void SyncStatusChangedEventHandler (SyncStatus new_status);
public event SyncStatusChangedEventHandler SyncStatusChanged; public event SyncStatusChangedEventHandler SyncStatusChanged;
@ -280,10 +280,10 @@ namespace SparkleLib {
if (git.ExitCode != 0) if (git.ExitCode != 0)
return; return;
string remote_hash = git.StandardOutput.ReadToEnd ().TrimEnd (); string remote_revision = git.StandardOutput.ReadToEnd ().TrimEnd ();
if (!remote_hash.StartsWith (this.revision)) { if (!remote_revision.StartsWith (this.revision)) {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found. (" + remote_hash + ")"); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found. (" + remote_revision + ")");
Fetch (); Fetch ();
this.watcher.EnableRaisingEvents = false; this.watcher.EnableRaisingEvents = false;
@ -431,10 +431,10 @@ namespace SparkleLib {
git.Start (); git.Start ();
git.WaitForExit (); git.WaitForExit ();
string output = git.StandardOutput.ReadToEnd (); string output = git.StandardOutput.ReadToEnd ();
string hash = output.Trim (); string revision = output.Trim ();
return hash; return revision;
} }
@ -907,7 +907,7 @@ namespace SparkleLib {
if (match.Success) { if (match.Success) {
SparkleChangeSet change_set = new SparkleChangeSet (); SparkleChangeSet change_set = new SparkleChangeSet ();
change_set.Hash = match.Groups [1].Value; change_set.Revision = match.Groups [1].Value;
change_set.UserName = match.Groups [2].Value; change_set.UserName = match.Groups [2].Value;
change_set.UserEmail = match.Groups [3].Value; change_set.UserEmail = match.Groups [3].Value;
change_set.IsMerge = is_merge_commit; change_set.IsMerge = is_merge_commit;