Merge branch 'upstream'

2 files changed, 5 insertions, 5 deletions

diff --git a/hg-fast-export.py b/hg-fast-export.py
index 2da0289..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):
@@ -140,7 +140,7 @@ def sanitize_name(name,what="branch"):
   n=name
   p=re.compile('([[ ~^:?*]|\.\.)')
   n=p.sub('_', n)
-  if n[-1] == '/': n=n[:-1]+'_'
+  if n[-1] in ('/', '.'): n=n[:-1]+'_'
   n='/'.join(map(dot,n.split('/')))
   p=re.compile('_+')
   n=p.sub('_', n)
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()