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

repo: do a full SyncUpBase after a git rebase

Browse source
This commit is contained in:
Hylke Bons 2011-05-22 17:51:48 +01:00
parent 37cd521d44
commit b18db88b61
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -252,7 +252,7 @@ namespace SparkleLib {
EnableWatching (); EnableWatching ();
OnConflictResolved (); OnConflictResolved ();
SyncUp (); RequestStatus (SyncStatus.SyncUp);
} }
EnableWatching (); EnableWatching ();

11
SparkleLib/SparkleRepoBase.cs
View file

@ -347,6 +347,13 @@ namespace SparkleLib {
} }
protected void RequestStatus (SyncStatus requested_status)
{
if (requested_status == SyncStatus.SyncUp)
SyncUpBase ();
}
private void SyncUpBase () private void SyncUpBase ()
{ {
try { try {
@ -355,7 +362,6 @@ namespace SparkleLib {
SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Initiated"); SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Initiated");
//if (AnyDifferences) {
if (SyncStatusChanged != null) if (SyncStatusChanged != null)
SyncStatusChanged (SyncStatus.SyncUp); SyncStatusChanged (SyncStatus.SyncUp);
@ -368,6 +374,7 @@ namespace SparkleLib {
SyncStatusChanged (SyncStatus.Idle); SyncStatusChanged (SyncStatus.Idle);
this.listener.AnnounceBase (new SparkleAnnouncement (Identifier, CurrentRevision)); this.listener.AnnounceBase (new SparkleAnnouncement (Identifier, CurrentRevision));
} else { } else {
SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Error"); SparkleHelpers.DebugInfo ("SyncUp", "[" + Name + "] Error");
@ -378,7 +385,7 @@ namespace SparkleLib {
SyncDownBase (); SyncDownBase ();
} }
//}
} finally { } finally {
this.remote_timer.Start (); this.remote_timer.Start ();
this.local_timer.Start (); this.local_timer.Start ();