--amend

main.py

@@ -411,10 +411,7 @@ def _WindowsPager(repo):
     args2 = args[argsSplit+1:]
     pager = _SelectPager(cmd.manifest.globalConfig)
     shellCommand = "%s %s %s -- --piped-into-pager --no-pager %s | %s" % (python, thisScript, ' '.join(args1), ' '.join(args2), pager)
-    print("NEW 2")
     subprocess.call(shellCommand, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    #sys.stdin.close()
-    print("DONE")
     return True
   else:
     # set global variable if output is piped into pager; means that pager is simulated, this
@@ -482,7 +479,8 @@ def _Main(argv):
     argv = list(sys.argv)
     argv.extend(rce.extra_args)
     try:
-      os.execv(__file__, argv)
+      argv.insert(0, __file__)
+      subprocess.call(argv)
     except OSError as e:
       print('fatal: cannot restart repo after upgrade', file=sys.stderr)
       print('fatal: %s' % e, file=sys.stderr)

portable.py

@@ -44,8 +44,7 @@ def os_link(src, dst):
       dst = toWindowsPath(dst)
       # symlink does create soft links in windows for directories => use mklink
       # call windows cmd tool 'mklink' from git bash (mingw)
-      p = subprocess.Popen('cmd /c mklink /J %s %s' % (dst, src))
-      p.communicate()
+      subprocess.Popen('cmd /c mklink /J %s %s' % (dst, src))
     else:
       # requires paths in relation to current dir (not in relation to target file)
       src = toUnixPath(src)

repo.iml

@@ -18,6 +18,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Python 3.3.0 (C:/Python33/python.exe)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Python 3.3.0 (C:/Python33/python.exe) interpreter library" level="application" />
   </component>
 </module>