Changeset View
Changeset View
Standalone View
Standalone View
tests/test-shelve.t
| Show First 20 Lines • Show All 203 Lines • ▼ Show 20 Line(s) | ensure that our shelved changes exist | ||||
| --- a/a/a | --- a/a/a | ||||
| +++ b/a/a | +++ b/a/a | ||||
| @@ -1,1 +1,2 @@ | @@ -1,1 +1,2 @@ | ||||
| a | a | ||||
| +a | +a | ||||
| $ hg shelve --list --addremove | $ hg shelve --list --addremove | ||||
| abort: options '--list' and '--addremove' may not be used together | abort: options '--list' and '--addremove' may not be used together | ||||
| [255] | [10] | ||||
| delete our older shelved change | delete our older shelved change | ||||
| $ hg shelve -d default | $ hg shelve -d default | ||||
| $ hg qfinish -a -q | $ hg qfinish -a -q | ||||
| ensure shelve backups aren't overwritten | ensure shelve backups aren't overwritten | ||||
| ▲ Show 20 Lines • Show All 422 Lines • ▼ Show 20 Line(s) | test keep and cleanup | ||||
| unshelving change 'default' | unshelving change 'default' | ||||
| $ hg shelve --list | $ hg shelve --list | ||||
| default (*)* changes to: create conflict (glob) | default (*)* changes to: create conflict (glob) | ||||
| $ hg shelve --cleanup | $ hg shelve --cleanup | ||||
| $ hg shelve --list | $ hg shelve --list | ||||
| $ hg shelve --cleanup --delete | $ hg shelve --cleanup --delete | ||||
| abort: options '--cleanup' and '--delete' may not be used together | abort: options '--cleanup' and '--delete' may not be used together | ||||
| [255] | [10] | ||||
| $ hg shelve --cleanup --patch | $ hg shelve --cleanup --patch | ||||
| abort: options '--cleanup' and '--patch' may not be used together | abort: options '--cleanup' and '--patch' may not be used together | ||||
| [255] | [10] | ||||
| $ hg shelve --cleanup --message MESSAGE | $ hg shelve --cleanup --message MESSAGE | ||||
| abort: options '--cleanup' and '--message' may not be used together | abort: options '--cleanup' and '--message' may not be used together | ||||
| [255] | [10] | ||||
| test bookmarks | test bookmarks | ||||
| $ hg bookmark test | $ hg bookmark test | ||||
| $ hg bookmark | $ hg bookmark | ||||
| \* test (4|13):33f7f61e6c5e (re) | \* test (4|13):33f7f61e6c5e (re) | ||||
| $ hg shelve | $ hg shelve | ||||
| shelved as test | shelved as test | ||||
| ▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s) | is a no-op), works (issue4398) | ||||
| branch: default | branch: default | ||||
| bookmarks: *test | bookmarks: *test | ||||
| commit: 2 unknown (clean) | commit: 2 unknown (clean) | ||||
| update: (current) | update: (current) | ||||
| phases: 5 draft | phases: 5 draft | ||||
| $ hg shelve --delete --stat | $ hg shelve --delete --stat | ||||
| abort: options '--delete' and '--stat' may not be used together | abort: options '--delete' and '--stat' may not be used together | ||||
| [255] | [10] | ||||
| $ hg shelve --delete --name NAME | $ hg shelve --delete --name NAME | ||||
| abort: options '--delete' and '--name' may not be used together | abort: options '--delete' and '--name' may not be used together | ||||
| [255] | [10] | ||||
| Test interactive shelve | Test interactive shelve | ||||
| $ cat <<EOF >> $HGRCPATH | $ cat <<EOF >> $HGRCPATH | ||||
| > [ui] | > [ui] | ||||
| > interactive = true | > interactive = true | ||||
| > EOF | > EOF | ||||
| $ echo 'a' >> a/b | $ echo 'a' >> a/b | ||||
| $ cat a/a >> a/b | $ cat a/a >> a/b | ||||
| Show All 10 Lines | Test interactive shelve | ||||
| c | c | ||||
| x | x | ||||
| x | x | ||||
| $ cat foo/foo | $ cat foo/foo | ||||
| foo | foo | ||||
| a | a | ||||
| $ hg shelve --interactive --config ui.interactive=false | $ hg shelve --interactive --config ui.interactive=false | ||||
| abort: running non-interactively | abort: running non-interactively | ||||
| [255] | [10] | ||||
| $ hg shelve --interactive << EOF | $ hg shelve --interactive << EOF | ||||
| > y | > y | ||||
| > y | > y | ||||
| > n | > n | ||||
| > EOF | > EOF | ||||
| diff --git a/a/a b/a/a | diff --git a/a/a b/a/a | ||||
| 2 hunks, 2 lines changed | 2 hunks, 2 lines changed | ||||
| examine changes to 'a/a'? | examine changes to 'a/a'? | ||||
| ▲ Show 20 Lines • Show All 170 Lines • ▼ Show 20 Line(s) | changegroup -- {nbchanges: 1, version: 02} (mandatory: True) | ||||
| 330882a04d2ce8487636b1fb292e5beea77fa1e3 | 330882a04d2ce8487636b1fb292e5beea77fa1e3 | ||||
| Test shelve --keep | Test shelve --keep | ||||
| $ hg unshelve | $ hg unshelve | ||||
| unshelving change 'default' | unshelving change 'default' | ||||
| $ hg shelve --keep --list | $ hg shelve --keep --list | ||||
| abort: options '--list' and '--keep' may not be used together | abort: options '--list' and '--keep' may not be used together | ||||
| [255] | [10] | ||||
| $ hg shelve --keep --patch | $ hg shelve --keep --patch | ||||
| abort: options '--patch' and '--keep' may not be used together | abort: options '--patch' and '--keep' may not be used together | ||||
| [255] | [10] | ||||
| $ hg shelve --keep --delete | $ hg shelve --keep --delete | ||||
| abort: options '--delete' and '--keep' may not be used together | abort: options '--delete' and '--keep' may not be used together | ||||
| [255] | [10] | ||||
| $ hg shelve --keep | $ hg shelve --keep | ||||
| shelved as default | shelved as default | ||||
| $ hg diff | $ hg diff | ||||
| diff --git a/jungle b/jungle | diff --git a/jungle b/jungle | ||||
| new file mode 100644 | new file mode 100644 | ||||
| --- /dev/null | --- /dev/null | ||||
| +++ b/jungle | +++ b/jungle | ||||
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@ | ||||
| ▲ Show 20 Lines • Show All 541 Lines • Show Last 20 Lines | |||||