diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java index 6cf3bcadf500..b0b4c7a0ab56 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java @@ -268,7 +268,7 @@ public class HgRegularUpdater implements HgUpdater { if (parentAfterUpdate.equals(parentBeforeUpdate)) { // nothing to update => returning not to capture local uncommitted changes return; } - HgStatusCommand statusCommand = new HgStatusCommand.Builder(true).baseRevision(parentBeforeUpdate).targetRevision( + HgStatusCommand statusCommand = new HgStatusCommand.Builder(true).ignored(false).unknown(false).baseRevision(parentBeforeUpdate).targetRevision( parentAfterUpdate).build(project); Set changes = statusCommand.execute(repo); for (HgChange change : changes) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java index 910aae8d14b1..cacf3257335a 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java @@ -470,13 +470,15 @@ public abstract class HgUtil { if (rev1 != null) { revNumber1 = rev1.getRevisionNumber(); //rev2==null means "compare with local version" - statusCommand = new HgStatusCommand.Builder(true).copySource(false).baseRevision(revNumber1) + statusCommand = new HgStatusCommand.Builder(true).ignored(false).unknown(false).copySource(false).baseRevision(revNumber1) .targetRevision(rev2 != null ? rev2.getRevisionNumber() : null).build(project); } else { LOG.assertTrue(rev2 != null, "revision1 and revision2 can't both be null. Path: " + path); //rev1 and rev2 can't be null both// //get initial changes// - statusCommand = new HgStatusCommand.Builder(true).copySource(false).baseRevision(rev2.getRevisionNumber()).build(project); + statusCommand = + new HgStatusCommand.Builder(true).ignored(false).unknown(false).copySource(false).baseRevision(rev2.getRevisionNumber()) + .build(project); } Collection hgChanges = statusCommand.execute(root, Collections.singleton(path)); @@ -484,11 +486,11 @@ public abstract class HgUtil { //convert output changes to standart Change class for (HgChange hgChange : hgChanges) { FileStatus status = convertHgDiffStatus(hgChange.getStatus()); - if (status != FileStatus.UNKNOWN && status!= FileStatus.IGNORED) { + if (status != FileStatus.UNKNOWN) { changes.add(createChange(project, root, hgChange.beforeFile().getRelativePath(), revNumber1, hgChange.afterFile().getRelativePath(), rev2 != null ? rev2.getRevisionNumber() : null, status)); - } + } } return changes; }