Mercurial > hg > mercurial
changeset 1:56e7f34ca887
added TeamCity libs, fix tests
line wrap: on
line diff
--- a/mercurial-tests/mercurial-tests.iml Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial-tests/mercurial-tests.iml Mon Jul 14 19:44:16 2008 +0400 @@ -9,14 +9,10 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="mercurial" /> - <orderEntry type="module" module-name="common" /> - <orderEntry type="module" module-name="test" /> - <orderEntry type="module" module-name="server" /> - <orderEntry type="library" name="testng5.3" level="project" /> + <orderEntry type="library" name="TeamCity-testsSupport" level="project" /> <orderEntry type="library" name="JUnit" level="project" /> - <orderEntry type="module" module-name="patches-tests" /> - <orderEntry type="module" module-name="patches-impl" /> - <orderEntry type="module" module-name="utils" /> + <orderEntry type="library" name="TestNG" level="project" /> + <orderEntry type="library" name="JMock" level="project" /> <orderEntryProperties /> </component> </module>
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Mon Jul 14 19:44:16 2008 +0400 @@ -1,10 +1,5 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.util.List; -import jetbrains.buildServer.MockSupport; import jetbrains.buildServer.TempFiles; import jetbrains.buildServer.serverSide.ServerPaths; import jetbrains.buildServer.vcs.*; @@ -16,6 +11,11 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.util.List; + @Test public class MercurialVcsSupportTest extends PatchTestCase { private MercurialVcsSupport myVcs; @@ -43,13 +43,13 @@ return "mercurial-tests/testData"; } - public void testGetCurrentVersion() throws VcsException { + public void testGetCurrentVersion() throws Exception { VcsRootImpl vcsRoot = createVcsRoot(); assertEquals("5:1d2cc6f3bc29", myVcs.getCurrentVersion(vcsRoot)); } - public void testUpdateWorkingDir() throws VcsException { + public void testUpdateWorkingDir() throws Exception { VcsRootImpl vcsRoot = createVcsRoot(); myVcs.getCurrentVersion(vcsRoot); @@ -57,7 +57,7 @@ assertEquals(3, changes.size()); } - public void testCollectChanges() throws VcsException { + public void testCollectChanges() throws Exception { VcsRootImpl vcsRoot = createVcsRoot(); List<ModificationData> changes = myVcs.collectBuildChanges(vcsRoot, "0:9875b412a788", "3:9522278aa38d", new CheckoutRules("")); @@ -88,7 +88,7 @@ assertEquals("dir1/file4.txt", normalizePath(files3.get(0).getRelativeFileName())); } - public void testCollectChangesWithCheckoutRules() throws VcsException { + public void testCollectChangesWithCheckoutRules() throws Exception { VcsRootImpl vcsRoot = createVcsRoot(); List<ModificationData> changes = myVcs.collectBuildChanges(vcsRoot, "0:9875b412a788", "3:9522278aa38d", new CheckoutRules("-:.\n+:dir1/subdir")); @@ -130,10 +130,11 @@ return path.replace(File.separatorChar, '/'); } - private VcsRootImpl createVcsRoot() { + private VcsRootImpl createVcsRoot() throws IOException { VcsRootImpl vcsRoot = new VcsRootImpl(1, myVcs.getName()); vcsRoot.addProperty(Constants.HG_COMMAND_PATH_PROP, "mercurial-tests/testData/bin/hg.exe"); - vcsRoot.addProperty(Constants.REPOSITORY_PROP, "mercurial-tests/testData/rep1"); + File repository = LocalRepositoryUtil.prepareRepository(new File("mercurial-tests/testData/rep1").getAbsolutePath()); + vcsRoot.addProperty(Constants.REPOSITORY_PROP, repository.getAbsolutePath()); return vcsRoot; } }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTestCase.java Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommandTestCase.java Mon Jul 14 19:44:16 2008 +0400 @@ -1,11 +1,13 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; +import jetbrains.buildServer.BaseTestCase; +import jetbrains.buildServer.TempFiles; +import jetbrains.buildServer.buildTriggers.vcs.mercurial.LocalRepositoryUtil; +import jetbrains.buildServer.vcs.VcsException; +import org.jetbrains.annotations.NotNull; + import java.io.File; import java.io.IOException; -import jetbrains.buildServer.BaseTestCase; -import jetbrains.buildServer.TempFiles; -import jetbrains.buildServer.vcs.VcsException; -import org.jetbrains.annotations.NotNull; public class BaseCommandTestCase extends BaseTestCase { private String myRepository; @@ -17,7 +19,8 @@ protected <T> T runCommand(CommandExecutor<T> executor) throws IOException, VcsException { final Settings settings = new Settings(); settings.setHgCommandPath("mercurial-tests/testData/bin/hg.exe"); - settings.setRepository(new File(myRepository).getAbsolutePath()); + File repository = LocalRepositoryUtil.prepareRepository(new File(myRepository).getAbsolutePath()); + settings.setRepository(repository.getAbsolutePath()); TempFiles tf = new TempFiles(); File parentDir = tf.createTempDir(); settings.setWorkingDir(new File(parentDir, "rep").getAbsolutePath());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial-tests/testData/rep1/hg/branch.cache Mon Jul 14 19:44:16 2008 +0400 @@ -0,0 +1,2 @@ +1d2cc6f3bc29b996373c0335d0cefe7e303fc59a 5 +1d2cc6f3bc29b996373c0335d0cefe7e303fc59a default
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial-tests/testData/rep1/hg/requires Mon Jul 14 19:44:16 2008 +0400 @@ -0,0 +1,2 @@ +revlogv1 +store
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial-tests/testData/rep1/hg/undo.branch Mon Jul 14 19:44:16 2008 +0400 @@ -0,0 +1,1 @@ +default \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial.ipr Mon Jul 14 19:44:16 2008 +0400 @@ -0,0 +1,564 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project relativePaths="false" version="4"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CCaseConfig"> + <option name="implementation" value="net.sourceforge.transparent.CommandLineClearCase" /> + <option name="checkoutReserved" value="false" /> + <option name="markExternalChangeAsUpToDate" value="true" /> + <option name="checkInUseHijack" value="true" /> + <option name="isOffline" value="false" /> + <option name="lastScr" value="" /> + <option name="scrTextFileName" value="" /> + <option name="lastViewType" /> + </component> + <component name="ChangeBrowserSettings"> + <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> + <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> + <option name="USE_DATE_BEFORE_FILTER" value="false" /> + <option name="USE_DATE_AFTER_FILTER" value="false" /> + <option name="USE_CHANGE_BEFORE_FILTER" value="false" /> + <option name="USE_CHANGE_AFTER_FILTER" value="false" /> + <option name="DATE_BEFORE" value="" /> + <option name="DATE_AFTER" value="" /> + <option name="CHANGE_BEFORE" value="" /> + <option name="CHANGE_AFTER" value="" /> + <option name="USE_USER_FILTER" value="false" /> + <option name="USER" value="" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> + <component name="CodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS" /> + <option name="USE_PER_PROJECT_SETTINGS" value="false" /> + </component> + <component name="CompilerConfiguration"> + <option name="DEFAULT_COMPILER" value="Javac" /> + <option name="DEPLOY_AFTER_MAKE" value="0" /> + <resourceExtensions> + <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(gif|png|jpeg|jpg)" /> + </resourceExtensions> + <wildcardResourcePatterns> + <entry name="?*.properties" /> + <entry name="?*.xml" /> + <entry name="?*.gif" /> + <entry name="?*.png" /> + <entry name="?*.jpeg" /> + <entry name="?*.jpg" /> + <entry name="?*.html" /> + <entry name="?*.dtd" /> + <entry name="?*.tld" /> + </wildcardResourcePatterns> + </component> + <component name="Cvs2Configuration"> + <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> + <option name="MERGING_MODE" value="0" /> + <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" /> + <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" /> + <option name="RESET_STICKY" value="false" /> + <option name="CREATE_NEW_DIRECTORIES" value="true" /> + <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" /> + <option name="PROCESS_UNKNOWN_FILES" value="false" /> + <option name="PROCESS_DELETED_FILES" value="false" /> + <option name="PROCESS_IGNORED_FILES" value="false" /> + <option name="RESERVED_EDIT" value="false" /> + <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="UPDATE_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_CHANGES_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_OUTPUT" value="false" /> + <option name="ADD_WATCH_INDEX" value="0" /> + <option name="REMOVE_WATCH_INDEX" value="0" /> + <option name="UPDATE_KEYWORD_SUBSTITUTION" /> + <option name="MAKE_NEW_FILES_READONLY" value="false" /> + <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> + <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> + <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> + <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> + <option name="CLEAN_COPY" value="false" /> + </component> + <component name="DependenciesAnalyzeManager"> + <option name="myForwardDirection" value="false" /> + </component> + <component name="DependencyValidationManager"> + <option name="SKIP_IMPORT_STATEMENTS" value="false" /> + </component> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> + <component name="EntryPointsManager"> + <entry_points version="2.0" /> + </component> + <component name="ErrorOptionsConfigurable.UI"> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </component> + <component name="ErrorTreeViewConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="HIDE_WARNINGS" value="false" /> + </component> + <component name="ExportToHTMLSettings"> + <option name="PRINT_LINE_NUMBERS" value="false" /> + <option name="OPEN_IN_BROWSER" value="false" /> + <option name="OUTPUT_DIRECTORY" /> + </component> + <component name="GlobalLibrariesConfigurable.UI"> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </component> + <component name="IdProvider" IDEtalkID="317BB29ECB7DA19EFFA340ECF52563C6" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + </profile> + </profiles> + <list size="0" /> + </component> + <component name="JavacSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="DEPRECATION" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="JavadocGenerationManager"> + <option name="OUTPUT_DIRECTORY" /> + <option name="OPTION_SCOPE" value="protected" /> + <option name="OPTION_HIERARCHY" value="true" /> + <option name="OPTION_NAVIGATOR" value="true" /> + <option name="OPTION_INDEX" value="true" /> + <option name="OPTION_SEPARATE_INDEX" value="true" /> + <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> + <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> + <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> + <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> + <option name="OPTION_DEPRECATED_LIST" value="true" /> + <option name="OTHER_OPTIONS" value="" /> + <option name="HEAP_SIZE" /> + <option name="LOCALE" /> + <option name="OPEN_IN_BROWSER" value="true" /> + </component> + <component name="JdkListConfigurable.UI"> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </component> + <component name="JikesSettings"> + <option name="JIKES_PATH" value="" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="DEPRECATION" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="IS_EMACS_ERRORS_MODE" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="LogConsolePreferences"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="CUSTOM_FILTER" /> + </component> + <component name="ModuleStructureConfigurable.UI"> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </component> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> + <component name="PerforceChangeBrowserSettings"> + <option name="USE_CLIENT_FILTER" value="true" /> + <option name="CLIENT" value="" /> + </component> + <component name="ProjectDetails"> + <option name="projectName" value="mercurial" /> + </component> + <component name="ProjectFileVersion" converted="true" /> + <component name="ProjectLibrariesConfigurable.UI"> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </component> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/mercurial/mercurial.iml" filepath="$PROJECT_DIR$/mercurial/mercurial.iml" /> + <module fileurl="file://$PROJECT_DIR$/mercurial-tests/mercurial-tests.iml" filepath="$PROJECT_DIR$/mercurial-tests/mercurial-tests.iml" /> + </modules> + </component> + <component name="ProjectRootConfigurable.UI"> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </component> + <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/out" /> + </component> + <component name="ResourceManagerContainer"> + <option name="myResourceBundles"> + <value> + <list size="0" /> + </value> + </option> + </component> + <component name="RmicSettings"> + <option name="IS_EANABLED" value="false" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="GENERATE_IIOP_STUBS" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="ScopeChooserConfigurable.UI"> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </component> + <component name="StarteamConfiguration"> + <option name="SERVER" value="" /> + <option name="PORT" value="49201" /> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROJECT" value="" /> + <option name="VIEW" value="" /> + <option name="ALTERNATIVE_WORKING_PATH" value="" /> + <option name="LOCK_ON_CHECKOUT" value="false" /> + <option name="UNLOCK_ON_CHECKIN" value="false" /> + </component> + <component name="Struts Assistant"> + <option name="showInputs" value="true" /> + <option name="resources"> + <value> + <option name="strutsPath" /> + <option name="strutsHelp" /> + </value> + </option> + <option name="selectedTaglibs" /> + <option name="selectedTaglibs" /> + <option name="myStrutsValidationEnabled" value="true" /> + <option name="myTilesValidationEnabled" value="true" /> + <option name="myValidatorValidationEnabled" value="true" /> + <option name="myReportErrorsAsWarnings" value="true" /> + </component> + <component name="SvnBranchConfigurationManager"> + <option name="myVersion" value="123" /> + </component> + <component name="SvnChangesBrowserSettings"> + <option name="USE_AUTHOR_FIELD" value="true" /> + <option name="AUTHOR" value="" /> + <option name="LOCATION" value="" /> + <option name="USE_PROJECT_SETTINGS" value="true" /> + <option name="USE_ALTERNATE_LOCATION" value="false" /> + </component> + <component name="TeamCityRootDirectoryHolder"> + <option name="myRelativeRootDirectory" /> + </component> + <component name="VCS.FileViewConfiguration"> + <option name="SELECTED_STATUSES" value="DEFAULT" /> + <option name="SELECTED_COLUMNS" value="DEFAULT" /> + <option name="SHOW_FILTERS" value="true" /> + <option name="CUSTOMIZE_VIEW" value="true" /> + <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> + </component> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="" /> + </component> + <component name="VssConfiguration"> + <option name="CLIENT_PATH" value="" /> + <option name="SRCSAFEINI_PATH" value="" /> + <option name="USER_NAME" value="" /> + <option name="PWD" value="" /> + <option name="VSS_IS_INITIALIZED" value="false" /> + <CheckoutOptions> + <option name="COMMENT" value="" /> + <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> + <option name="REPLACE_WRITABLE" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckoutOptions> + <CheckinOptions> + <option name="COMMENT" value="" /> + <option name="KEEP_CHECKED_OUT" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckinOptions> + <AddOptions> + <option name="STORE_ONLY_LATEST_VERSION" value="false" /> + <option name="CHECK_OUT_IMMEDIATELY" value="false" /> + </AddOptions> + <UndocheckoutOptions> + <option name="MAKE_WRITABLE" value="false" /> + <option name="REPLACE_LOCAL_COPY" value="0" /> + <option name="RECURSIVE" value="false" /> + </UndocheckoutOptions> + <GetOptions> + <option name="REPLACE_WRITABLE" value="0" /> + <option name="MAKE_WRITABLE" value="false" /> + <option name="ANSWER_NEGATIVELY" value="false" /> + <option name="ANSWER_POSITIVELY" value="false" /> + <option name="RECURSIVE" value="false" /> + <option name="VERSION" /> + </GetOptions> + </component> + <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> + <option name="myLastEditedConfigurable" /> + </component> + <component name="com.intellij.jsf.UserDefinedFacesConfigs"> + <option name="USER_DEFINED_CONFIGS"> + <value> + <list size="0" /> + </value> + </option> + </component> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="" version="1"> + <option name="myPlainMode" value="false" /> + <option name="myLastEditedConfigurable" /> + </component> + <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> + <option name="myLastEditedConfigurable" /> + </component> + <component name="libraryTable"> + <library name="TeamCity-openapi"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial/lib/server-openapi.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial/lib/web-openapi.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial/lib/server-model.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial/lib/common.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial/lib/utils.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial/lib/patches.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$PROJECT_DIR$/mercurial/lib/src/openApi-source.jar!/" /> + </SOURCES> + </library> + <library name="IDEA-openapi"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial/lib/annotations.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial/lib/openapi.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial/lib/util.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="TeamCity-testsSupport"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial-tests/lib/patches-tests.jar!/" /> + <root url="jar://$PROJECT_DIR$/mercurial-tests/lib/test.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="JUnit"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial-tests/lib/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="TestNG"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial-tests/lib/testng-5.7-jdk15.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="JMock"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial-tests/lib/jmock-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="TeamCity-impl"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial/lib/patches-impl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="Log4j"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial/lib/log4j-1.2.12.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="GNU Trove"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/mercurial/lib/trove4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </component> + <component name="testng.defaultConfiguration"> + <outputDirectory /> + <properties /> + </component> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> + </component> +</project> +
--- a/mercurial/mercurial.iml Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial/mercurial.iml Mon Jul 14 19:44:16 2008 +0400 @@ -18,6 +18,30 @@ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" /> </building> <packaging> + <containerElement type="module" name="mercurial"> + <attribute name="method" value="5" /> + <attribute name="URI" value="/WEB-INF/lib/mercurial.jar" /> + </containerElement> + <containerElement type="library" name="GNU Trove" level="project"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + </containerElement> + <containerElement type="library" name="IDEA-openapi" level="project"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib" /> + </containerElement> + <containerElement type="library" name="Log4j" level="project"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + </containerElement> + <containerElement type="library" name="TeamCity-impl" level="project"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib" /> + </containerElement> + <containerElement type="library" name="TeamCity-openapi" level="project"> + <attribute name="method" value="0" /> + <attribute name="URI" value="/WEB-INF/lib" /> + </containerElement> <containerElement type="facet" facetId="web-openapi/web/web-openapi"> <attribute name="method" value="0" /> <attribute name="URI" value="<N/A>" /> @@ -30,10 +54,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/classes" /> </containerElement> - <containerElement type="module" name="mercurial"> - <attribute name="method" value="5" /> - <attribute name="URI" value="/WEB-INF/lib/mercurial.jar" /> - </containerElement> <containerElement type="module" name="messages"> <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/classes" /> @@ -70,10 +90,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> </containerElement> - <containerElement type="library" name="IDEA-openapi" level="project"> - <attribute name="method" value="0" /> - <attribute name="URI" value="/WEB-INF/lib" /> - </containerElement> <containerElement type="library" name="Ivy" level="project"> <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> @@ -82,10 +98,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> </containerElement> - <containerElement type="library" name="JUnit" level="project"> - <attribute name="method" value="0" /> - <attribute name="URI" value="/WEB-INF/lib" /> - </containerElement> <containerElement type="library" name="JodaTime" level="project"> <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> @@ -118,10 +130,6 @@ <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> </containerElement> - <containerElement type="library" name="testng" level="project"> - <attribute name="method" value="0" /> - <attribute name="URI" value="/WEB-INF/lib" /> - </containerElement> <containerElement type="library" name="xerces" level="project"> <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> @@ -151,11 +159,6 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="0" /> - <attribute name="URI" value="<N/A>" /> - <url>jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/</url> - </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib" /> <url>jar://$MODULE_DIR$/../web/lib/jstl.jar!/</url> </containerElement> @@ -167,6 +170,15 @@ </packaging> </configuration> </facet> + <facet type="Spring" name="Spring"> + <configuration> + <options> + <option name="enableValidation" value="false" /> + <option name="reportErrorsAsWarnings" value="true" /> + </options> + <customNs /> + </configuration> + </facet> </component> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/classes" /> @@ -176,21 +188,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="IDEA-openapi" level="project" /> - <orderEntry type="module" module-name="common" /> - <orderEntry type="module" module-name="utils" /> - <orderEntry type="module" module-name="server-openapi" /> - <orderEntry type="module" module-name="patches" /> - <orderEntry type="module" module-name="web-openapi" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> + <orderEntry type="library" exported="" name="TeamCity-openapi" level="project" /> + <orderEntry type="library" exported="" name="IDEA-openapi" level="project" /> + <orderEntry type="library" exported="" name="TeamCity-impl" level="project" /> + <orderEntry type="library" exported="" name="Log4j" level="project" /> + <orderEntry type="library" exported="" name="GNU Trove" level="project" /> <orderEntryProperties /> </component> </module>
--- a/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Mon Jul 14 19:44:16 2008 +0400 @@ -1,10 +1,5 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import java.io.File; -import java.io.FileFilter; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.*; import jetbrains.buildServer.CollectChangesByIncludeRule; import jetbrains.buildServer.Used; import jetbrains.buildServer.buildTriggers.vcs.AbstractVcsPropertiesProcessor; @@ -19,6 +14,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.*; + public class MercurialVcsSupport extends VcsSupport implements CollectChangesByIncludeRule { private ServerPaths myServerPaths;
--- a/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java Mon Jul 14 19:44:16 2008 +0400 @@ -1,15 +1,15 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; import com.intellij.execution.configurations.GeneralCommandLine; -import java.io.File; -import java.io.IOException; -import java.util.List; -import jetbrains.buildServer.ExecResult; import jetbrains.buildServer.SimpleCommandLineProcessRunner; import jetbrains.buildServer.util.FileUtil; import jetbrains.buildServer.vcs.VcsException; import org.jetbrains.annotations.NotNull; +import java.io.File; +import java.io.IOException; +import java.util.List; + public class CatCommand { private Settings mySettings; private String myRevId;
--- a/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangeSet.java Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ChangeSet.java Mon Jul 14 19:44:16 2008 +0400 @@ -1,7 +1,8 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; +import org.jetbrains.annotations.NotNull; + import java.util.Date; -import org.jetbrains.annotations.NotNull; public class ChangeSet { private int myRevNumber;
--- a/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java Mon Jul 14 18:22:05 2008 +0400 +++ b/mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java Mon Jul 14 19:44:16 2008 +0400 @@ -1,12 +1,13 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; import com.intellij.execution.configurations.GeneralCommandLine; -import java.io.File; +import jetbrains.buildServer.ExecResult; import jetbrains.buildServer.SimpleCommandLineProcessRunner; -import jetbrains.buildServer.ExecResult; import jetbrains.buildServer.vcs.VcsException; import org.jetbrains.annotations.NotNull; +import java.io.File; + public class CloneCommand { private Settings mySettings; private String myDestDir;