mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 01:56:15 +02:00
Code

cleanup 

- use re.sub() iso. if for stripping ...
- spacing nits

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
Han-Wen Nienhuys 2007-05-23 17:14:33 -03:00
parent b016d39756
commit bce4c5fc0b
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
contrib/fast-import/git-p4
View File

@ -16,39 +16,39 @@ from sets import Set;
gitdir = os.environ.get("GIT_DIR", "")
silent = False
def write_pipe (c, str):
def write_pipe(c, str):
if not silent:
sys.stderr.write ('writing pipe: %s\n' % c)
sys.stderr.write('writing pipe: %s\n' % c)
## todo: check return status
pipe = os.popen (c, 'w')
pipe = os.popen(c, 'w')
val = pipe.write(str)
if pipe.close ():
sys.stderr.write ('Command failed')
sys.exit (1)
if pipe.close():
sys.stderr.write('Command failed')
sys.exit(1)
return val
def read_pipe (c):
sys.stderr.write ('reading pipe: %s\n' % c)
def read_pipe(c):
sys.stderr.write('reading pipe: %s\n' % c)
## todo: check return status
pipe = os.popen (c, 'rb')
pipe = os.popen(c, 'rb')
val = pipe.read()
if pipe.close ():
sys.stderr.write ('Command failed')
sys.exit (1)
if pipe.close():
sys.stderr.write('Command failed')
sys.exit(1)
return val
def read_pipe_lines (c):
sys.stderr.write ('reading pipe: %s\n' % c)
def read_pipe_lines(c):
sys.stderr.write('reading pipe: %s\n' % c)
## todo: check return status
pipe = os.popen (c, 'rb')
pipe = os.popen(c, 'rb')
val = pipe.readlines()
if pipe.close ():
sys.stderr.write ('Command failed')
sys.exit (1)
if pipe.close():
sys.stderr.write('Command failed')
sys.exit(1)
return val
@ -986,9 +986,7 @@ class P4Sync(Command):
elif len(self.previousDepotPath) == 0:
self.revision = "#head"
if self.depotPath.endswith("..."):
self.depotPath = self.depotPath[:-3]
self.depotPath = re.sub ("\.\.\.$", "", self.depotPath)
if not self.depotPath.endswith("/"):
self.depotPath += "/"