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

repo: rename CurrentHash to Revision

Browse source
This commit is contained in:
Hylke Bons 2011-05-17 01:29:51 +01:00
parent 427a0aa1bf
commit 7e301ea1d1
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
SparkleLib/SparkleRepo.cs
View file

@ -46,7 +46,7 @@ namespace SparkleLib {
private List <double> sizebuffer; private List <double> sizebuffer;
private bool has_changed; private bool has_changed;
private string current_hash; private string revision;
private bool is_syncing; private bool is_syncing;
private bool is_buffering; private bool is_buffering;
private bool is_polling; private bool is_polling;
@ -65,9 +65,9 @@ namespace SparkleLib {
public readonly string UserName; public readonly string UserName;
public readonly string UserEmail; public readonly string UserEmail;
public string CurrentHash { public string Revision {
get { get {
return this.current_hash; return this.revision;
} }
} }
@ -147,9 +147,9 @@ namespace SparkleLib {
this.change_lock = new Object (); this.change_lock = new Object ();
if (IsEmpty) if (IsEmpty)
this.current_hash = null; this.revision = null;
else else
this.current_hash = GetCurrentHash (); this.revision = GetRevision ();
string unsynced_file_path = SparkleHelpers.CombineMore (LocalPath, string unsynced_file_path = SparkleHelpers.CombineMore (LocalPath,
".git", "has_unsynced_changes"); ".git", "has_unsynced_changes");
@ -159,7 +159,7 @@ namespace SparkleLib {
else else
this.has_unsynced_changes = false; this.has_unsynced_changes = false;
if (this.current_hash == null) if (this.revision == null)
CreateInitialCommit (); CreateInitialCommit ();
// Watch the repository's folder // Watch the repository's folder
@ -219,7 +219,7 @@ namespace SparkleLib {
// Fetch changes when there is a message in the irc channel // Fetch changes when there is a message in the irc channel
this.listener.RemoteChange += delegate (string change_id) { this.listener.RemoteChange += delegate (string change_id) {
if (!change_id.Equals (this.current_hash) && change_id.Length == 40) { if (!change_id.Equals (this.revision) && change_id.Length == 40) {
if (!this.is_fetching && !this.is_buffering) { if (!this.is_fetching && !this.is_buffering) {
while (this.listener.ChangesQueue > 0) { while (this.listener.ChangesQueue > 0) {
Fetch (); Fetch ();
@ -255,8 +255,8 @@ namespace SparkleLib {
// since SparkleShare was stopped // since SparkleShare was stopped
AddCommitAndPush (); AddCommitAndPush ();
if (this.current_hash == null) if (this.revision == null)
this.current_hash = GetCurrentHash (); this.revision = GetRevision ();
} }
@ -287,7 +287,7 @@ namespace SparkleLib {
string remote_hash = git.StandardOutput.ReadToEnd ().TrimEnd (); string remote_hash = git.StandardOutput.ReadToEnd ().TrimEnd ();
if (!remote_hash.StartsWith (this.current_hash)) { if (!remote_hash.StartsWith (this.revision)) {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found. (" + remote_hash + ")"); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found. (" + remote_hash + ")");
Fetch (); Fetch ();
@ -424,7 +424,7 @@ namespace SparkleLib {
} }
private string GetCurrentHash () private string GetRevision ()
{ {
// Remove stale rebase-apply files because it // Remove stale rebase-apply files because it
// makes the method return the wrong hashes. // makes the method return the wrong hashes.
@ -479,8 +479,8 @@ namespace SparkleLib {
git.Start (); git.Start ();
git.WaitForExit (); git.WaitForExit ();
this.current_hash = GetCurrentHash (); this.revision = GetRevision ();
SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message + " (" + this.current_hash + ")"); SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message + " (" + this.revision + ")");
// Collect garbage pseudo-randomly // Collect garbage pseudo-randomly
if (DateTime.Now.Second % 10 == 0) if (DateTime.Now.Second % 10 == 0)
@ -507,7 +507,7 @@ namespace SparkleLib {
this.is_syncing = false; this.is_syncing = false;
this.is_fetching = false; this.is_fetching = false;
this.current_hash = GetCurrentHash (); this.revision = GetRevision ();
if (git.ExitCode != 0) { if (git.ExitCode != 0) {
this.server_online = false; this.server_online = false;
@ -559,13 +559,13 @@ namespace SparkleLib {
Push (); Push ();
} }
this.current_hash = GetCurrentHash (); this.revision = GetRevision ();
}; };
git.Start (); git.Start ();
git.WaitForExit (); git.WaitForExit ();
this.current_hash = GetCurrentHash (); this.revision = GetRevision ();
if (NewChangeSet != null) if (NewChangeSet != null)
NewChangeSet (GetChangeSets (1) [0], LocalPath); NewChangeSet (GetChangeSets (1) [0], LocalPath);
@ -714,7 +714,7 @@ namespace SparkleLib {
if (SyncStatusChanged != null) if (SyncStatusChanged != null)
SyncStatusChanged (SyncStatus.SyncDownFinished); SyncStatusChanged (SyncStatus.SyncDownFinished);
this.listener.Announce (this.current_hash); this.listener.Announce (this.revision);
} }
}; };