Re: [Monotone-devel] WIP: multirevision disapprove

[Tero Koskinen]

Hi,

One more update to this.

Revisions can be found from stronglytyped.org (branch
nvm.tkoskine.disapprove-multirev) as usual.

The latest revision is ab0d1c7f1e09e5b0edd1779272e9d191c546bfb1.

The diff between h:net.venge.monotone and
h:net.venge.monotone.tkoskine.disapprove-multirev is also
attached.

On Tue, 29 Jun 2010 00:16:57 +0200 Thomas Keller wrote:
> Am 28.06.10 22:45, schrieb Tero Koskinen:
> >>> At the moment the server carries three branches:
> >>> net.venge.monotone.tkoskine.disapprove-multirev
> > 
> > I updated nvm.tkoskine.disapprove-multirev branch at stronglytyped.org
> > server. The branch now contains code, some tests, and a small documentation
> > change.
> 
> The docs now say
> 
> > address@hidden mtn disapprove @var{id}
> > address@hidden mtn disapprove address@hidden @var{child}
> 
> while the command says
> 
> > Syntax specific to 'mtn disapprove':
> > 
> >   disapprove REVISION [REVISION]

I changed the command to say:
      disapprove [PARENT-REVISION] CHILD-REVISION

> > +check(get("badfile", "testfile"))
> 
> A small tip: Instead of pulling predefined files with dummy contents
> from the test directory, it might be easier to just use
> 
> addfile("goodfile", "dummy content")

I changed this for one simple case. In other places I still use
get(a,b), since personally I found it easier to follow the testcases
when file contents are in separate files.

> Maybe I'm just a little picky, but my original "miuse case" was:
> 
>   $ mtn disapprove h:BRANCH1 h:BRANCH2
> 
> whereas I imagined a message like
> 
>   mtn: misuse: the revision REV1 and REV2 do not share common history

Error messages are now following:

$ mtn disapprove  h:net.venge.monotone-viz h:net.venge.monotone
mtn: expanding selection 'h:net.venge.monotone-viz'
mtn: expanded to '78a87d334b15645b2bb54afec96ac5d3e1e45350'
mtn: expanding selection 'h:net.venge.monotone'
mtn: expanded to '7b3a6be6ed783be2973ee26f5ecf9fd85d67a8af'
mtn: misuse: revisions 78a87d334b15645b2bb54afec96ac5d3e1e45350 and 
7b3a6be6ed783be2973ee26f5ecf9fd85d67a8af do not share common history, cannot 
invert

$ mtn disapprove h:net.venge.monotone.tkoskine.disapprove-multirev 
h:net.venge.monotone.stephe
mtn: expanding selection 'h:net.venge.monotone.tkoskine.disapprove-multirev'
mtn: expanded to 'ab0d1c7f1e09e5b0edd1779272e9d191c546bfb1'
mtn: expanding selection 'h:net.venge.monotone.stephe'
mtn: expanded to 'b35648df22273258b77f58db9d2f767cad0d3698'
mtn: misuse: revisions share common history, but 
ab0d1c7f1e09e5b0edd1779272e9d191c546bfb1 is not an ancestor of 
b35648df22273258b77f58db9d2f767cad0d3698, cannot invert

> Thomas.

-- 
Tero Koskinen <address@hidden>

monotone-disapprove-v3.diff
Description: Binary data