Skip to content

G
git-repo
Commit 7288b06b authored by Matthias Putz's avatar Matthias Putz
Browse files
Options

extracted some changes to portable module + solved stringio problem

parent ef40ad0e
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 91 deletions
.idea/workspace.xml
View file @ 7288b06b
...@@ -2,21 +2,32 @@ ...@@ -2,21 +2,32 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" name="Default" comment=""> <list default="true" id="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/cherry_pick.py" afterPath="$PROJECT_DIR$/subcmds/cherry_pick.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/git_command.py" afterPath="$PROJECT_DIR$/git_command.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/git_config.py" afterPath="$PROJECT_DIR$/git_config.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/grep.py" afterPath="$PROJECT_DIR$/subcmds/grep.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/portable.py" afterPath="$PROJECT_DIR$/portable.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portable.py" afterPath="$PROJECT_DIR$/portable.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/sync.py" afterPath="$PROJECT_DIR$/subcmds/sync.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/project.py" afterPath="$PROJECT_DIR$/project.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/repo.iml" afterPath="$PROJECT_DIR$/repo.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/status.py" afterPath="$PROJECT_DIR$/subcmds/status.py" />
</list> </list>
<ignored path="git-repo.iws" /> <ignored path="git-repo.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<file path="/Dummy.txt" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363249871987" ignored="false" /> <file path="/Dummy.txt" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363249871987" ignored="false" />
<file path="/main.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363252527568" ignored="false" /> <file path="/main.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363252527568" ignored="false" />
<file path="/portable.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363271256570" ignored="false" /> <file path="/portable.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363275619057" ignored="false" />
<file path="/a.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363252132925" ignored="false" /> <file path="/a.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363252132925" ignored="false" />
<file path="/a.dummy" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363265304980" ignored="false" /> <file path="/a.dummy" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363275986579" ignored="false" />
<file path="/git_config.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363257894873" ignored="false" /> <file path="/git_config.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276044335" ignored="false" />
<file path="/project.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363267908069" ignored="false" /> <file path="/project.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363275666306" ignored="false" />
<file path="/fragment.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363268737830" ignored="false" /> <file path="/fragment.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276469024" ignored="false" />
<file path="/manifest_xml.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363268785719" ignored="false" /> <file path="/manifest_xml.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363268785719" ignored="false" />
<file path="/sync.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363272296968" ignored="false" /> <file path="/sync.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363272296968" ignored="false" />
<file path="/status.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363277085645" ignored="false" />
<file path="/git_command.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276013040" ignored="false" />
<file path="/cherry_pick.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276094232" ignored="false" />
<file path="/grep.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276113213" ignored="false" />
<file path="/color.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276972904" ignored="false" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -79,26 +90,33 @@ ...@@ -79,26 +90,33 @@
<entry file="file://$PROJECT_DIR$/main.py"> <entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="136" column="0" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.0"> <state line="136" column="0" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.0">
<folding> <folding />
<element signature="e#625#662#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="sync.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="status.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/subcmds/sync.py"> <entry file="file://$PROJECT_DIR$/subcmds/status.py">
<provider selected="true" editor-type-id="text-editor">
<state line="147" column="0" selection-start="5089" selection-end="5089" vertical-scroll-proportion="0.59375">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="_weakrefset.py" pinned="false" current="false" current-in-tab="false">
<entry file="file:///usr/lib/python3.3/_weakrefset.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="588" column="35" selection-start="21092" selection-end="21092" vertical-scroll-proportion="0.0"> <state line="78" column="0" selection-start="2178" selection-end="2178" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="progress.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="threading.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/progress.py"> <entry file="file:///usr/lib/python3.3/threading.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="59" column="0" selection-start="1551" selection-end="1551" vertical-scroll-proportion="0.0"> <state line="595" column="0" selection-start="18518" selection-end="18518" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -107,16 +125,18 @@ ...@@ -107,16 +125,18 @@
<file leaf-file-name="portable.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="portable.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/portable.py"> <entry file="file://$PROJECT_DIR$/portable.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="25" column="0" selection-start="352" selection-end="352" vertical-scroll-proportion="0.0"> <state line="13" column="9" selection-start="152" selection-end="152" vertical-scroll-proportion="0.0">
<folding /> <folding>
<element signature="e#47#56#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="git_command.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="manifest.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/git_command.py"> <entry file="file://$PROJECT_DIR$/subcmds/manifest.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="223" column="16" selection-start="5637" selection-end="5637" vertical-scroll-proportion="0.0"> <state line="51" column="15" selection-start="1618" selection-end="1618" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -125,25 +145,38 @@ ...@@ -125,25 +145,38 @@
<file leaf-file-name="git_config.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="git_config.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/git_config.py"> <entry file="file://$PROJECT_DIR$/git_config.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="511" column="0" selection-start="13273" selection-end="13273" vertical-scroll-proportion="0.0"> <state line="328" column="41" selection-start="8344" selection-end="8344" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#603#640#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="git_command.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/git_command.py">
<provider selected="true" editor-type-id="text-editor">
<state line="82" column="41" selection-start="2019" selection-end="2019" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="project.py" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="project.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/project.py"> <entry file="file://$PROJECT_DIR$/project.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="1980" column="0" selection-start="60715" selection-end="60715" vertical-scroll-proportion="0.33333334"> <state line="739" column="0" selection-start="24079" selection-end="24079" vertical-scroll-proportion="0.0">
<folding /> <folding>
<element signature="e#601#638#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="_weakrefset.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="color.py" pinned="false" current="false" current-in-tab="false">
<entry file="file:///usr/lib/python3.3/_weakrefset.py"> <entry file="file://$PROJECT_DIR$/color.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="77" column="0" selection-start="2177" selection-end="2177" vertical-scroll-proportion="0.0"> <state line="125" column="22" selection-start="2780" selection-end="2780" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -168,11 +201,16 @@ ...@@ -168,11 +201,16 @@
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/main.py" /> <option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/git_config.py" />
<option value="$PROJECT_DIR$/project.py" />
<option value="$PROJECT_DIR$/manifest_xml.py" /> <option value="$PROJECT_DIR$/manifest_xml.py" />
<option value="$PROJECT_DIR$/portable.py" />
<option value="$PROJECT_DIR$/subcmds/sync.py" /> <option value="$PROJECT_DIR$/subcmds/sync.py" />
<option value="$PROJECT_DIR$/portable.py" />
<option value="$PROJECT_DIR$/project.py" />
<option value="$PROJECT_DIR$/git_command.py" />
<option value="$PROJECT_DIR$/git_config.py" />
<option value="$PROJECT_DIR$/subcmds/cherry_pick.py" />
<option value="$PROJECT_DIR$/subcmds/grep.py" />
<option value="$PROJECT_DIR$/color.py" />
<option value="$PROJECT_DIR$/subcmds/status.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -282,6 +320,10 @@ ...@@ -282,6 +320,10 @@
<option name="myItemId" value="git-repo" /> <option name="myItemId" value="git-repo" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="External Libraries" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
</PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -316,7 +358,7 @@ ...@@ -316,7 +358,7 @@
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="SDKs" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="116" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="116" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="118" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="118" />
...@@ -326,7 +368,7 @@ ...@@ -326,7 +368,7 @@
<property name="recentsLimit" value="5" /> <property name="recentsLimit" value="5" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="last_opened_file_path" value="$USER_HOME$/.IntelliJIdea12/config/plugins/python/pycharm-debug.egg!/" /> <property name="last_opened_file_path" value="$USER_HOME$/.IntelliJIdea12/system/python_stubs/-2066100795" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="121" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="121" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="916" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="916" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="916" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="916" />
...@@ -359,7 +401,7 @@ ...@@ -359,7 +401,7 @@
<PyConsoleSettings /> <PyConsoleSettings />
</option> </option>
</component> </component>
<component name="RunManager" selected="Python Remote Debug.git-repo remote"> <component name="RunManager" selected="Python Remote Debug.git-repo remote localhost">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" /> <module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
...@@ -585,11 +627,11 @@ ...@@ -585,11 +627,11 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32924107" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32924107" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1867794" sideWeight="0.20982143" order="1" side_tool="true" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25518832" sideWeight="0.20982143" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1867794" sideWeight="0.47767857" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25518832" sideWeight="0.47767857" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
...@@ -674,7 +716,7 @@ ...@@ -674,7 +716,7 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="python-line"> <line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/portable.py</url> <url>file://$PROJECT_DIR$/portable.py</url>
<line>25</line> <line>28</line>
<option name="timeStamp" value="17" /> <option name="timeStamp" value="17" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="python-line"> <line-breakpoint enabled="true" type="python-line">
...@@ -707,6 +749,16 @@ ...@@ -707,6 +749,16 @@
<line>1045</line> <line>1045</line>
<option name="timeStamp" value="28" /> <option name="timeStamp" value="28" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file:///usr/lib/python3.3/io.py</url>
<line>50</line>
<option name="timeStamp" value="31" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/color.py</url>
<line>125</line>
<option name="timeStamp" value="32" />
</line-breakpoint>
</breakpoints> </breakpoints>
<breakpoints-dialog> <breakpoints-dialog>
<breakpoints-dialog /> <breakpoints-dialog />
...@@ -718,7 +770,7 @@ ...@@ -718,7 +770,7 @@
</properties> </properties>
</breakpoint> </breakpoint>
</default-breakpoints> </default-breakpoints>
<option name="time" value="29" /> <option name="time" value="33" />
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">
...@@ -726,116 +778,120 @@ ...@@ -726,116 +778,120 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file:///usr/lib/python3.2/os.py"> <entry file="file://$PROJECT_DIR$/progress.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="485" column="0" selection-start="15715" selection-end="15715" vertical-scroll-proportion="0.0"> <state line="59" column="0" selection-start="1551" selection-end="1551" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file:///usr/lib/python3.2/_weakrefset.py"> <entry file="file://$PROJECT_DIR$/subcmds/sync.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="78" column="0" selection-start="2178" selection-end="2178" vertical-scroll-proportion="0.0"> <state line="588" column="35" selection-start="21092" selection-end="21092" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/subcmds/upload.py"> <entry file="file://$PROJECT_DIR$/subcmds/manifest.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="332" column="26" selection-start="11643" selection-end="11643" vertical-scroll-proportion="0.0"> <state line="51" column="15" selection-start="1618" selection-end="1618" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.pylintrc"> <entry file="file://$PROJECT_DIR$/git_command.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="22" column="7" selection-start="664" selection-end="664" vertical-scroll-proportion="0.33271718"> <state line="82" column="41" selection-start="2019" selection-end="2019" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/subcmds/init.py"> <entry file="file://$PROJECT_DIR$/subcmds/grep.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="225" column="14" selection-start="8162" selection-end="8162" vertical-scroll-proportion="0.0"> <state line="111" column="49" selection-start="3638" selection-end="3638" vertical-scroll-proportion="0.7100694">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/manifest_xml.py"> <entry file="file://$PROJECT_DIR$/subcmds/cherry_pick.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="332" column="0" selection-start="10095" selection-end="10095" vertical-scroll-proportion="0.0"> <state line="58" column="60" selection-start="1758" selection-end="1758" vertical-scroll-proportion="0.31944445">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/git_command.py"> <entry file="file://$PROJECT_DIR$/portable.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="223" column="16" selection-start="5637" selection-end="5637" vertical-scroll-proportion="0.0"> <state line="13" column="9" selection-start="152" selection-end="152" vertical-scroll-proportion="0.0">
<folding /> <folding>
<element signature="e#47#56#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/command.py"> <entry file="file://$PROJECT_DIR$/git_config.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="65" column="0" selection-start="1925" selection-end="1925" vertical-scroll-proportion="0.0"> <state line="328" column="41" selection-start="8344" selection-end="8344" vertical-scroll-proportion="0.0">
<folding /> <folding>
<element signature="e#603#640#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file:///usr/lib/python3.3/threading.py"> <entry file="file://$USER_HOME$/.IntelliJIdea12/system/python_stubs/-2066100795/_io.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="610" column="52" selection-start="19409" selection-end="19409" vertical-scroll-proportion="0.0"> <state line="756" column="10" selection-start="26440" selection-end="26440" vertical-scroll-proportion="0.30550623">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/git_config.py"> <entry file="file:///usr/lib/python3.3/io.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="511" column="0" selection-start="13273" selection-end="13273" vertical-scroll-proportion="0.0"> <state line="54" column="36" selection-start="2318" selection-end="2318" vertical-scroll-proportion="0.5538194">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/progress.py"> <entry file="file:///usr/lib/python3.3/threading.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="59" column="0" selection-start="1551" selection-end="1551" vertical-scroll-proportion="0.0"> <state line="595" column="0" selection-start="18518" selection-end="18518" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file:///usr/lib/python3.3/_weakrefset.py"> <entry file="file://$PROJECT_DIR$/project.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="77" column="0" selection-start="2177" selection-end="2177" vertical-scroll-proportion="0.0"> <state line="739" column="0" selection-start="24079" selection-end="24079" vertical-scroll-proportion="0.0">
<folding /> <folding>
<element signature="e#601#638#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/main.py"> <entry file="file://$PROJECT_DIR$/color.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="136" column="0" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.0"> <state line="125" column="22" selection-start="2780" selection-end="2780" vertical-scroll-proportion="0.0">
<folding> <folding />
<element signature="e#625#662#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/subcmds/sync.py"> <entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="588" column="35" selection-start="21092" selection-end="21092" vertical-scroll-proportion="0.0"> <state line="136" column="0" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/portable.py"> <entry file="file:///usr/lib/python3.3/_weakrefset.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="25" column="0" selection-start="352" selection-end="352" vertical-scroll-proportion="0.0"> <state line="78" column="0" selection-start="2178" selection-end="2178" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/project.py"> <entry file="file://$PROJECT_DIR$/subcmds/status.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="1980" column="0" selection-start="60715" selection-end="60715" vertical-scroll-proportion="0.33333334"> <state line="147" column="0" selection-start="5089" selection-end="5089" vertical-scroll-proportion="0.59375">
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -893,12 +949,11 @@ ...@@ -893,12 +949,11 @@
</state> </state>
<state key="ModuleStructureConfigurable.UI"> <state key="ModuleStructureConfigurable.UI">
<settings> <settings>
<last-edited>repo</last-edited> <last-edited>Python|repo</last-edited>
<splitter-proportions> <splitter-proportions>
<option name="proportions"> <option name="proportions">
<list> <list>
<option value="0.2" /> <option value="0.2" />
<option value="0.5" />
</list> </list>
</option> </option>
</splitter-proportions> </splitter-proportions>
...@@ -906,7 +961,7 @@ ...@@ -906,7 +961,7 @@
</state> </state>
<state key="ProjectJDKs.UI"> <state key="ProjectJDKs.UI">
<settings> <settings>
<last-edited>Python 3.2.3 (/usr/bin/python3)</last-edited> <last-edited>Python 3.3.0 (/usr/bin/python3.3)</last-edited>
<splitter-proportions> <splitter-proportions>
<option name="proportions"> <option name="proportions">
<list> <list>
......
git_command.py
View file @ 7288b06b
...@@ -20,6 +20,7 @@ import subprocess ...@@ -20,6 +20,7 @@ import subprocess
import tempfile import tempfile
from signal import SIGTERM from signal import SIGTERM
from error import GitError from error import GitError
import portable
from repo_trace import REPO_TRACE, IsTrace, Trace from repo_trace import REPO_TRACE, IsTrace, Trace
GIT = 'git' GIT = 'git'
...@@ -79,7 +80,7 @@ class _GitCall(object): ...@@ -79,7 +80,7 @@ class _GitCall(object):
def version(self): def version(self):
p = GitCommand(None, ['--version'], capture_stdout=True) p = GitCommand(None, ['--version'], capture_stdout=True)
if p.Wait() == 0: if p.Wait() == 0:
return str(p.stdout, encoding='UTF-8') return portable.stream2str(p.stdout)
return None return None
def version_tuple(self): def version_tuple(self):
......
git_config.py
View file @ 7288b06b
...@@ -19,6 +19,8 @@ import os ...@@ -19,6 +19,8 @@ import os
import re import re
import subprocess import subprocess
import sys import sys
import portable
try: try:
import threading as _threading import threading as _threading
except ImportError: except ImportError:
...@@ -324,7 +326,7 @@ class GitConfig(object): ...@@ -324,7 +326,7 @@ class GitConfig(object):
capture_stdout = True, capture_stdout = True,
capture_stderr = True) capture_stderr = True)
if p.Wait() == 0: if p.Wait() == 0:
return str(p.stdout, encoding='UTF-8') return portable.stream2str(p.stdout)
else: else:
GitError('git config %s: %s' % (str(args), p.stderr)) GitError('git config %s: %s' % (str(args), p.stderr))
......
portable.py
View file @ 7288b06b
...@@ -10,6 +10,9 @@ import subprocess ...@@ -10,6 +10,9 @@ import subprocess
SYNC_REPO_PROGRAM = False SYNC_REPO_PROGRAM = False
def stream2str(stream):
return str(stream, encoding='UTF-8')
def isLinux(): def isLinux():
if platform.system() == "Windows": if platform.system() == "Windows":
return False return False
......
project.py
View file @ 7288b06b
...@@ -735,7 +735,7 @@ class Project(object): ...@@ -735,7 +735,7 @@ class Project(object):
return 'CLEAN' return 'CLEAN'
out = StatusColoring(self.config) out = StatusColoring(self.config)
if not output_redir == None: if not output_redir is None:
out.redirect(output_redir) out.redirect(output_redir)
out.project('project %-40s', self.relpath + '/') out.project('project %-40s', self.relpath + '/')
...@@ -2019,8 +2019,8 @@ class Project(object): ...@@ -2019,8 +2019,8 @@ class Project(object):
if p.Wait() == 0: if p.Wait() == 0:
out = p.stdout out = p.stdout
if out: if out:
return out[:-1].split('\0') # pylint: disable=W1401 return portable.stream2str(out)[:-1].split('\0') # pylint: disable=W1401
# Backslash is not anomalous # Backslash is not anomalous
return [] return []
def DiffZ(self, name, *args): def DiffZ(self, name, *args):
......
repo.iml
View file @ 7288b06b
...@@ -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.2.3 (/usr/bin/python3)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.3.0 (/usr/bin/python3.3)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Python 3.2.3 (/usr/bin/python3) interpreter library" level="application" />
</component> </component>
</module> </module>
subcmds/cherry_pick.py
View file @ 7288b06b
...@@ -18,6 +18,7 @@ import re ...@@ -18,6 +18,7 @@ import re
import sys import sys
from command import Command from command import Command
from git_command import GitCommand from git_command import GitCommand
import portable
CHANGE_ID_RE = re.compile(r'^\s*Change-Id: I([0-9a-f]{40})\s*$') CHANGE_ID_RE = re.compile(r'^\s*Change-Id: I([0-9a-f]{40})\s*$')
...@@ -55,7 +56,7 @@ change id will be added. ...@@ -55,7 +56,7 @@ change id will be added.
if p.Wait() != 0: if p.Wait() != 0:
print("error: Failed to retrieve old commit message", file=sys.stderr) print("error: Failed to retrieve old commit message", file=sys.stderr)
sys.exit(1) sys.exit(1)
old_msg = self._StripHeader(str(p.stdout, encoding='UTF-8')) old_msg = self._StripHeader(portable.stream2str(p.stdout))
p = GitCommand(None, p = GitCommand(None,
['cherry-pick', sha1], ['cherry-pick', sha1],
......
subcmds/grep.py
View file @ 7288b06b
...@@ -18,6 +18,7 @@ import sys ...@@ -18,6 +18,7 @@ import sys
from color import Coloring from color import Coloring
from command import PagedCommand from command import PagedCommand
from git_command import git_require, GitCommand from git_command import git_require, GitCommand
import portable
class GrepColoring(Coloring): class GrepColoring(Coloring):
def __init__(self, config): def __init__(self, config):
...@@ -210,7 +211,7 @@ contain a line that matches both expressions: ...@@ -210,7 +211,7 @@ contain a line that matches both expressions:
# We cut the last element, to avoid a blank line. # We cut the last element, to avoid a blank line.
# #
r = str(p.stdout, encoding='UTF-8').split('\n') r = portable.stream2str(p.stdout).split('\n')
r = r[0:-1] r = r[0:-1]
if have_rev and full_name: if have_rev and full_name:
......
subcmds/status.py
View file @ 7288b06b
...@@ -142,11 +142,9 @@ the following meanings: ...@@ -142,11 +142,9 @@ the following meanings:
for project in all_projects: for project in all_projects:
sem.acquire() sem.acquire()
class BufList(io.StringIO.StringIO): class BufList(io.StringIO):
def dump(self, ostream): def dump(self, ostream):
for entry in self.buflist: ostream.write(self.getvalue())
ostream.write(entry)
output = BufList() output = BufList()
t = _threading.Thread(target=self._StatusHelper, t = _threading.Thread(target=self._StatusHelper,
......
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