Skip to content

G
git-repo
Commit 5a8daaf1 authored by Matthias Putz's avatar Matthias Putz
Browse files
Options

analyse console ouptut

parent 53733a23
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 158 deletions
.idea/misc.xml
View file @ 5a8daaf1
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DaemonCodeAnalyzer">
<disable_hints />
</component>
<component name="DebuggerManager">
<breakpoint_any>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
<option name="ENABLED" value="false" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="true" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
<option name="ENABLED" value="false" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="true" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
</breakpoint_any>
<breakpoint_rules />
<ui_properties />
</component>
<component name="IdProvider" IDEtalkID="44D6BCE7B468B2CC0802B9B4DCA0E533" /> <component name="IdProvider" IDEtalkID="44D6BCE7B468B2CC0802B9B4DCA0E533" />
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Python 3.3.0 (C:/Python33/python.exe)" project-jdk-type="Python SDK">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Python 3.3.0 (/usr/bin/python3.3)" project-jdk-type="Python SDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="RunManager">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
<option name="PROGRAM_PARAMETERS" />
<method />
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
<method />
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<method />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="OUTPUT_DIRECTORY" />
<option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<envs />
<properties />
<listeners />
<method />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
<method />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<patterns />
<method />
</configuration>
<list size="0" />
<configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
</configuration>
</component>
</project> </project>
git_command.py
View file @ 5a8daaf1
...@@ -169,6 +169,10 @@ class GitCommand(object): ...@@ -169,6 +169,10 @@ class GitCommand(object):
cwd = None cwd = None
command.extend(cmdv) command.extend(cmdv)
provide_stdin = True
capture_stdout = True
capture_stderr = True
if provide_stdin: if provide_stdin:
stdin = subprocess.PIPE stdin = subprocess.PIPE
else: else:
......
main.py
View file @ 5a8daaf1
...@@ -20,6 +20,7 @@ import imp ...@@ -20,6 +20,7 @@ import imp
import netrc import netrc
import optparse import optparse
import os import os
import subprocess
import sys import sys
import traceback import traceback
import time import time
...@@ -409,9 +410,10 @@ def _WindowsPager(repo): ...@@ -409,9 +410,10 @@ def _WindowsPager(repo):
args1 = args[:argsSplit] args1 = args[:argsSplit]
args2 = args[argsSplit+1:] args2 = args[argsSplit+1:]
pager = _SelectPager(cmd.manifest.globalConfig) pager = _SelectPager(cmd.manifest.globalConfig)
shellCommand = "%s %s %s -- --piped-into-pager --no-pager %s | %s" % (python, thisScript, ' '.join(args1), ' '.join(args2), pager) shellCommand = "%s %s %s -- --piped-into-pager --no-pager %s | %s" % (python, thisScript, ' '.join(args1), ' '.join(args2), pager)
os.system(shellCommand) print("NEW 1")
subprocess.call(shellCommand, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
return True return True
else: else:
# set global variable if output is piped into pager; means that pager is simulated, this # set global variable if output is piped into pager; means that pager is simulated, this
...@@ -489,3 +491,4 @@ def _Main(argv): ...@@ -489,3 +491,4 @@ def _Main(argv):
if __name__ == '__main__': if __name__ == '__main__':
_Main(sys.argv[1:]) _Main(sys.argv[1:])
print("EXIT")
portable.py
View file @ 5a8daaf1
...@@ -44,7 +44,8 @@ def os_link(src, dst): ...@@ -44,7 +44,8 @@ def os_link(src, dst):
dst = toWindowsPath(dst) dst = toWindowsPath(dst)
# symlink does create soft links in windows for directories => use mklink # symlink does create soft links in windows for directories => use mklink
# call windows cmd tool 'mklink' from git bash (mingw) # call windows cmd tool 'mklink' from git bash (mingw)
subprocess.Popen('cmd /c mklink /J %s %s' % (dst, src)) p = subprocess.Popen('cmd /c mklink /J %s %s' % (dst, src))
p.communicate()
else: else:
# requires paths in relation to current dir (not in relation to target file) # requires paths in relation to current dir (not in relation to target file)
src = toUnixPath(src) src = toUnixPath(src)
......
project.py
View file @ 5a8daaf1
...@@ -1902,7 +1902,7 @@ class Project(object): ...@@ -1902,7 +1902,7 @@ class Project(object):
_error("%s: Not replacing %s hook", self.relpath, name) _error("%s: Not replacing %s hook", self.relpath, name)
continue continue
try: try:
os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst) portable.os_link(stock_hook, dst)
except OSError as e: except OSError as e:
if e.errno == errno.EPERM: if e.errno == errno.EPERM:
raise GitError('filesystem must support symlinks') raise GitError('filesystem must support symlinks')
......
repo
View file @ 5a8daaf1
...@@ -9,7 +9,7 @@ if sys.version_info[0] < 3: ...@@ -9,7 +9,7 @@ if sys.version_info[0] < 3:
## repo default configuration ## repo default configuration
## ##
REPO_URL = 'ssh://gerrit/Tools/git-repo' REPO_URL = 'https://github.com/esrlabs/git-repo'
REPO_REV = 'stable' REPO_REV = 'stable'
# Copyright (C) 2008 Google Inc. # Copyright (C) 2008 Google Inc.
......
repo.iml
View file @ 5a8daaf1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="FacetManager"> <component name="FacetManager">
<facet type="Python" name="Python"> <facet type="Python" name="Python">
<configuration sdkName="Python 3.3.0 (/usr/bin/python3.3)" /> <configuration sdkName="Python 3.3.0 (C:/Python33/python.exe)" />
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="false"> <component name="NewModuleRootManager" inherit-compiler-output="false">
...@@ -16,9 +16,8 @@ ...@@ -16,9 +16,8 @@
<excludeFolder url="file://$MODULE_DIR$/docs" /> <excludeFolder url="file://$MODULE_DIR$/docs" />
<excludeFolder url="file://$MODULE_DIR$/hooks" /> <excludeFolder url="file://$MODULE_DIR$/hooks" />
</content> </content>
<orderEntry type="jdk" jdkName="Python 3.3.0 (/usr/bin/python3.3)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.3.0 (C:/Python33/python.exe)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Python 3.3.0 (/usr/bin/python3.3) interpreter library" level="application" />
</component> </component>
</module> </module>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment