Skip to content

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

--amend

parent 21987131
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 113 deletions
.idea/workspace.xml
View file @ 62834956
...@@ -2,19 +2,18 @@ ...@@ -2,19 +2,18 @@
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/tests/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/portable-pager.py" afterPath="$PROJECT_DIR$/tests/portable-pager.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/project.py" afterPath="$PROJECT_DIR$/project.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="1363590315380" ignored="false" /> <file path="/Dummy.txt" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363590315380" ignored="false" />
<file path="/main.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363349030501" ignored="false" /> <file path="/main.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363598089701" ignored="false" />
<file path="/portable.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363275619057" 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="1363376027133" ignored="false" /> <file path="/a.dummy" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363594579797" ignored="false" />
<file path="/git_config.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276044335" 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="1363348576953" ignored="false" /> <file path="/project.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363594862967" ignored="false" />
<file path="/fragment.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363277935175" ignored="false" /> <file path="/fragment.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363277935175" 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" />
...@@ -81,14 +80,16 @@ ...@@ -81,14 +80,16 @@
<favorites_list name="git-repo" /> <favorites_list name="git-repo" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.57313997"> <splitter split-orientation="horizontal" split-proportion="0.5163934">
<split-first> <split-first>
<leaf> <leaf>
<file leaf-file-name="linux-pager.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="main.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/tests/linux-pager.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="58" column="11" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.0"> <state line="81" column="21" selection-start="2796" selection-end="2796" vertical-scroll-proportion="0.6992754">
<folding /> <folding>
<element signature="e#625#662#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -96,54 +97,81 @@ ...@@ -96,54 +97,81 @@
<file leaf-file-name="portable-pager.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="portable-pager.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/portable-pager.py"> <entry file="file://$PROJECT_DIR$/tests/portable-pager.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="21" column="9" selection-start="412" selection-end="412" vertical-scroll-proportion="0.0"> <state line="70" column="6" selection-start="1497" selection-end="1497" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="__init__.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="status.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/__init__.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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="168" column="36" selection-start="5850" selection-end="5850" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test.gitconfig" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="project.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/fixtures/test.gitconfig"> <entry file="file://$PROJECT_DIR$/project.py">
<provider selected="true" editor-type-id="text-editor">
<state line="822" column="42" selection-start="26091" selection-end="26091" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#601#638#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="portable.py" pinned="false" current="false" current-in-tab="false">
<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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="12" column="4" selection-start="123" selection-end="123" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="main.py" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="color.py" pinned="false" current="false" current-in-tab="false">
<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="394" column="11" selection-start="12153" selection-end="12153" vertical-scroll-proportion="0.0022547913"> <state line="113" column="11" selection-start="2515" selection-end="2515" vertical-scroll-proportion="0.0">
<folding> <folding />
<element signature="e#625#662#0" expanded="true" /> </state>
</folding> </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="207" column="6" selection-start="5151" selection-end="5151" vertical-scroll-proportion="0.0">
<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">
<state line="56" column="0" selection-start="1613" selection-end="1613" vertical-scroll-proportion="0.0">
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="repo_trace.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="command.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/repo_trace.py"> <entry file="file://$PROJECT_DIR$/command.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="28" column="4" selection-start="806" selection-end="806" vertical-scroll-proportion="0.0"> <state line="200" column="14" selection-start="6280" selection-end="6280" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="select.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="__init__.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$USER_HOME$/.IntelliJIdea12/system/python_stubs/-2066100795/select.py"> <entry file="file://$PROJECT_DIR$/subcmds/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="17" column="0" selection-start="614" selection-end="614" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -156,7 +184,7 @@ ...@@ -156,7 +184,7 @@
<file leaf-file-name="pager.py" pinned="false" current="false" current-in-tab="true"> <file leaf-file-name="pager.py" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pager.py"> <entry file="file://$PROJECT_DIR$/pager.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="61" column="15" selection-start="1537" selection-end="1537" vertical-scroll-proportion="0.518602"> <state line="55" column="4" selection-start="1423" selection-end="1423" vertical-scroll-proportion="0.3327645">
<folding> <folding>
<element signature="e#603#640#0" expanded="true" /> <element signature="e#603#640#0" expanded="true" />
</folding> </folding>
...@@ -193,8 +221,8 @@ ...@@ -193,8 +221,8 @@
<option value="$PROJECT_DIR$/subcmds/grep.py" /> <option value="$PROJECT_DIR$/subcmds/grep.py" />
<option value="$PROJECT_DIR$/color.py" /> <option value="$PROJECT_DIR$/color.py" />
<option value="$PROJECT_DIR$/subcmds/status.py" /> <option value="$PROJECT_DIR$/subcmds/status.py" />
<option value="$PROJECT_DIR$/project.py" />
<option value="$PROJECT_DIR$/tests/linux-pager.py" /> <option value="$PROJECT_DIR$/tests/linux-pager.py" />
<option value="$PROJECT_DIR$/project.py" />
<option value="$PROJECT_DIR$/main.py" /> <option value="$PROJECT_DIR$/main.py" />
</list> </list>
</option> </option>
...@@ -322,6 +350,20 @@ ...@@ -322,6 +350,20 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="git-repo" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="git-repo" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="tests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane"> <pane id="PackagesPane">
...@@ -340,7 +382,7 @@ ...@@ -340,7 +382,7 @@
<property name="MemberChooser.sorted" value="false" /> <property name="MemberChooser.sorted" value="false" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="116" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="116" />
<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/system/python_stubs/-2066100795" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../playground/project" />
<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" />
...@@ -378,7 +420,7 @@ ...@@ -378,7 +420,7 @@
<recent name="$PROJECT_DIR$/tests" /> <recent name="$PROJECT_DIR$/tests" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Python Remote Debug.git-repo remote localhost"> <component name="RunManager" selected="Python.local debug">
<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" />
...@@ -516,6 +558,25 @@ ...@@ -516,6 +558,25 @@
<patterns /> <patterns />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="local debug" type="PythonConfigurationType" factoryName="Python">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="/usr/bin/python3.3" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../playground/project" />
<option name="IS_MODULE_SDK" value="false" />
<module name="repo" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
<option name="PARAMETERS" value="-- --no-pager diff" />
<RunnerSettings RunnerId="PyDebugRunner" />
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="PyDebugRunner" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
<configuration default="false" name="git-repo remote" type="PyRemoteDebugConfigurationType" factoryName="Python Remote Debug"> <configuration default="false" name="git-repo remote" type="PyRemoteDebugConfigurationType" factoryName="Python Remote Debug">
<module name="" /> <module name="" />
<option name="PORT" value="19499" /> <option name="PORT" value="19499" />
...@@ -549,9 +610,10 @@ ...@@ -549,9 +610,10 @@
<ConfigurationWrapper RunnerId="PyRemoteDebugRunner" /> <ConfigurationWrapper RunnerId="PyRemoteDebugRunner" />
<method /> <method />
</configuration> </configuration>
<list size="2"> <list size="3">
<item index="0" class="java.lang.String" itemvalue="Python Remote Debug.git-repo remote" /> <item index="0" class="java.lang.String" itemvalue="Python.local debug" />
<item index="1" class="java.lang.String" itemvalue="Python Remote Debug.git-repo remote localhost" /> <item index="1" class="java.lang.String" itemvalue="Python Remote Debug.git-repo remote" />
<item index="2" class="java.lang.String" itemvalue="Python Remote Debug.git-repo remote localhost" />
</list> </list>
<configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false"> <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
<Host>localhost</Host> <Host>localhost</Host>
...@@ -592,26 +654,26 @@ ...@@ -592,26 +654,26 @@
<window_info id="Changes" 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="Changes" 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="JetGradle" 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="JetGradle" 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="Palette" 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="Palette" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32858709" sideWeight="0.49276412" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32821077" sideWeight="0.48399147" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" 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="Database" 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="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="SBT Console" 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="SBT Console" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3046875" sideWeight="0.99306625" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30406147" sideWeight="0.9375667" order="3" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk 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="IDEtalk 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32924107" sideWeight="0.50217074" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32821077" sideWeight="0.5122732" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="IDEtalk" 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="IDEtalk" 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="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="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.15368196" sideWeight="0.4731654" 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.15368196" sideWeight="0.3172338" 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.15368196" sideWeight="0.5191676" 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.15368196" sideWeight="0.34687155" 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.32930845" 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" />
<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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout> </layout>
...@@ -698,14 +760,9 @@ ...@@ -698,14 +760,9 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="python-line"> <line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url> <url>file://$PROJECT_DIR$/main.py</url>
<line>392</line> <line>416</line>
<option name="timeStamp" value="18" /> <option name="timeStamp" value="18" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>142</line>
<option name="timeStamp" value="20" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line"> <line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/subcmds/sync.py</url> <url>file://$PROJECT_DIR$/subcmds/sync.py</url>
<line>226</line> <line>226</line>
...@@ -742,9 +799,14 @@ ...@@ -742,9 +799,14 @@
<option name="timeStamp" value="37" /> <option name="timeStamp" value="37" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="python-line"> <line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/pager.py</url> <url>file://$PROJECT_DIR$/main.py</url>
<line>25</line> <line>157</line>
<option name="timeStamp" value="38" /> <option name="timeStamp" value="40" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>410</line>
<option name="timeStamp" value="42" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<breakpoints-dialog> <breakpoints-dialog>
...@@ -757,7 +819,7 @@ ...@@ -757,7 +819,7 @@
</properties> </properties>
</breakpoint> </breakpoint>
</default-breakpoints> </default-breakpoints>
<option name="time" value="39" /> <option name="time" value="45" />
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">
...@@ -765,106 +827,118 @@ ...@@ -765,106 +827,118 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/git_command.py"> <entry file="file://$USER_HOME$/.IntelliJIdea12/system/python_stubs/-2066100795/select.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="82" column="41" selection-start="2019" selection-end="2019" vertical-scroll-proportion="0.31944445" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/git_config.py"> <entry file="file://$PROJECT_DIR$/tests/linux-pager.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="328" column="41" selection-start="8344" selection-end="8344" vertical-scroll-proportion="0.0" /> <state line="58" column="11" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/color.py"> <entry file="file://$PROJECT_DIR$/tests/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="125" column="0" selection-start="2758" selection-end="2758" vertical-scroll-proportion="0.0" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/subcmds/diff.py"> <entry file="file://$PROJECT_DIR$/tests/fixtures/test.gitconfig">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="39" column="0" selection-start="1368" selection-end="1368" vertical-scroll-proportion="0.0" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/subcmds/status.py"> <entry file="file://$PROJECT_DIR$/repo_trace.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="139" column="0" selection-start="4844" selection-end="4844" vertical-scroll-proportion="0.0"> <state line="28" column="4" selection-start="806" selection-end="806" 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/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="811" column="0" selection-start="25730" selection-end="25730" vertical-scroll-proportion="0.0"> <state line="17" column="0" selection-start="614" selection-end="614" 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:///usr/lib/python3.3/_weakrefset.py"> <entry file="file://$PROJECT_DIR$/command.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="200" column="14" selection-start="6280" selection-end="6280" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/subcmds/manifest.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="51" column="15" selection-start="1618" selection-end="1618" vertical-scroll-proportion="0.0" /> <state line="56" column="0" selection-start="1613" selection-end="1613" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/.IntelliJIdea12/system/python_stubs/-2066100795/select.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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="168" column="36" selection-start="5850" selection-end="5850" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/tests/linux-pager.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="58" column="11" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.0"> <state line="113" column="11" selection-start="2515" selection-end="2515" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pager.py"> <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="61" column="15" selection-start="1537" selection-end="1537" vertical-scroll-proportion="0.518602"> <state line="207" column="6" selection-start="5151" selection-end="5151" 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://$PROJECT_DIR$/tests/__init__.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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="12" column="4" selection-start="123" selection-end="123" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/tests/fixtures/test.gitconfig"> <entry file="file://$PROJECT_DIR$/pager.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="55" column="4" selection-start="1423" selection-end="1423" vertical-scroll-proportion="0.3327645">
<folding /> <folding>
<element signature="e#603#640#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/tests/portable-pager.py"> <entry file="file://$PROJECT_DIR$/tests/portable-pager.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="21" column="9" selection-start="412" selection-end="412" vertical-scroll-proportion="0.0"> <state line="70" column="6" selection-start="1497" selection-end="1497" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/repo_trace.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="28" column="4" selection-start="806" selection-end="806" vertical-scroll-proportion="0.0"> <state line="822" column="42" selection-start="26091" selection-end="26091" 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$/main.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="394" column="11" selection-start="12153" selection-end="12153" vertical-scroll-proportion="0.0022547913"> <state line="81" column="21" selection-start="2796" selection-end="2796" vertical-scroll-proportion="0.6992754">
<folding> <folding>
<element signature="e#625#662#0" expanded="true" /> <element signature="e#625#662#0" expanded="true" />
</folding> </folding>
......
main.py
View file @ 62834956
...@@ -51,7 +51,7 @@ if portable.isLinux(): ...@@ -51,7 +51,7 @@ if portable.isLinux():
#os.environ['GIT_PAGER'] = 'less' #os.environ['GIT_PAGER'] = 'less'
pass pass
else: else:
os.environ['GIT_PAGER'] = '' os.environ['GIT_PAGER'] = 'less'
...@@ -74,6 +74,20 @@ global_options.add_option('--version', ...@@ -74,6 +74,20 @@ global_options.add_option('--version',
dest='show_version', action='store_true', dest='show_version', action='store_true',
help='display this version of repo') help='display this version of repo')
def _UsePager(name, cmd, gopts, copts):
if not gopts.no_pager and not isinstance(cmd, InteractiveCommand):
config = cmd.manifest.globalConfig
if gopts.pager:
use_pager = True
else:
use_pager = config.GetBoolean('pager.%s' % name)
if use_pager is None:
use_pager = cmd.WantPager(copts)
return use_pager
else:
return False
class _Repo(object): class _Repo(object):
def __init__(self, repodir): def __init__(self, repodir):
self.repodir = repodir self.repodir = repodir
...@@ -81,8 +95,7 @@ class _Repo(object): ...@@ -81,8 +95,7 @@ class _Repo(object):
# add 'branch' as an alias for 'branches' # add 'branch' as an alias for 'branches'
all_commands['branch'] = all_commands['branches'] all_commands['branch'] = all_commands['branches']
def _Run(self, argv): def _Config(self, argv):
result = 0
name = None name = None
glob = [] glob = []
...@@ -97,6 +110,7 @@ class _Repo(object): ...@@ -97,6 +110,7 @@ class _Repo(object):
glob = argv glob = argv
name = 'help' name = 'help'
argv = [] argv = []
gopts, _gargs = global_options.parse_args(glob) gopts, _gargs = global_options.parse_args(glob)
if gopts.trace: if gopts.trace:
...@@ -127,16 +141,19 @@ class _Repo(object): ...@@ -127,16 +141,19 @@ class _Repo(object):
copts, cargs = cmd.OptionParser.parse_args(argv) copts, cargs = cmd.OptionParser.parse_args(argv)
copts = cmd.ReadEnvironmentOptions(copts) copts = cmd.ReadEnvironmentOptions(copts)
if not gopts.no_pager and not isinstance(cmd, InteractiveCommand): self.config = name, cmd, gopts, _gargs, copts, cargs, argv
return 0
def _Run(self):
if self.config:
(name, cmd, gopts, _gargs, copts, cargs, argv) = self.config
else:
print("repo was not configured, run _Config(argv) before calling _Run(..)")
return 1
if portable.isLinux() and _UsePager(name, cmd, gopts, copts):
config = cmd.manifest.globalConfig config = cmd.manifest.globalConfig
if gopts.pager: RunPager(config)
use_pager = True
else:
use_pager = config.GetBoolean('pager.%s' % name)
if use_pager is None:
use_pager = cmd.WantPager(copts)
if use_pager:
RunPager(config)
start = time.time() start = time.time()
try: try:
...@@ -389,6 +406,13 @@ def _Debug(host, env): ...@@ -389,6 +406,13 @@ def _Debug(host, env):
sys.stderr.write("Error: you must add pydevd in a pysrc folder (e.g. in eclipse plugin) to your PYTHONPATH.\n") sys.stderr.write("Error: you must add pydevd in a pysrc folder (e.g. in eclipse plugin) to your PYTHONPATH.\n")
sys.exit(1) sys.exit(1)
def _WindowsPager(repo):
(name, cmd, gopts, _gargs, copts, cargs, argv) = repo.config
if _UsePager(name, cmd, gopts, copts):
print("USE PAGER")
return True
return False
def _Main(argv): def _Main(argv):
result = 0 result = 0
...@@ -402,13 +426,10 @@ def _Main(argv): ...@@ -402,13 +426,10 @@ def _Main(argv):
opt.add_option("-d", "--debug", action="store_true", dest="debug", default=False) opt.add_option("-d", "--debug", action="store_true", dest="debug", default=False)
opt.add_option("--debug-host", dest="debug_host", default='localhost') opt.add_option("--debug-host", dest="debug_host", default='localhost')
opt.add_option("--debug-env", dest="debug_env", default="intellij") opt.add_option("--debug-env", dest="debug_env", default="intellij")
_PruneOptions(argv, opt) _PruneOptions(argv, opt)
opt, argv = opt.parse_args(argv) opt, argv = opt.parse_args(argv)
if opt.debug:
print("enter debug mode, host %s" % opt.debug_host)
_Debug(opt.debug_host, opt.debug_env)
_CheckWrapperVersion(opt.wrapper_version, opt.wrapper_path) _CheckWrapperVersion(opt.wrapper_version, opt.wrapper_path)
_CheckRepoDir(opt.repodir) _CheckRepoDir(opt.repodir)
...@@ -416,11 +437,20 @@ def _Main(argv): ...@@ -416,11 +437,20 @@ def _Main(argv):
Version.wrapper_path = opt.wrapper_path Version.wrapper_path = opt.wrapper_path
repo = _Repo(opt.repodir) repo = _Repo(opt.repodir)
repo._Config(argv)
if not portable.isLinux():
if _WindowsPager(repo):
exit(0);
if opt.debug:
print("enter debug mode, host %s" % opt.debug_host)
_Debug(opt.debug_host, opt.debug_env)
try: try:
try: try:
init_ssh() init_ssh()
init_http() init_http()
result = repo._Run(argv) or 0 result = repo._Run() or 0
finally: finally:
close_ssh() close_ssh()
except KeyboardInterrupt: except KeyboardInterrupt:
......
project.py
View file @ 62834956
...@@ -716,7 +716,7 @@ class Project(object): ...@@ -716,7 +716,7 @@ class Project(object):
output: If specified, redirect the output to this object. output: If specified, redirect the output to this object.
""" """
if not os.path.isdir(self.worktree): if not os.path.isdir(self.worktree):
if output_redir == None: if output_redir is None:
output_redir = sys.stdout output_redir = sys.stdout
print(file=output_redir) print(file=output_redir)
print('project %s/' % self.relpath, file=output_redir) print('project %s/' % self.relpath, file=output_redir)
...@@ -2036,11 +2036,11 @@ class Project(object): ...@@ -2036,11 +2036,11 @@ class Project(object):
out = p.process.stdout.read() out = p.process.stdout.read()
r = {} r = {}
if out: if out:
out = iter(out[:-1].split('\0')) # pylint: disable=W1401 out = iter(portable.stream2str(out)[:-1].split('\0')) # pylint: disable=W1401
while out: while out:
try: try:
info = out.next() info = out.__next__()
path = out.next() path = out.__next__()
except StopIteration: except StopIteration:
break break
...@@ -2193,7 +2193,7 @@ class Project(object): ...@@ -2193,7 +2193,7 @@ class Project(object):
self._project.name, self._project.name,
name, name,
p.stderr)) p.stderr))
r = str(p.stdout, encoding='UTF-8') r = portable.stream2str(p.stdout)
if r.endswith('\n') and r.index('\n') == len(r) - 1: if r.endswith('\n') and r.index('\n') == len(r) - 1:
return r[:-1] return r[:-1]
return r return r
......
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