Patchwork [1,of,3,V2] shelve: add option combination tests for refactoring in succeeding patch

login
register
mail settings
Submitter Katsunori FUJIWARA
Date June 5, 2014, 2:12 p.m.
Message ID <804a341610d154c8a2a4.1401977523@feefifofum>
Download mbox | patch
Permalink /patch/4937/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - June 5, 2014, 2:12 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1401974432 -32400
#      Thu Jun 05 22:20:32 2014 +0900
# Node ID 804a341610d154c8a2a4d3d63e36ff2cf08acc4f
# Parent  99db956b88ab699644c99095fecadbc4c83adbfc
shelve: add option combination tests for refactoring in succeeding patch
Pierre-Yves David - June 5, 2014, 11:26 p.m.
On 06/05/2014 07:12 AM, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
> # Date 1401974432 -32400
> #      Thu Jun 05 22:20:32 2014 +0900
> # Node ID 804a341610d154c8a2a4d3d63e36ff2cf08acc4f
> # Parent  99db956b88ab699644c99095fecadbc4c83adbfc
> shelve: add option combination tests for refactoring in succeeding patch

Queued this one. Waiting for an english speaker to express something 
about the path 2.

>
> diff --git a/tests/test-shelve.t b/tests/test-shelve.t
> --- a/tests/test-shelve.t
> +++ b/tests/test-shelve.t
> @@ -90,6 +90,10 @@
>      a
>     +a
>
> +  $ hg shelve --list --addremove
> +  abort: options '--list' and '--addremove' may not be used together
> +  [255]
> +
>   delete our older shelved change
>
>     $ hg shelve -d default
> @@ -395,6 +399,16 @@
>     $ hg shelve --cleanup
>     $ hg shelve --list
>
> +  $ hg shelve --cleanup --delete
> +  abort: options '--cleanup' and '--delete' may not be used together
> +  [255]
> +  $ hg shelve --cleanup --patch
> +  abort: options '--cleanup' and '--patch' may not be used together
> +  [255]
> +  $ hg shelve --cleanup --message MESSAGE
> +  abort: options '--cleanup' and '--message' may not be used together
> +  [255]
> +
>   test bookmarks
>
>     $ hg bookmark test
> @@ -664,4 +678,11 @@
>     g
>     $ hg shelve --delete default
>
> +  $ hg shelve --delete --stat
> +  abort: options '--delete' and '--stat' may not be used together
> +  [255]
> +  $ hg shelve --delete --name NAME
> +  abort: options '--delete' and '--name' may not be used together
> +  [255]
> +
>     $ cd ..
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -90,6 +90,10 @@ 
    a
   +a
 
+  $ hg shelve --list --addremove
+  abort: options '--list' and '--addremove' may not be used together
+  [255]
+
 delete our older shelved change
 
   $ hg shelve -d default
@@ -395,6 +399,16 @@ 
   $ hg shelve --cleanup
   $ hg shelve --list
 
+  $ hg shelve --cleanup --delete
+  abort: options '--cleanup' and '--delete' may not be used together
+  [255]
+  $ hg shelve --cleanup --patch
+  abort: options '--cleanup' and '--patch' may not be used together
+  [255]
+  $ hg shelve --cleanup --message MESSAGE
+  abort: options '--cleanup' and '--message' may not be used together
+  [255]
+
 test bookmarks
 
   $ hg bookmark test
@@ -664,4 +678,11 @@ 
   g
   $ hg shelve --delete default
 
+  $ hg shelve --delete --stat
+  abort: options '--delete' and '--stat' may not be used together
+  [255]
+  $ hg shelve --delete --name NAME
+  abort: options '--delete' and '--name' may not be used together
+  [255]
+
   $ cd ..