Mercurial > hg-git

changeset 188:5d48a2310e16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use mercurial.node.bin instead of dulwich.objects.hex_to_sha
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Fri, 19 Jun 2009 16:53:39 +0100
parents 5f196f80ffb3
children a7a5e94614a2
files git_handler.py
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/git_handler.py	Thu Jun 18 22:38:09 2009 +0100
+++ b/git_handler.py	Fri Jun 19 16:53:39 2009 +0100
@@ -4,7 +4,7 @@
 from dulwich.client import SimpleFetchGraphWalker
 from hgext import bookmarks
 from mercurial.i18n import _
-from mercurial.node import hex, nullid
+from mercurial.node import hex, bin, nullid
 from mercurial import context
 from dulwich.misc import make_sha
 from dulwich.objects import (
@@ -12,7 +12,6 @@
     Commit,
     Tag,
     Tree,
-    hex_to_sha,
     format_timezone,
     )
 
@@ -757,7 +756,7 @@
                           if ref.startswith('refs/heads/')])
 
             for head, sha in heads.iteritems():
-                hgsha = hex_to_sha(self.map_hg_get(sha))
+                hgsha = bin(self.map_hg_get(sha))
                 if not head in bms:
                     # new branch
                     bms[head] = hgsha
@@ -778,7 +777,7 @@
                       if ref.startswith('refs/heads/')])
 
         for head, sha in heads.iteritems():
-            hgsha = hex_to_sha(self.map_hg_get(sha))
+            hgsha = bin(self.map_hg_get(sha))
             tag = '%s/%s' % (remote_name, head)
             self.repo.tag(tag, hgsha, '', True, None, None)