@@ -29,19 +29,21 @@ def debug(string): if DEBUG: print(string) -def git_exec(cmd, env=None): - return popen('git', cmd, GIT_DIR, env=env) +def git_exec(cmd, **args): + return popen('git', cmd, GIT_DIR, **args) def cc_exec(cmd): return popen('cleartool', cmd, CC_DIR) -def popen(exe, cmd, cwd, env=None): +def popen(exe, cmd, cwd, env=None, decode=True): cmd.insert(0, exe) if DEBUG: debug('> ' + ' '.join(cmd)) input = Popen(cmd, cwd=cwd, stdout=PIPE, env=env).stdout.read() - input = input.decode() - return input if v30 else str(input) + if decode: + input = input.decode() + input = input if v30 else str(input) + return input def tag(tag, id="HEAD"): git_exec(['tag', '-f', tag, id]) common.py @@ -7,7 +7,7 @@ class Status: def setFile(self, file): self.file = file def cat(self): - blob = git_exec(['cat-file', 'blob', getBlob(self.id, self.file)]) + blob = git_exec(['cat-file', 'blob', getBlob(self.id, self.file)], decode=False) write(join(CC_DIR, self.file), blob) def stageDirs(self, t): dir = dirname(self.file) status.py ff5b9df9293e067f4ff6add24235706f90c57942 Charles O'Farrell charleso@charleso.org http://github.com/charleso/git-cc/commit/2d3338b5121430bc54003da3ea948ead443299a2 2d3338b5121430bc54003da3ea948ead443299a2 2009-01-27T14:08:01-08:00 2009-01-27T14:08:01-08:00 Fixed checkin for Python3.0 and stupid decoding of cat-file output 2ba037aabefcde497eb3380f56d8a02fa67d25ee Charles O'Farrell charleso@charleso.org