[Mercurial] Large merge of the hg4idea-luciad fork.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 31 May 2010 13:46:42 +0000 (17:46 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 31 May 2010 13:46:42 +0000 (17:46 +0400)
commitb85dd68c8b7dbd9364709bd943122a6d5b9cf49b
tree55ea37e517d52a9f35c972691ebca179ba0a56d4
parenteec7e28f0212d9b3228df4c87ac7f1293dcfaaa4
[Mercurial] Large merge of the hg4idea-luciad fork.
93 files changed:
plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
plugins/hg4idea/resources/python/filemerge.py [new file with mode: 0644]
plugins/hg4idea/resources/python/prompthooks.py [new file with mode: 0644]
plugins/hg4idea/src/META-INF/plugin.xml
plugins/hg4idea/src/org/zmlx/hg4idea/HgContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgCurrentBranchStatusUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorHandler.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/HgExecutableValidator.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgFileRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgIdeConfigurable.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgIncomingStatusUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgOutgoingStatusUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVirtualFileListener.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMarkResolved.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMercurialMenu.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMqRebaseAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgRunConflictResolverAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCatCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgChangesetsCommand.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCloneCommand.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandAuthenticator.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandResult.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandService.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommitCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgHeadsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgIdentifyCommand.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgIncomingCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgLogCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgMergeCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgOutgoingCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgParentsCommand.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPullCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTrackFileNamesAccrossRevisionsCommand.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgVersionCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/ShellCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/SocketServer.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCheckoutProvider.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCommitedChangeList.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCurrentBinaryContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCurrentContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCurrentContentRevisionFactory.java [deleted file]
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgRollbackEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCommitSession.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgHeadMerger.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgIntegrateEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdaterFactory.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCloneDialog.form [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCloneDialog.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationIdePanel.form
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationIdePanel.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCurrentBranchStatus.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgIntegrateDialog.form
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgIntegrateDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgSetExecutableDialog.form
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgSetExecutableDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.java [new file with mode: 0644]
plugins/hg4idea/testSrc/org/zmlx/hg4idea/AbstractHgTestCase.java [new file with mode: 0644]
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgAddTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCatTestCase.java [new file with mode: 0644]
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCopyTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgDeleteTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgFromClonedTestCase.java [new file with mode: 0644]
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgLogTestCase.java [new file with mode: 0644]
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgMoveTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRenameTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgResolveConflictTestCase.java [new file with mode: 0644]
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRevertTestCase.java [new file with mode: 0644]
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUpdateTestCase.java [new file with mode: 0644]