Mercurial > hg > mercurial
changeset 263:d6c9dd7e0fee
Merge branch Eluru-6.5.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Thu, 07 Jul 2011 12:17:38 +0400 |
parents | b855b472e985 (current diff) 46687f569747 (diff) |
children | 84119180bb1b |
files | |
diffstat | 1 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Mon Jul 04 13:42:30 2011 +0400 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu Jul 07 12:17:38 2011 +0400 @@ -308,17 +308,23 @@ cc.setRevId(toVer.getId()); File parentDir = cc.execute(notDeletedFiles); + boolean debug = Loggers.VCS.isDebugEnabled(); + try { for (ModifiedFile f: modifiedFiles) { String mappedPath = checkoutRules.map(f.getPath()); if (mappedPath == null) continue; // skip final File virtualFile = new File(mappedPath); if (f.getStatus() == ModifiedFile.Status.REMOVED) { + if (debug) + Loggers.VCS.debug(String.format("Delete file '%1$s' in the patch", mappedPath)); builder.deleteFile(virtualFile, true); } else { File realFile = new File(parentDir, f.getPath()); FileInputStream is = new FileInputStream(realFile); try { + if (debug) + Loggers.VCS.debug(String.format("Add file '%1$s' to the patch", mappedPath)); builder.changeOrCreateBinaryFile(virtualFile, null, is, realFile.length()); } finally { is.close(); @@ -372,6 +378,7 @@ private void buildPatchFromDirectory(File curDir, final PatchBuilder builder, final File repRoot, final FileFilter filter, final CheckoutRules checkoutRules) throws IOException { File[] files = curDir.listFiles(filter); + boolean debug = Loggers.VCS.isDebugEnabled(); if (files != null) { for (File realFile: files) { String relPath = realFile.getAbsolutePath().substring(repRoot.getAbsolutePath().length()); @@ -379,11 +386,15 @@ if (mappedPath != null && mappedPath.length() > 0) { final File virtualFile = new File(mappedPath); if (realFile.isDirectory()) { + if (debug) + Loggers.VCS.debug(String.format("Create directory '%1$s' in the patch", mappedPath)); builder.createDirectory(virtualFile); buildPatchFromDirectory(realFile, builder, repRoot, filter, checkoutRules); } else { final FileInputStream is = new FileInputStream(realFile); try { + if (debug) + Loggers.VCS.debug(String.format("Create file '%1$s' in the patch", mappedPath)); builder.createBinaryFile(virtualFile, null, is, realFile.length()); } finally { is.close();