# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1157670441 -7200
# Node ID 9b480509658c6b30fe72086cab34417527dbd1ad
# Parent  c6bfe536a1f9fa06d99a40fc131a8019c2c0898a# Parent  15526271eafbc389f792c72b9ef30f6bffba35b9
merge with crew

diff -r 15526271eafb -r 9b480509658c hgext/hgk.py
--- a/hgext/hgk.py	Thu Sep 07 13:53:20 2006 -0500
+++ b/hgext/hgk.py	Fri Sep 08 01:07:21 2006 +0200
@@ -25,7 +25,7 @@
 
         change = repo.changelog.read(node1)
         mmap = repo.manifest.read(change[0])
-        empty = hg.nullid
+        empty = hg.short(hg.nullid)
 
         for f in modified:
             # TODO get file permissions
@@ -33,12 +33,12 @@
                                                       hg.short(mmap2[f]),
                                                       f, f)
         for f in added:
-            print ":000000 100664 %s %s N\t%s\t%s" % (hg.short(nullid),
+            print ":000000 100664 %s %s N\t%s\t%s" % (empty,
                                                       hg.short(mmap2[f]),
                                                       f, f)
         for f in removed:
             print ":100664 000000 %s %s D\t%s\t%s" % (hg.short(mmap[f]),
-                                                      hg.short(nullid),
+                                                      empty,
                                                       f, f)
     ##