# HG changeset patch
# User mpm@selenic.com
# Date 1125179000 25200
# Node ID d62130f99a73db899a738d82cf44f32595da7d92
# Parent  1bca39b8561524a4f51f14d40e826cd77ca4e970
Move hash function back to revlog from node



diff -r 1bca39b85615 -r d62130f99a73 mercurial/node.py
--- a/mercurial/node.py	Sat Aug 27 14:31:41 2005 -0700
+++ b/mercurial/node.py	Sat Aug 27 14:43:20 2005 -0700
@@ -19,18 +19,3 @@
 
 def short(node):
     return hex(node[:6])
-
-def hash(text, p1, p2):
-    """generate a hash from the given text and its parent hashes
-
-    This hash combines both the current file contents and its history
-    in a manner that makes it easy to distinguish nodes with the same
-    content in the revision graph.
-    """
-    l = [p1, p2]
-    l.sort()
-    s = sha.new(l[0])
-    s.update(l[1])
-    s.update(text)
-    return s.digest()
-
diff -r 1bca39b85615 -r d62130f99a73 mercurial/revlog.py
--- a/mercurial/revlog.py	Sat Aug 27 14:31:41 2005 -0700
+++ b/mercurial/revlog.py	Sat Aug 27 14:43:20 2005 -0700
@@ -14,6 +14,20 @@
 from mercurial import mdiff
 from node import *
 
+def hash(text, p1, p2):
+    """generate a hash from the given text and its parent hashes
+
+    This hash combines both the current file contents and its history
+    in a manner that makes it easy to distinguish nodes with the same
+    content in the revision graph.
+    """
+    l = [p1, p2]
+    l.sort()
+    s = sha.new(l[0])
+    s.update(l[1])
+    s.update(text)
+    return s.digest()
+
 def compress(text):
     """ generate a possibly-compressed representation of text """
     if not text: return text