groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [groovy] 03/09: Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - resolve conflict and keep both files
Date Mon, 13 May 2019 06:59:03 GMT
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 8fd5e92f3c7209e33faddfd01d0323de131a765c
Merge: 496030a 150cd9e
Author: Paul King <paulk@asert.com.au>
AuthorDate: Mon May 13 14:04:34 2019 +1000

    Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh
- resolve conflict and keep both files

 .../org/apache/groovy/groovysh/AnsiDetector.groovy |  33 +
 .../apache/groovy/groovysh/BufferManager.groovy    | 114 ++++
 .../org/apache/groovy/groovysh/Command.groovy      |  47 ++
 .../org/apache/groovy/groovysh/CommandAlias.groovy |  86 +++
 .../apache/groovy/groovysh/CommandException.groovy |  46 ++
 .../apache/groovy/groovysh/CommandRegistry.groovy  | 108 ++++
 .../apache/groovy/groovysh/CommandSupport.groovy   | 226 +++++++
 .../groovy/groovysh/ComplexCommandSupport.groovy   | 100 +++
 .../apache/groovy/groovysh/ExitNotification.groovy |  33 +
 .../org/apache/groovy/groovysh/Groovysh.groovy     | 671 +++++++++++++++++++
 .../groovy/groovysh/InteractiveShellRunner.groovy  | 214 ++++++
 .../org/apache/groovy/groovysh/Interpreter.groovy  | 110 ++++
 .../groovy/org/apache/groovy/groovysh/Main.groovy  | 263 ++++++++
 .../org/apache/groovy/groovysh/Parser.groovy       | 283 ++++++++
 .../groovy/org/apache/groovy/groovysh/Shell.groovy | 127 ++++
 .../org/apache/groovy/groovysh/ShellRunner.groovy  | 101 +++
 .../groovy/groovysh/commands/AliasCommand.groovy   | 132 ++++
 .../groovy/groovysh/commands/ClearCommand.groovy   |  46 ++
 .../groovy/groovysh/commands/DisplayCommand.groovy |  47 ++
 .../groovy/groovysh/commands/DocCommand.groovy     | 190 ++++++
 .../groovy/groovysh/commands/EditCommand.groovy    | 103 +++
 .../groovy/groovysh/commands/ExitCommand.groovy    |  53 ++
 .../groovy/groovysh/commands/GrabCommand.groovy    |  68 ++
 .../groovy/groovysh/commands/HelpCommand.groovy    | 130 ++++
 .../groovy/groovysh/commands/HistoryCommand.groovy | 153 +++++
 .../groovy/groovysh/commands/ImportCommand.groovy  | 263 ++++++++
 .../groovy/groovysh/commands/InspectCommand.groovy | 129 ++++
 .../groovy/groovysh/commands/LoadCommand.groovy    |  87 +++
 .../groovy/groovysh/commands/PurgeCommand.groovy   |  84 +++
 .../groovy/groovysh/commands/RecordCommand.groovy  | 138 ++++
 .../groovysh/commands/RegisterCommand.groovy       |  79 +++
 .../groovy/groovysh/commands/SaveCommand.groovy    |  78 +++
 .../groovy/groovysh/commands/SetCommand.groovy     | 107 +++
 .../groovy/groovysh/commands/ShadowCommand.groovy  |  56 ++
 .../groovy/groovysh/commands/ShowCommand.groovy    | 104 +++
 .../completion/BackslashEscapeCompleter.groovy     |  43 ++
 .../completion/CommandNameCompleter.groovy         |  52 ++
 .../completion/CustomClassSyntaxCompletor.groovy   |  51 ++
 .../groovysh/completion/FileNameCompleter.groovy   | 171 +++++
 .../completion/GroovySyntaxCompletor.groovy        | 374 +++++++++++
 .../groovysh/completion/IdentifierCompletor.groovy |  38 ++
 .../completion/ImportsSyntaxCompletor.groovy       | 126 ++++
 .../completion/InfixKeywordSyntaxCompletor.groovy  |  48 ++
 .../completion/KeywordSyntaxCompletor.groovy       | 126 ++++
 .../completion/NavigablePropertiesCompleter.groovy |  96 +++
 .../ReflectionCompletionCandidate.groovy           |  78 +++
 .../groovysh/completion/ReflectionCompletor.groovy | 720 +++++++++++++++++++++
 .../completion/StricterArgumentCompleter.groovy    | 132 ++++
 .../completion/VariableSyntaxCompletor.groovy      |  62 ++
 .../groovy/org/apache/groovy/groovysh/package.html |  28 +
 .../groovysh/util/CommandArgumentParser.groovy     | 122 ++++
 .../groovysh/util/CurlyCountingGroovyLexer.groovy  |  68 ++
 .../groovysh/util/DefaultCommandsRegistrar.groovy  |  88 +++
 .../groovysh/util/NoExitSecurityManager.groovy     |  63 ++
 .../groovy/groovysh/util/PackageHelper.groovy      |  29 +
 .../groovy/groovysh/util/PackageHelperImpl.groovy  | 485 ++++++++++++++
 .../groovysh/util/ScriptVariableAnalyzer.groovy    | 119 ++++
 .../groovy/groovysh/util/SimpleCompletor.groovy    | 140 ++++
 .../groovy/groovysh/util/WrappedInputStream.groovy | 109 ++++
 .../groovysh/util/XmlCommandRegistrar.groovy       |  94 +++
 .../org/apache/groovy/groovysh/util/package.html   |  30 +
 61 files changed, 8101 insertions(+)


Mime
View raw message