From 4ce8835d110a1e379b124af0fff003a39696164c Mon Sep 17 00:00:00 2001 From: Daniel Harding Date: Wed, 21 Mar 2012 23:16:11 +0000 Subject: [PATCH] Make hg-fast-export work on Windows * use sys.stdout.write instead of print to avoid end-of-line issues * use os.devnull instead of hard-coding /dev/null --- hg-fast-export.py | 6 +++--- hg2git.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hg-fast-export.py b/hg-fast-export.py index 49b2add..076d432 100755 --- a/hg-fast-export.py +++ b/hg-fast-export.py @@ -23,9 +23,9 @@ def gitmode(flags): return 'l' in flags and '120000' or 'x' in flags and '100755' or '100644' def wr(msg=''): - if msg == None: - msg = '' - print msg + if msg: + sys.stdout.write(msg) + sys.stdout.write('\n') #map(lambda x: sys.stderr.write('\t[%s]\n' % x),msg.split('\n')) def checkpoint(count): diff --git a/hg2git.py b/hg2git.py index ecaac17..9c76dc8 100755 --- a/hg2git.py +++ b/hg2git.py @@ -102,7 +102,7 @@ def save_cache(filename,cache): def get_git_sha1(name,type='heads'): try: # use git-rev-parse to support packed refs - cmd="GIT_DIR='%s' git rev-parse --verify refs/%s/%s 2>/dev/null" % (os.getenv('GIT_DIR','/dev/null'),type,name) + cmd="git rev-parse --verify refs/%s/%s 2>%s" % (type,name,os.devnull) p=os.popen(cmd) l=p.readline() p.close() -- 2.11.4.GIT