diff options
| author | Han-Wen Nienhuys <hanwen@google.com> | 2007-05-23 21:49:35 (GMT) |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@google.com> | 2007-05-30 16:46:25 (GMT) |
| commit | 5e926eed9fb8746e762bdb147f35d44c7a65321e (patch) | |
| tree | 2e41bae8451b737a4ffe2fa28a94ca39123d81a3 /contrib/fast-import | |
| parent | bb6e09b27afeaae780dabfda7a07d59fc7efc4cf (diff) | |
| parent | cfeb59be256bf9cd2853ed04d4af056b2f0eff31 (diff) | |
| download | git-5e926eed9fb8746e762bdb147f35d44c7a65321e.zip git-5e926eed9fb8746e762bdb147f35d44c7a65321e.tar.gz git-5e926eed9fb8746e762bdb147f35d44c7a65321e.tar.bz2 | |
Merge origin.
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index b280e97..28ea53d 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -24,7 +24,7 @@ def write_pipe(c, str): pipe = os.popen(c, 'w') val = pipe.write(str) if pipe.close(): - sys.stderr.write('Command %s failed\n' % c) + sys.stderr.write('Command failed: %s' % c) sys.exit(1) return val @@ -36,7 +36,7 @@ def read_pipe(c, ignore_error=False): pipe = os.popen(c, 'rb') val = pipe.read() if pipe.close() and not ignore_error: - sys.stderr.write('Command %s failed\n' % c) + sys.stderr.write('Command failed: %s\n' % c) sys.exit(1) return val @@ -49,7 +49,7 @@ def read_pipe_lines(c): pipe = os.popen(c, 'rb') val = pipe.readlines() if pipe.close(): - sys.stderr.write('Command %s failed\n' % c) + sys.stderr.write('Command failed: %s\n' % c) sys.exit(1) return val @@ -878,8 +878,8 @@ class P4Sync(Command): cmdline += " --branches" for line in read_pipe_lines(cmdline): - lie = line.strip() - if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD\n"): + line = line.strip() + if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD"): continue if self.importIntoRemotes: |