From b97c64a0c1c2684cb50d472e9699834f0094c7ae Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Thu, 27 Nov 2014 16:52:47 +0300 Subject: [PATCH] IDEA-133260 Mercurial: Strange behavior when renaming file and adding file with the same name * ability to add just removed or renamed files added --- plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java | 2 +- .../src/org/zmlx/hg4idea/command/HgStatusCommand.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java index a3fa9e4e9e9a..01f2b6492682 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java @@ -101,7 +101,7 @@ public class HgVFSListener extends VcsVFSListener { pi.setText(repo.getPresentableUrl()); try { untrackedFiles - .addAll(new HgStatusCommand.Builder(false).unknown(true).build(myProject) + .addAll(new HgStatusCommand.Builder(false).unknown(true).removed(true).build(myProject) .getHgUntrackedFiles(repo, new ArrayList(files))); } catch (final VcsException ex) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java index eaf70cd86090..b8aa886559a8 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java @@ -78,6 +78,11 @@ public class HgStatusCommand { targetRevision = null; } + public Builder removed(boolean val) { + includeRemoved = val; + return this; + } + public Builder unknown(boolean val) { includeUnknown = val; return this;