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

[repo] also push changes the user makes whilst we're syncing

Browse source
This commit is contained in:
Hylke Bons 2011-03-02 21:20:25 +00:00
parent b84bab78d5
commit 1f52f24910
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
SparkleLib/SparkleRepo.cs
View file

@ -384,8 +384,10 @@ namespace SparkleLib {
FetchRequests--;
}
Watcher.EnableRaisingEvents = false;
Rebase ();
Watcher.EnableRaisingEvents = true;
}
@ -446,7 +448,10 @@ namespace SparkleLib {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found.");
Fetch ();
Watcher.EnableRaisingEvents = false;
Rebase ();
Watcher.EnableRaisingEvents = true;
}
@ -479,9 +484,15 @@ namespace SparkleLib {
SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Changes have settled.");
_IsBuffering = false;
HasChanged = false;
AddCommitAndPush ();
HasChanged = false;
while (Status.AnyDifferences) {
Watcher.EnableRaisingEvents = false;
AddCommitAndPush ();
Watcher.EnableRaisingEvents = true;
}
}
@ -698,8 +709,6 @@ namespace SparkleLib {
// Merges the fetched changes
public void Rebase ()
{
Watcher.EnableRaisingEvents = false;
if (Status.AnyDifferences) {
@ -767,8 +776,6 @@ namespace SparkleLib {
NewCommit (GetCommits (2) [0], LocalPath); // FIXME: GetCommits doesn't like 1
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes rebased.");
Watcher.EnableRaisingEvents = true;
}