From: Marius Storm-Olsen Date: Fri, 13 Jul 2007 12:39:05 +0000 (+0200) Subject: Fix git-p4 on Windows to not use the Posix sysconf function. X-Git-Tag: v1.5.3-rc2~6^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/48b4c3d5ab1610c6dc0198fe94334d78e8a82e16?ds=inline;hp=--cc Fix git-p4 on Windows to not use the Posix sysconf function. Add condition for Windows, since it doesn't support the os.sysconf module. We hardcode the commandline limit to 2K, as that should work on most Windows platforms. Signed-off-by: Marius Storm-Olsen Acked-by: Simon Hausmann Signed-off-by: Shawn O. Pearce --- 48b4c3d5ab1610c6dc0198fe94334d78e8a82e16 diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 54a05eb99c..d877150f41 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -717,7 +717,11 @@ class P4Sync(Command): # POSIX says it's 4096 bytes, default for Linux seems to be 130 K. # and all OS from the table below seems to be higher than POSIX. # See http://www.in-ulm.de/~mascheck/various/argmax/ - argmax = min(4000, os.sysconf('SC_ARG_MAX')) + if (self.isWindows): + argmax = 2000 + else: + argmax = min(4000, os.sysconf('SC_ARG_MAX')) + chunk = '' filedata = [] for i in xrange(len(files)):