Skip to content

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

removed repo program update + sync is working for single project

parent 7bf91ad2
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 94 deletions
.gitignore
View file @ ef40ad0e
bin
*.pyc
.repopickle_*
.idea/workspace.xml
View file @ ef40ad0e
......@@ -2,22 +2,21 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/git_config.py" afterPath="$PROJECT_DIR$/git_config.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/manifest_xml.py" afterPath="$PROJECT_DIR$/manifest_xml.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/portable.py" afterPath="$PROJECT_DIR$/portable.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/project.py" afterPath="$PROJECT_DIR$/project.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/sync.py" afterPath="$PROJECT_DIR$/subcmds/sync.py" />
</list>
<ignored path="git-repo.iws" />
<ignored path=".idea/workspace.xml" />
<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="/portable.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363269358737" ignored="false" />
<file path="/portable.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363271256570" 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="/git_config.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363257894873" ignored="false" />
<file path="/project.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363267908069" ignored="false" />
<file path="/fragment.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363268737830" 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" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -87,55 +86,55 @@
</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">
<file leaf-file-name="sync.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/subcmds/sync.py">
<provider selected="true" editor-type-id="text-editor">
<state line="214" column="0" selection-start="5302" selection-end="5302" vertical-scroll-proportion="0.0">
<state line="588" column="35" selection-start="21092" selection-end="21092" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="upload.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/subcmds/upload.py">
<file leaf-file-name="progress.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/progress.py">
<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="59" column="0" selection-start="1551" selection-end="1551" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="git_config.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/git_config.py">
<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">
<state line="539" column="0" selection-start="13912" selection-end="13912" vertical-scroll-proportion="0.0">
<state line="25" column="0" selection-start="352" selection-end="352" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="project.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/project.py">
<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="1980" column="0" selection-start="60715" selection-end="60715" vertical-scroll-proportion="0.0">
<state line="223" column="16" selection-start="5637" selection-end="5637" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="manifest_xml.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/manifest_xml.py">
<file leaf-file-name="git_config.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/git_config.py">
<provider selected="true" editor-type-id="text-editor">
<state line="136" column="0" selection-start="4090" selection-end="4090" vertical-scroll-proportion="0.0">
<state line="511" column="0" selection-start="13273" selection-end="13273" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="init.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/subcmds/init.py">
<file leaf-file-name="project.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/project.py">
<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="1980" column="0" selection-start="60715" selection-end="60715" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
......@@ -144,16 +143,7 @@
<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="87" column="0" selection-start="2440" selection-end="2440" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="portable.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/portable.py">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="59" selection-start="823" selection-end="823" vertical-scroll-proportion="0.7135417">
<state line="77" column="0" selection-start="2177" selection-end="2177" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
......@@ -182,6 +172,7 @@
<option value="$PROJECT_DIR$/project.py" />
<option value="$PROJECT_DIR$/manifest_xml.py" />
<option value="$PROJECT_DIR$/portable.py" />
<option value="$PROJECT_DIR$/subcmds/sync.py" />
</list>
</option>
</component>
......@@ -340,6 +331,7 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="916" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="916" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="121" />
<property name="GoToClass.includeJavaFiles" value="false" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="118" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="WebServerToolWindowFactoryState" value="false" />
......@@ -367,7 +359,7 @@
<PyConsoleSettings />
</option>
</component>
<component name="RunManager" selected="Python Remote Debug.git-repo remote localhost">
<component name="RunManager" selected="Python Remote Debug.git-repo remote">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
......@@ -665,26 +657,6 @@
<line>1968</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>440</line>
<option name="timeStamp" value="7" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/git_command.py</url>
<line>221</line>
<option name="timeStamp" value="8" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/git_command.py</url>
<line>214</line>
<option name="timeStamp" value="10" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>386</line>
<option name="timeStamp" value="11" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/project.py</url>
<line>1980</line>
......@@ -702,9 +674,39 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/portable.py</url>
<line>23</line>
<line>25</line>
<option name="timeStamp" value="17" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>386</line>
<option name="timeStamp" value="18" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>136</line>
<option name="timeStamp" value="20" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/subcmds/sync.py</url>
<line>226</line>
<option name="timeStamp" value="23" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/subcmds/sync.py</url>
<line>586</line>
<option name="timeStamp" value="26" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/subcmds/sync.py</url>
<line>588</line>
<option name="timeStamp" value="27" />
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/project.py</url>
<line>1045</line>
<option name="timeStamp" value="28" />
</line-breakpoint>
</breakpoints>
<breakpoints-dialog>
<breakpoints-dialog />
......@@ -716,7 +718,7 @@
</properties>
</breakpoint>
</default-breakpoints>
<option name="time" value="18" />
<option name="time" value="29" />
</breakpoint-manager>
</component>
<component name="antWorkspaceConfiguration">
......@@ -724,116 +726,116 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file:///usr/lib/python3.3/imp.py">
<entry file="file:///usr/lib/python3.2/os.py">
<provider selected="true" editor-type-id="text-editor">
<state line="108" column="0" selection-start="3227" selection-end="3227" vertical-scroll-proportion="0.5913669" />
<state line="485" column="0" selection-start="15715" selection-end="15715" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.pydevproject">
<entry file="file:///usr/lib/python3.2/_weakrefset.py">
<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="78" column="0" selection-start="2178" selection-end="2178" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/repo_trace.py">
<entry file="file://$PROJECT_DIR$/subcmds/upload.py">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="14" selection-start="799" selection-end="799" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#603#640#0" expanded="true" />
</folding>
<state line="332" column="26" selection-start="11643" selection-end="11643" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file:///usr/lib/python3.2/threading.py">
<entry file="file://$PROJECT_DIR$/.pylintrc">
<provider selected="true" editor-type-id="text-editor">
<state line="645" column="0" selection-start="20728" selection-end="20728" vertical-scroll-proportion="0.0">
<state line="22" column="7" selection-start="664" selection-end="664" vertical-scroll-proportion="0.33271718">
<folding />
</state>
</provider>
</entry>
<entry file="file:///usr/lib/python3.2/os.py">
<entry file="file://$PROJECT_DIR$/subcmds/init.py">
<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="225" column="14" selection-start="8162" selection-end="8162" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file:///usr/lib/python3.2/_weakrefset.py">
<entry file="file://$PROJECT_DIR$/manifest_xml.py">
<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="332" column="0" selection-start="10095" selection-end="10095" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/subcmds/upload.py">
<entry file="file://$PROJECT_DIR$/git_command.py">
<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="223" column="16" selection-start="5637" selection-end="5637" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.pylintrc">
<entry file="file://$PROJECT_DIR$/command.py">
<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="65" column="0" selection-start="1925" selection-end="1925" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py">
<entry file="file:///usr/lib/python3.3/threading.py">
<provider selected="true" editor-type-id="text-editor">
<state line="136" column="0" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#625#662#0" expanded="true" />
</folding>
<state line="610" column="52" selection-start="19409" selection-end="19409" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/git_config.py">
<provider selected="true" editor-type-id="text-editor">
<state line="539" column="0" selection-start="13912" selection-end="13912" vertical-scroll-proportion="0.0">
<state line="511" column="0" selection-start="13273" selection-end="13273" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/subcmds/init.py">
<entry file="file://$PROJECT_DIR$/progress.py">
<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="59" column="0" selection-start="1551" selection-end="1551" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file:///usr/lib/python3.3/_weakrefset.py">
<provider selected="true" editor-type-id="text-editor">
<state line="87" column="0" selection-start="2440" selection-end="2440" vertical-scroll-proportion="0.0">
<state line="77" column="0" selection-start="2177" selection-end="2177" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/project.py">
<entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor">
<state line="1980" column="0" selection-start="60715" selection-end="60715" vertical-scroll-proportion="0.0">
<folding />
<state line="136" column="0" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#625#662#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/git_command.py">
<entry file="file://$PROJECT_DIR$/subcmds/sync.py">
<provider selected="true" editor-type-id="text-editor">
<state line="214" column="0" selection-start="5302" selection-end="5302" vertical-scroll-proportion="0.0">
<state line="588" column="35" selection-start="21092" selection-end="21092" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/manifest_xml.py">
<entry file="file://$PROJECT_DIR$/portable.py">
<provider selected="true" editor-type-id="text-editor">
<state line="136" column="0" selection-start="4090" selection-end="4090" vertical-scroll-proportion="0.0">
<state line="25" column="0" selection-start="352" selection-end="352" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/portable.py">
<entry file="file://$PROJECT_DIR$/project.py">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="59" selection-start="823" selection-end="823" vertical-scroll-proportion="0.7135417">
<state line="1980" column="0" selection-start="60715" selection-end="60715" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
......
portable.py
View file @ ef40ad0e
......@@ -8,6 +8,8 @@ import os
import platform
import subprocess
SYNC_REPO_PROGRAM = False
def isLinux():
if platform.system() == "Windows":
return False
......
subcmds/sync.py
View file @ ef40ad0e
......@@ -31,6 +31,7 @@ import xmlrpc
import threading as _threading
#except ImportError:
# import dummy_threading as _threading
import portable
try:
import resource
......@@ -578,13 +579,16 @@ later is required to fix a server side protocol bug.
if not opt.local_only:
to_fetch = []
now = time.time()
if _ONE_DAY_S <= (now - rp.LastFetch):
if portable.SYNC_REPO_PROGRAM and _ONE_DAY_S <= (now - rp.LastFetch):
to_fetch.append(rp)
to_fetch.extend(all_projects)
to_fetch.sort(key=self._fetch_times.Get, reverse=True)
fetched = self._Fetch(to_fetch, opt)
if portable.SYNC_REPO_PROGRAM:
_PostRepoFetch(rp, opt.no_repo_verify)
if opt.network_only:
# bail out now; the rest touches the working tree
return
......
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