diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2007-07-13 14:39:05 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-14 22:47:14 -0400 |
| commit | 48b4c3d5ab1610c6dc0198fe94334d78e8a82e16 (patch) | |
| tree | de029228b82144bbc8f09d56ab5408b52f990bec | |
| parent | c7bd55028ff463fa0162bffb35ac519beb462ca5 (diff) | |
| download | git-48b4c3d5ab1610c6dc0198fe94334d78e8a82e16.tar.gz git-48b4c3d5ab1610c6dc0198fe94334d78e8a82e16.tar.xz | |
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 <marius@trolltech.com>
Acked-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 54a05eb99..d877150f4 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)): |