Mercurial > hg > mercurial

changeset 813:1dadfa948844

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor
author eugene.petrenko@jetbrains.com
date Fri, 30 May 2014 10:48:43 +0200
parents 6adcd8b4df43
children 44bf3a609d67
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Fri May 30 10:47:13 2014 +0200
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Fri May 30 10:48:43 2014 +0200
@@ -301,12 +301,12 @@
 
     //delete removed files
     for (FileStatus f: modifiedFiles) {
-      if (f.getStatus() == Status.REMOVED) {
-        String mappedPath = checkoutRules.map(f.getPath());
-        if (mappedPath == null)
-          continue; // skip
-        builder.deleteFile(new File(mappedPath), true);
-      }
+      if (f.getStatus() != Status.REMOVED) continue; //other files processed below
+
+      final String mappedPath = checkoutRules.map(f.getPath());
+      if (mappedPath == null) continue; // skip
+
+      builder.deleteFile(new File(mappedPath), true);
     }
   }
 
@@ -446,10 +446,10 @@
     }
   }
 
-  private void buildPatchFromArchive(@NotNull PatchBuilder builder,
-                                     @NotNull File archive,
-                                     @NotNull CheckoutRules checkoutRules,
-                                     @NotNull FileFilter filter) throws IOException {
+  private void buildPatchFromArchive(@NotNull final PatchBuilder builder,
+                                     @NotNull final File archive,
+                                     @NotNull final CheckoutRules checkoutRules,
+                                     @NotNull final FileFilter filter) throws IOException {
     FileInputStream fis = new FileInputStream(archive);
     ArchiveInputStream is = null;
     try {