Mercurial > hg4j
diff src/org/tmatesoft/hg/core/HgOutgoingCommand.java @ 322:d68dcb3b5f49
Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Fri, 30 Sep 2011 08:00:04 +0200 |
parents | 981f9f50bb6c |
children | 5f9073eabf06 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgOutgoingCommand.java Fri Sep 30 07:59:22 2011 +0200 +++ b/src/org/tmatesoft/hg/core/HgOutgoingCommand.java Fri Sep 30 08:00:04 2011 +0200 @@ -98,7 +98,7 @@ final ProgressSupport ps = getProgressSupport(null); try { ps.start(10); - return getComparator(new ProgressSupport.Sub(ps, 5), getCancelSupport(null)).getLocalOnlyRevisions(); + return getComparator(new ProgressSupport.Sub(ps, 5), getCancelSupport(null, true)).getLocalOnlyRevisions(); } finally { ps.done(); } @@ -114,7 +114,7 @@ throw new IllegalArgumentException("Delegate can't be null"); } final ProgressSupport ps = getProgressSupport(handler); - final CancelSupport cs = getCancelSupport(handler); + final CancelSupport cs = getCancelSupport(handler, true); try { ps.start(-1); ChangesetTransformer inspector = new ChangesetTransformer(localRepo, handler, getParentHelper(), ps, cs);