diff options
author | Han-Wen Nienhuys <hanwen@google.com> | 2007-05-23 18:49:35 -0300 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@google.com> | 2007-05-30 13:46:25 -0300 |
commit | ae38e155d0fb9a1d78e21ccc7b453d9b239ff961 (patch) | |
tree | 56f9452f2c824d03e9899f68d62db932131e8681 | |
parent | 49ae8869e7dca9b150c678651f11c72a040c556d (diff) | |
parent | 458e0545cb3dd03af9cd1a61480cbb764639043a (diff) | |
download | hg-fast-export-ae38e155d0fb9a1d78e21ccc7b453d9b239ff961.tar.gz |
Merge origin.
-rwxr-xr-x | git-p4 | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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: |