DVC on Windows/Cygwin, monotone support

I'm considering switching to the monotone CM system, but was stymied
by the lack of Emacs support (I'm currently using cvs and Emacs
pcl-cvs). I was trying to work up the energy to write one, possibly
for DVC, so I was quite pleased to hear that Christian Ohler had done
it.

I'm using Win32 Emacs on Windows XP, with Cygwin installed (for bash,
make, etc, but _not_ emacs).

I have the Win32 monotone package installed

I downloaded DVC with:

bzr get http://bzr.xsteve.at/dvc/

I then ran autoconf, configure, and make, with only one warning:

    config.status: WARNING: dvc-load-install.el contains a reference
    to the variable `datarootdir' which seems to be undefined. Please
    make sure it is defined.

That turned out to be a spurious warning; dvc-load.el is fine.

In a buffer visiting a file under monotone control, I ran 'dvc-diff'.

The "*xmtn-diff*" buffer correctly reports "no changes", but it does
not show the unknown files in the same directory.

When I run 'dvc-status', it does show the unknown files.

Missing features (was Re: bzr merge)

On 3/31/07, Stefan Reichör <stefan <at> xsteve.at> wrote:
> "Dan Lipsitt" <danlipsitt <at> gmail.com> writes:
>
> > Does DVC have a bzr-merge command?
>
> I have implemented now a very simple form that calls only "bzr merge branch"

Thanks!

> Do you need some extra parameters?

Here's my situation: I am hoping to switch my lab over from Arch to
Bazaar. I have switched everybody from xtla to dvc. I am experimenting
with bzr and they are still using tla. However, there are several
things that I used to be able to do with dvc/tla that seem to be
missing from dvc/bzr. Some of these may be due to differences between
Arch and Bazaar, but others aren't. I've been making a list:

- Bookmarks seem to be Arch-specific.
- Partners are gone. I know that bzr stores at least the source of the
last pull. Does it record other repos? Is there a way that dvc can
track this otherwise? Maybe bookmarks could serve this purpose
(something like bzr-{merge,missing}-from-bookmark).
- Can't merge/cherrypick from bzr-missing screen.
- Can't jump to conflicts from bzr-status screen.

There are also instances where dvc assumes that I am using tla. I
sometimes get an error saying "not an arch managed tree" when I am in
a bzr-managed directory. I will try to collect these as they come up.
Lastly, the documentation at

Re: Missing features

"Dan Lipsitt" <danlipsitt <at> gmail.com> writes:

> However, there are several
> things that I used to be able to do with dvc/tla that seem to be
> missing from dvc/bzr.

Yes.

The situation is:

* I'm almost the only contributor to DVC-bzr

* Lack of time, motivation, ...

* bzr's command-line is not perfect, but really useable. So, the need
  for an Emacs mode is not as strong as it was with tla/baz.

* I'm indeed thinking of migrating to another VCS (hg? git?), thus
  moderating my efforts on bzr.

> - Bookmarks seem to be Arch-specific.

There's a draft of a dvc-bookmarks facility, but not really usefull.

> - Partners are gone. I know that bzr stores at least the source of the
> last pull. Does it record other repos? Is there a way that dvc can
> track this otherwise? Maybe bookmarks could serve this purpose
> (something like bzr-{merge,missing}-from-bookmark).

You can maintain a shared repository containing a mirror of each of

DVC on Windows/Cygwin, monotone support

I'm considering switching to the monotone CM system, but was stymied
by the lack of Emacs support (I'm currently using cvs and Emacs
pcl-cvs). I was trying to work up the energy to write one, possibly
for DVC, so I was quite pleased to hear that Christian Ohler had done
it.

I'm using Win32 Emacs on Windows XP, with Cygwin installed (for bash,
make, etc, but _not_ emacs).

I have the Win32 monotone package installed

I downloaded DVC with:

bzr get http://bzr.xsteve.at/dvc/

I then ran autoconf, configure, and make, with only one warning:

    config.status: WARNING: dvc-load-install.el contains a reference
    to the variable `datarootdir' which seems to be undefined. Please
    make sure it is defined.

That turned out to be a spurious warning; dvc-load.el is fine.

In a buffer visiting a file under monotone control, I ran 'dvc-diff'.

The "*xmtn-diff*" buffer correctly reports "no changes", but it does
not show the unknown files in the same directory.

When I run 'dvc-status', it does show the unknown files.

Re: DVC on Windows/Cygwin, monotone support

I responded to this a few days ago, but it hasn't shown up on the list
yet, so I'm responding again.

On a related topic, the archive at
https://mail.gna.org/public/dvc-dev/2007-04/index.html is (at least)
several days behind (it doesn't have this message from Christian, for
example); is that typical?

Christian Ohler <ohler+mtn <at> fastmail.net> writes:

>> I'm considering switching to the monotone CM system, but was stymied
>> by the lack of Emacs support (I'm currently using cvs and Emacs
>> pcl-cvs).
>
> Have you tried contrib/monotone.el in monotone's source tree?  It's a
> lot more primitive than DVC, but may be worth a look, too, depending
> on your needs.

I did try that.

I'm used to pcl-cvs, which (with the right option settings) displays a
list of all the files that need some sort of attention; need-update,
modified, unknown.

