Mercurial > hg
changeset 3070:9b480509658c
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 08 Sep 2006 01:07:21 +0200 |
parents | c6bfe536a1f9 (diff) 15526271eafb (current diff) |
children | 547d1a4aa105 |
files | |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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) ##