From dfae39c99a264baad66876cce21196aac6d29dde Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sat, 12 May 2012 17:25:12 +0400
Subject: [PATCH] Add toString to GitMerge/RebaseUpdater for nicer logging.

---
 plugins/git4idea/src/git4idea/update/GitMergeUpdater.java  | 5 +++++
 plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
index 905f520fadb0..1360c937e990 100644
--- a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
+++ b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
@@ -245,6 +245,11 @@ public class GitMergeUpdater extends GitUpdater {
     return changes;
   }
 
+  @Override
+  public String toString() {
+    return "Merge updater";
+  }
+
   private enum MergeError {
     CONFLICT,
     LOCAL_CHANGES,
diff --git a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java
index 32f0418fa0f2..74b7df43e02b 100644
--- a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java
+++ b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java
@@ -154,6 +154,11 @@ public class GitRebaseUpdater extends GitUpdater {
     return !cancelled.get();
   }
 
+  @Override
+  public String toString() {
+    return "Rebase updater";
+  }
+
   private static class MyConflictResolver extends GitConflictResolver {
     private final GitRebaser myRebaser;
     private final VirtualFile myRoot;