IDEA-133260 Mercurial: Strange behavior when renaming file and adding file with the same name

* ability to add just removed or renamed files added
This commit is contained in:
Nadya Zabrodina
2014-11-27 17:01:12 +03:00
parent c689a0c511
commit b97c64a0c1
2 changed files with 6 additions and 1 deletions
@@ -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<VirtualFile>(files)));
}
catch (final VcsException ex) {
@@ -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;