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

remove some leftover debug messages

Browse source
This commit is contained in:
Hylke Bons 2011-03-02 00:24:18 +00:00
parent a1ba6f1b36
commit ab37a53f18
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SparkleLib/SparkleListener.cs
View file

@ -33,6 +33,7 @@ namespace SparkleLib {
public IrcClient Client;
private Thread Thread;
public readonly string Server;
public readonly string FallbackServer;
public readonly string Channel;
public readonly string Nick;

7
SparkleLib/SparkleRepo.cs
View file

@ -698,6 +698,8 @@ namespace SparkleLib {
// Merges the fetched changes
public void Rebase ()
{
Watcher.EnableRaisingEvents = false;
if (Status.AnyDifferences) {
@ -707,15 +709,12 @@ namespace SparkleLib {
Commit (commit_message);
}
Watcher.EnableRaisingEvents = false;
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes...");
SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD");
git.Exited += delegate {
Console.WriteLine ("EXITED");
if (Status.MergeConflict.Count > 0) {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected...");
@ -966,7 +965,7 @@ namespace SparkleLib {
foreach (string log_entry in entries) {
Regex regex = new Regex (@"commit ([a-z0-9]+)\n" +
Regex regex = new Regex (@"commit ([a-z0-9]{40})\n" +
"Author: (.+) <(.+)>\n" +
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
"([0-9]{2}):([0-9]{2}):([0-9]{2}) \\+([0-9]{4})\n" +