Mercurial > hg4j

comparison src/org/tmatesoft/hg/core/HgIncomingCommand.java @ 322:d68dcb3b5f49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 189dc6dc1c3e
comparison
equal deleted inserted replaced
321:ac38e75c9e8e 322:d68dcb3b5f49
131 } 131 }
132 final List<Nodeid> common = getCommon(); 132 final List<Nodeid> common = getCommon();
133 HgBundle changegroup = remoteRepo.getChanges(common); 133 HgBundle changegroup = remoteRepo.getChanges(common);
134 final ProgressSupport ps = getProgressSupport(handler); 134 final ProgressSupport ps = getProgressSupport(handler);
135 try { 135 try {
136 final ChangesetTransformer transformer = new ChangesetTransformer(localRepo, handler, getParentHelper(), ps, getCancelSupport(handler)); 136 final ChangesetTransformer transformer = new ChangesetTransformer(localRepo, handler, getParentHelper(), ps, getCancelSupport(handler, true));
137 transformer.limitBranches(branches); 137 transformer.limitBranches(branches);
138 changegroup.changes(localRepo, new HgChangelog.Inspector() { 138 changegroup.changes(localRepo, new HgChangelog.Inspector() {
139 private int localIndex; 139 private int localIndex;
140 private final HgChangelog.ParentWalker parentHelper; 140 private final HgChangelog.ParentWalker parentHelper;
141 141