summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhg-fast-export.py6
-rwxr-xr-xhg2git.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/hg-fast-export.py b/hg-fast-export.py
index e213782..0e0fa87 100755
--- a/hg-fast-export.py
+++ b/hg-fast-export.py
@@ -22,9 +22,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 bdf250f..dedfd95 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()