Mercurial > hg > mercurial

changeset 373:1350f99b43bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wording
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 09 Feb 2012 13:29:09 +0400
parents 2869f49b9211
children 5525f6f23f2e
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialResetCacheHandler.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialResetCacheHandlerTest.java
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialResetCacheHandler.java	Thu Feb 09 12:58:53 2012 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialResetCacheHandler.java	Thu Feb 09 13:29:09 2012 +0400
@@ -65,7 +65,7 @@
         unlockMirror(url, mirror);
       }
     }
-    LOG.info("Mercurial caches reseted");
+    LOG.info("Mercurial caches reset");
   }
 
   private void lockMirror(@NotNull final String url, @NotNull final File mirror) {
@@ -78,7 +78,7 @@
     LOG.debug("Reset mercurial mirror "  + mirror.getAbsolutePath());
     myMirrorManager.forgetDir(mirror);
     delete(mirror);
-    LOG.debug("Mercurial mirror "  + mirror.getAbsolutePath() + " reseted");
+    LOG.debug("Mercurial mirror "  + mirror.getAbsolutePath() + " reset");
   }
 
   private void unlockMirror(@NotNull final String url, @NotNull final File mirror) {
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialResetCacheHandlerTest.java	Thu Feb 09 12:58:53 2012 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialResetCacheHandlerTest.java	Thu Feb 09 13:29:09 2012 +0400
@@ -93,11 +93,11 @@
       one(myMirrorManager).lockDir(mirror1); when(stateOfMirror1.is("initial")); then(stateOfMirror1.is("locked"));
       one(myMirrorManager).lockDir(mirror2); when(stateOfMirror2.is("initial")); then(stateOfMirror2.is("locked"));
 
-      one(myMirrorManager).forgetDir(mirror1); when(stateOfMirror1.is("locked")); then(stateOfMirror1.is("reseted"));
-      one(myMirrorManager).forgetDir(mirror2); when(stateOfMirror2.is("locked")); then(stateOfMirror2.is("reseted"));
+      one(myMirrorManager).forgetDir(mirror1); when(stateOfMirror1.is("locked")); then(stateOfMirror1.is("reset"));
+      one(myMirrorManager).forgetDir(mirror2); when(stateOfMirror2.is("locked")); then(stateOfMirror2.is("reset"));
 
-      one(myMirrorManager).unlockDir(mirror1); when(stateOfMirror1.is("reseted"));
-      one(myMirrorManager).unlockDir(mirror2); when(stateOfMirror2.is("reseted"));
+      one(myMirrorManager).unlockDir(mirror1); when(stateOfMirror1.is("reset"));
+      one(myMirrorManager).unlockDir(mirror2); when(stateOfMirror2.is("reset"));
     }});
 
     myCacheHandler.resetCache("mercurial");