[Mercurial] More merge.

This commit is contained in:
Kirill Likhodedov
2010-05-31 18:54:43 +04:00
parent be73916330
commit 496c952bad
2 changed files with 4 additions and 2 deletions

View File

@@ -40,6 +40,7 @@ class HgIncomingStatusUpdater implements HgUpdater {
public void run() {
new Task.Backgroundable(project, "Checking Incoming Changesets", true) {
public void run(@NotNull ProgressIndicator indicator) {
if (project.isDisposed()) return;
HgIncomingCommand command = new HgIncomingCommand(project);
VcsRoot[] roots = ProjectLevelVcsManager.getInstance(project).getAllVcsRoots();
List<HgRevisionNumber> changesets = new LinkedList<HgRevisionNumber>();
@@ -50,7 +51,7 @@ class HgIncomingStatusUpdater implements HgUpdater {
}
}.queue();
}
});
}, project.getDisposed());
}
private final class IncomingChangesetFormatter implements HgChangesetStatus.ChangesetWriter {

View File

@@ -40,6 +40,7 @@ class HgOutgoingStatusUpdater implements HgUpdater {
public void run() {
new Task.Backgroundable(project, "Checking Outgoing Changesets", true) {
public void run(@NotNull ProgressIndicator indicator) {
if (project.isDisposed()) return;
HgOutgoingCommand command = new HgOutgoingCommand(project);
VcsRoot[] roots = ProjectLevelVcsManager.getInstance(project).getAllVcsRoots();
List<HgRevisionNumber> outgoing = new LinkedList<HgRevisionNumber>();
@@ -51,7 +52,7 @@ class HgOutgoingStatusUpdater implements HgUpdater {
}
}.queue();
}
});
}, project.getDisposed());
}
private final class OutgoingChangesetFormatter implements HgChangesetStatus.ChangesetWriter {