>> xmtn-readme.txt seems to imply that dvc-diff should
>> show the unknown files, so they can be added or ignored (as
>> cvs-examine does with pcl-cvs).
>
> As far as I know, dvc-diff is not supposed to show unknown files (just
> like mtn diff doesn't show them).

[PATCH] xmtn fixes

Fixed some bugs related to coding systems and dvc-diff.
Some changes for XEmacs compatibility (incomplete).
Some clarifications to docs/xmtn-readme.txt .
Support monotone release 0.34.

diff -N -aur orig/docs/xmtn-readme.txt new/docs/xmtn-readme.txt
--- orig/docs/xmtn-readme.txt	2007-04-07 11:35:35.000000000 +0200
+++ new/docs/xmtn-readme.txt	2007-04-07 11:35:36.000000000 +0200
@@ -10,6 +10,9 @@
 reusable by code that is unrelated to DVC, even though they currently
 depend on the subprocess handling utilities that DVC provides.

+xmtn should work on GNU Emacs 21 or newer.  Work on supporting XEmacs
+has started but is unfinished; patches welcome.  On XEmacs, xmtn
+requires MULE.

 
 * Download and installation
@@ -83,8 +86,10 @@
 These commands can also be used from dired buffers.

 C-x V s shows the status buffer.  This currently shows modified,
-renamed and unknown files.  I don't use it much, C-x V = seems
-preferable.
+renamed and unknown files.  It's supposed to allow operations like
+diff, commit, revert etc. (like pcl-cvs), but that's not implemented
+yet.  C-x V = is preferable at the moment, although it doesn't show
+unknown files.

Re: DVC on Windows/Cygwin, monotone support

Stephen Leake, 2007-04-05:

> On a related topic, the archive at
> https://mail.gna.org/public/dvc-dev/2007-04/index.html is (at least)
> several days behind (it doesn't have this message from Christian, for
> example); is that typical?

I don't know.

> This paragraph:
> 
>     C-x V s shows the status buffer. This currently shows modified,
>     renamed and unknown files. I don't use it much, C-x V = seems
>     preferable.
> 
> led me to think dvc-diff would show unknown files. Perhaps it could be
> expanded:
> 
>     C-x V s shows the status buffer. This currently shows modified,
>     renamed and unknown files, but does not allow operations on them.
>     I don't use it much, C-x V = seems preferable (although it does
>     not show unknown files).

Ok, thanks.

> I gather you feel a basic_io version of 'automate inventory' would be
> easier to parse, or perhaps contain more information?

Easier to parse and more consistent with the other output formats that 
monotone uses.  It would also be easier to extend to contain more 

Re: xmtn: Emacs integration via DVC

Derek Scherger, 2007-04-04:

> $ tar ztvf dvc-snapshot.tar.gz | head -n1
> drwxr-xr-x moy/synchron      0 2007-04-03 19:25 dvc-snapshot.tar.gz/
> 
> Apparently the top-level directory in the tarball has the same name as
> the tarball so untarring it overwrites the tarball.

Oops.  I agree this isn't how it should be.  Maybe Matthieu Moy can fix 
this, he's the one generating the tarballs.

> $ autoconf
> $ ./configure --with-emacs=xemacs --prefix=$HOME/opt
> ...
> config.status: WARNING: dvc-load-install.el contains a reference to the
> variable `datarootdir'
> which seems to be undefined.  Please make sure it is defined.
> 
> Not sure if that's a big deal or not but it doesn't sound completely
> good. ;)

This seems to be a bug, but it's not the cause of your problem.  I don't 
see this as a priority right now.

> $ make
> ...
> Wrote /home/derek/var/dvc-snapshot.tar.gz/lisp/auto-autoloads.el
> Wrote /home/derek/var/dvc-snapshot.tar.gz/lisp/auto-autoloads.el
> lispdir=/home/derek/opt/lib/xemacs/site-packages/lisp/dvc srcdir=.
> otherdirs="" xemacs -batch -no-autoloads -l ./dvc-build.el -f

Re: DVC on Windows/Cygwin, monotone support

Christian Ohler <ohler+mtn <at> fastmail.net> writes:

> Stephen Leake, 2007-04-05:
>
>> I gather you feel a basic_io version of 'automate inventory' would be
>> easier to parse, or perhaps contain more information?
>
> Easier to parse and more consistent with the other output formats that
> monotone uses.  It would also be easier to extend to contain more
> information in the future.

Ok.

> As I understand it, some work towards this feature has already been
> done.  The message
> http://lists.gnu.org/archive/html/monotone-devel/2006-04/msg00305.html
> and the monotone branch net.venge.monotone.basic_io.inventory may be a
> starting point.

Ok. 

I'll work on getting monotone to compile on my system (Windows XP),
then post on monotone-devel.

>> I did run the Emacs debugger on dvc-diff, trying to understand an
>> error message I was getting (it turned out to be a monotone database
>> issue). I noticed that the macros that create defuns confuse or defeat
>> the Emacs lisp help system ("can't find xmtn-foo in *.el").
>
> Are you referring to the definitions in dvc-unified.el that use

[commit] rev 151: Merged another patch from Christian Ohler

Committed revision 151 to http://bzr.xsteve.at/dvc/

Merged another patch from Christian Ohler

  Fixed some bugs related to coding systems and dvc-diff.
  Some changes for XEmacs compatibility (incomplete).
  Some clarifications to docs/xmtn-readme.txt .
  Support monotone release 0.34.