remove some leftover debug messages
This commit is contained in:
parent
9375f2706c
commit
a8b0fc1a3e
|
@ -33,6 +33,7 @@ namespace SparkleLib {
|
||||||
public IrcClient Client;
|
public IrcClient Client;
|
||||||
private Thread Thread;
|
private Thread Thread;
|
||||||
public readonly string Server;
|
public readonly string Server;
|
||||||
|
public readonly string FallbackServer;
|
||||||
public readonly string Channel;
|
public readonly string Channel;
|
||||||
public readonly string Nick;
|
public readonly string Nick;
|
||||||
|
|
||||||
|
|
|
@ -699,6 +699,8 @@ namespace SparkleLib {
|
||||||
public void Rebase ()
|
public void Rebase ()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Watcher.EnableRaisingEvents = false;
|
||||||
|
|
||||||
if (Status.AnyDifferences) {
|
if (Status.AnyDifferences) {
|
||||||
|
|
||||||
Add ();
|
Add ();
|
||||||
|
@ -708,14 +710,11 @@ namespace SparkleLib {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Watcher.EnableRaisingEvents = false;
|
|
||||||
|
|
||||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes...");
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes...");
|
||||||
SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD");
|
SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD");
|
||||||
|
|
||||||
git.Exited += delegate {
|
git.Exited += delegate {
|
||||||
|
|
||||||
Console.WriteLine ("EXITED");
|
|
||||||
if (Status.MergeConflict.Count > 0) {
|
if (Status.MergeConflict.Count > 0) {
|
||||||
|
|
||||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected...");
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected...");
|
||||||
|
@ -966,7 +965,7 @@ namespace SparkleLib {
|
||||||
|
|
||||||
foreach (string log_entry in entries) {
|
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" +
|
"Author: (.+) <(.+)>\n" +
|
||||||
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
|
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
|
||||||
"([0-9]{2}):([0-9]{2}):([0-9]{2}) \\+([0-9]{4})\n" +
|
"([0-9]{2}):([0-9]{2}):([0-9]{2}) \\+([0-9]{4})\n" +
|
||||||
|
|
Loading…
Reference in a new issue