Mercurial > hg > gitweb
changeset 406:d8abb687d501
[PATCH] Using monotone-viz/git-viz with mercurial
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Using monotone-viz/git-viz with mercurial
From: Vincent Danjean <vdanjean.ml@free.fr>
monotone-viz is a small GTK+ application that visualizes monotone
ancestry graphs. Its home page is:
http://oandrieu.nerim.net/monotone-viz/
As monotone and git are similar, the author adapted the 0.9 version to
display git ancestry graphs and call it git-viz. I cannot see any link
from the homepage, but looking in the archive of git ML, it can be found
here:
http://oandrieu.nerim.net/monotone-viz/git-viz-0.1.tar.gz
I few days ago, I adapted it so that it works with the last versions
of git/cogito. Patches and package are available here:
http://dept-info.labri.fr/~danjean/deb.html#git-viz
Today, I patched hgit so that it respects the output of git-diff-tree,
I added git-{diff-tree,cat-file,rev-list,rev-tree} that call hgit (2
lines scripts), and added the script 'hg-viz'.
hg-viz create a .git directory and store the SHA1 of the tip in
.git/HEAD and then call my git-viz.
All these modifications are in the attached patch.
I try it in the mercurial repository. After applying the patch, you
just have to add the contrib directory in your PATH and call hg-viz.
An example of what we can see is on my web page (probably not for a
long time) : http://dept-info.labri.fr/~danjean/temp/hg-viz.png
Vincent
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuM50ywK+sNU5EO8RAtlvAJ425JJI9chCdSi8D+R2Af/vJEOUpACffC9e
fxjJ3umBkffj5g86jWaRGZ0=
=LwA2
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 21 Jun 2005 18:35:32 -0800 |
| parents | 99470ae6b424 |
| children | 0e0d0670b2bc |
| files | contrib/git-viz/git-cat-file contrib/git-viz/git-diff-tree contrib/git-viz/git-rev-list contrib/git-viz/git-rev-tree contrib/git-viz/hg-viz contrib/hgit |
| diffstat | 6 files changed, 49 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/git-viz/git-cat-file Tue Jun 21 18:35:32 2005 -0800 @@ -0,0 +1,5 @@ +#!/bin/sh + +op=`basename $0 | sed -e 's/^git-//'` +exec hgit $op "$@" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/git-viz/git-diff-tree Tue Jun 21 18:35:32 2005 -0800 @@ -0,0 +1,5 @@ +#!/bin/sh + +op=`basename $0 | sed -e 's/^git-//'` +exec hgit $op "$@" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/git-viz/git-rev-list Tue Jun 21 18:35:32 2005 -0800 @@ -0,0 +1,5 @@ +#!/bin/sh + +op=`basename $0 | sed -e 's/^git-//'` +exec hgit $op "$@" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/git-viz/git-rev-tree Tue Jun 21 18:35:32 2005 -0800 @@ -0,0 +1,5 @@ +#!/bin/sh + +op=`basename $0 | sed -e 's/^git-//'` +exec hgit $op "$@" +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/git-viz/hg-viz Tue Jun 21 18:35:32 2005 -0800 @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +if test x"$1" != x ; then + cd $1 +fi + +if [ ! -d ".hg" ]; then + echo "${1:-.} is not a mercurial repository" 1>&2 + echo "Aborting" 1>&2 + exit 1 +fi +if [ ! -d ".git" ]; then + mkdir -v ".git" +fi +if [ -e ".git/HEAD" ]; then + if [ ! -e ".git/HEAD.hg-viz-save" ]; then + mv -v ".git/HEAD" ".git/HEAD.hg-viz-save" + else + rm -vf ".git/HEAD" + fi +fi +hg history | head -1 | awk -F: '{print $3}' > .git/HEAD +git-viz +
--- a/contrib/hgit Tue Jun 21 18:29:52 2005 -0800 +++ b/contrib/hgit Tue Jun 21 18:35:32 2005 -0800 @@ -38,12 +38,12 @@ for f in c: # TODO get file permissions - print ":100664 100664 %s %s %s %s" % (hg.hex(mmap[f]), + print ":100664 100664 %s %s M\t%s\t%s" % (hg.hex(mmap[f]), hg.hex(mmap2[f]), f, f) for f in a: - print ":000000 100664 %s %s %s %s" % (empty, hg.hex(mmap2[f]), f, f) + print ":000000 100664 %s %s N\t%s\t%s" % (empty, hg.hex(mmap2[f]), f, f) for f in d: - print ":100664 000000 %s %s %s %s" % (hg.hex(mmap[f]), empty, f, f) + print ":100664 000000 %s %s D\t%s\t%s" % (hg.hex(mmap[f]), empty, f, f) ## revs = []