Stephen Leake <[EMAIL PROTECTED]> writes: >> Both have to appear in the user interface (diff should not prompt >> anything and show the diff between working tree and the last revision, > > I assume you mean "the revision the working tree is based on" (similar > to CVS BASE), not "the last revision in the repository" (CVS HEAD).
Yes. > > Here's a summary of what the current back-ends do, and what it would > take to make this change: > > baz-dvc-diff => baz-changes > baz-dvc-delta => not implemented > that's easy; just have baz-dvc-delta call baz-changes That won't work directly, since baz-changes (aka tla-changes, they're just aliases) has only one "against" argument. You can't compare two past revisions with it. Perhaps you meant "baz-dvc-delta call baz-delta", then that's OK. > tla-dvc-diff => tla-changes-rec > tla-dvc-diff => tla-delta > _very_ different code! not possible to merge tla-diff and tla-delta call two different commands in tla, and IIRC, they have a different output format (we had great fun writting parsers for different output formats containing the same data in tla and baz ;-) ). But remember that our goal is not to improve the tla and baz back-ends, but just to maintain them operational. There are far better alternatives to tla and baz today, and I don't want to encourrage people to use them today. > We need to merge code in the bzr and xmtn back-ends, and decide what > to do about tla. I suggest we just have dvc-delta (and thus > dvc-diff) Here, I don't understand what you mean. My understanding of the first part of your message was that dvc-delta calls the back-end XXX-dvc-delta, not dvc-diff. I suppose you meant it the other way around: dvc-diff calls dvc-delta. We have two options here: have dvc-diff call dvc-delta anyway, and let the back-ends implement only dvc-delta, or have dvc-diff call the back-end's XXX-dvc-diff, which itself is a wrapper around XXX-dvc-delta. Both cases are manageable: tla-delta can check whether the base revision is the base revision for the working tree, and call tla-diff if so. Then, dvc-diff cat call dvc-delta, which can call tla-delta which in turn can call tla-diff. -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
