summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-26 16:12:35 -0500
committerJunio C Hamano <gitster@pobox.com>2013-04-26 15:20:27 -0700
commit6134caf2c10b9cd0df431fdefcf145984aeb80e3 (patch)
tree16e3f83e622db3b3a6de764f7d3dcd2888d1146c
parentaa9384566161a242ad0ca2563e613736edf38fe9 (diff)
downloadgit-6134caf2c10b9cd0df431fdefcf145984aeb80e3.tar.gz
remote-hg: use hashlib instead of hg sha1 util
To be in sync with remote-bzr. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 80b3606737..06920f28f2 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -22,7 +22,7 @@ import shutil
import subprocess
import urllib
import atexit
-import urlparse
+import urlparse, hashlib
#
# If you want to switch to hg-git compatibility mode:
@@ -933,7 +933,7 @@ def main(args):
if alias[4:] == url:
is_tmp = True
- alias = util.sha1(alias).hexdigest()
+ alias = hashlib.sha1(alias).hexdigest()
else:
is_tmp = False