Add toString to GitMerge/RebaseUpdater for nicer logging.

This commit is contained in:
Kirill Likhodedov
2012-05-12 17:25:12 +04:00
parent 4fc387547e
commit dfae39c99a
2 changed files with 10 additions and 0 deletions
@@ -245,6 +245,11 @@ public class GitMergeUpdater extends GitUpdater {
return changes;
}
@Override
public String toString() {
return "Merge updater";
}
private enum MergeError {
CONFLICT,
LOCAL_CHANGES,
@@ -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;