Heya tools-discuss peeps,
This is the putback of a prototype for a hg filemerge utility. The
utility itself is currently called gpyfm (pronounced "guppy-foam"). This
is a "straw-man" for those interested to try out and comment on.
The tool itself is a re-write of the TeamWare filemerge in python using
pyGTK. It is written from scratch. I was never able to get a pointer to
the TeamWare source of filemerge. For those familiar with the filemerge,
gpyfm should be easy to use. It does have some differences though, and
they will be obvious.
After building it you should be able to run the manual tests to get a
feel for the utility. The tests are located in
usr/src/tools/fm/Test/manual/[1-4]/*/test.sh
The tests do not save your merged file by default, if you want to keep
that you will need to add '-d' when running the test.
This version is only meant for mercurial. The fm package could be used
later to create a TeamWare, CVS/subversion, etc. version.
It doesn't currently use any dialogs. So "quit" will not be an option
until you have saved, and "save" will not be an option until you have
resolved all changes. If you destroy the window it returns -1 to hg so
that it knows the merge failed.
enjoy!
-dvd
[EMAIL PROTECTED] wrote:
Author: David Marker <[EMAIL PROTECTED]>
Repository: /hg/scm-migration/onnv-scm
Latest revision: 3281d5771109eb508deac73dc803d293c4ade758
Total changesets: 1
Log message:
168 Need a filemerge tool
Files:
create: usr/src/tools/fm/Makefile
create: usr/src/tools/fm/Test/README
create: usr/src/tools/fm/Test/manual/1/README
create: usr/src/tools/fm/Test/manual/1/a/a
create: usr/src/tools/fm/Test/manual/1/a/c
create: usr/src/tools/fm/Test/manual/1/a/p
create: usr/src/tools/fm/Test/manual/1/a/test.sh
create: usr/src/tools/fm/Test/manual/1/b/a
create: usr/src/tools/fm/Test/manual/1/b/c
create: usr/src/tools/fm/Test/manual/1/b/p
create: usr/src/tools/fm/Test/manual/1/b/test.sh
create: usr/src/tools/fm/Test/manual/1/c/a
create: usr/src/tools/fm/Test/manual/1/c/c
create: usr/src/tools/fm/Test/manual/1/c/p
create: usr/src/tools/fm/Test/manual/1/c/test.sh
create: usr/src/tools/fm/Test/manual/2/README
create: usr/src/tools/fm/Test/manual/2/a/a
create: usr/src/tools/fm/Test/manual/2/a/c
create: usr/src/tools/fm/Test/manual/2/a/p
create: usr/src/tools/fm/Test/manual/2/a/test.sh
create: usr/src/tools/fm/Test/manual/2/b/a
create: usr/src/tools/fm/Test/manual/2/b/c
create: usr/src/tools/fm/Test/manual/2/b/p
create: usr/src/tools/fm/Test/manual/2/b/test.sh
create: usr/src/tools/fm/Test/manual/2/c/a
create: usr/src/tools/fm/Test/manual/2/c/c
create: usr/src/tools/fm/Test/manual/2/c/p
create: usr/src/tools/fm/Test/manual/2/c/test.sh
create: usr/src/tools/fm/Test/manual/2/d/a
create: usr/src/tools/fm/Test/manual/2/d/c
create: usr/src/tools/fm/Test/manual/2/d/p
create: usr/src/tools/fm/Test/manual/2/d/test.sh
create: usr/src/tools/fm/Test/manual/3/README
create: usr/src/tools/fm/Test/manual/3/a/a
create: usr/src/tools/fm/Test/manual/3/a/c
create: usr/src/tools/fm/Test/manual/3/a/p
create: usr/src/tools/fm/Test/manual/3/a/test.sh
create: usr/src/tools/fm/Test/manual/3/b/a
create: usr/src/tools/fm/Test/manual/3/b/c
create: usr/src/tools/fm/Test/manual/3/b/p
create: usr/src/tools/fm/Test/manual/3/b/test.sh
create: usr/src/tools/fm/Test/manual/3/c/a
create: usr/src/tools/fm/Test/manual/3/c/c
create: usr/src/tools/fm/Test/manual/3/c/p
create: usr/src/tools/fm/Test/manual/3/c/test.sh
create: usr/src/tools/fm/Test/manual/3/d/a
create: usr/src/tools/fm/Test/manual/3/d/c
create: usr/src/tools/fm/Test/manual/3/d/p
create: usr/src/tools/fm/Test/manual/3/d/test.sh
create: usr/src/tools/fm/Test/manual/3/e/a
create: usr/src/tools/fm/Test/manual/3/e/c
create: usr/src/tools/fm/Test/manual/3/e/p
create: usr/src/tools/fm/Test/manual/3/e/test.sh
create: usr/src/tools/fm/Test/manual/3/f/a
create: usr/src/tools/fm/Test/manual/3/f/c
create: usr/src/tools/fm/Test/manual/3/f/p
create: usr/src/tools/fm/Test/manual/3/f/test.sh
create: usr/src/tools/fm/Test/manual/4/README
create: usr/src/tools/fm/Test/manual/4/a/a
create: usr/src/tools/fm/Test/manual/4/a/c
create: usr/src/tools/fm/Test/manual/4/a/p
create: usr/src/tools/fm/Test/manual/4/a/test.sh
create: usr/src/tools/fm/Test/manual/4/b/a
create: usr/src/tools/fm/Test/manual/4/b/c
create: usr/src/tools/fm/Test/manual/4/b/p
create: usr/src/tools/fm/Test/manual/4/b/test.sh
create: usr/src/tools/fm/Test/manual/4/c/a
create: usr/src/tools/fm/Test/manual/4/c/c
create: usr/src/tools/fm/Test/manual/4/c/p
create: usr/src/tools/fm/Test/manual/4/c/test.sh
create: usr/src/tools/fm/Test/manual/4/d/a
create: usr/src/tools/fm/Test/manual/4/d/c
create: usr/src/tools/fm/Test/manual/4/d/p
create: usr/src/tools/fm/Test/manual/4/d/test.sh
create: usr/src/tools/fm/Test/manual/4/e/a
create: usr/src/tools/fm/Test/manual/4/e/c
create: usr/src/tools/fm/Test/manual/4/e/p
create: usr/src/tools/fm/Test/manual/4/e/test.sh
create: usr/src/tools/fm/Test/manual/4/f/a
create: usr/src/tools/fm/Test/manual/4/f/c
create: usr/src/tools/fm/Test/manual/4/f/p
create: usr/src/tools/fm/Test/manual/4/f/test.sh
create: usr/src/tools/fm/Test/manual/4/g/a
create: usr/src/tools/fm/Test/manual/4/g/c
create: usr/src/tools/fm/Test/manual/4/g/p
create: usr/src/tools/fm/Test/manual/4/g/test.sh
create: usr/src/tools/fm/Test/manual/4/h/a
create: usr/src/tools/fm/Test/manual/4/h/c
create: usr/src/tools/fm/Test/manual/4/h/p
create: usr/src/tools/fm/Test/manual/4/h/test.sh
create: usr/src/tools/fm/Test/manual/common.sh
create: usr/src/tools/fm/__init__.py
create: usr/src/tools/fm/buffers.py
create: usr/src/tools/fm/const.py
create: usr/src/tools/fm/control.py
create: usr/src/tools/fm/drecord.py
create: usr/src/tools/fm/indicator.py
create: usr/src/tools/fm/linemap.py
create: usr/src/tools/fm/menu.py
create: usr/src/tools/fm/menuctrl.py
create: usr/src/tools/fm/model.py
create: usr/src/tools/fm/modelctrl.py
create: usr/src/tools/fm/prefs.py
create: usr/src/tools/fm/textview.py
create: usr/src/tools/fm/view.py
create: usr/src/tools/scripts/gpyfm.py
update: usr/src/tools/Makefile
update: usr/src/tools/SUNWonbld/prototype_com
update: usr/src/tools/scripts/Makefile
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
