[PATCH shelve-ext v2] shelve: make --keep option survive user intevention (issue5431)

Yuya Nishihara yuya at tcha.org
Thu Nov 24 08:59:14 EST 2016


On Wed, 23 Nov 2016 15:02:44 -0800, Kostia Balytskyi wrote:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia at fb.com>
> # Date 1479941932 28800
> #      Wed Nov 23 14:58:52 2016 -0800
> # Node ID 00a022e44b62cb9340dfac94096b14f77407cefb
> # Parent  db897ddf3a8ebb8df9556ce97de11f6380a9ef0b
> shelve: make --keep option survive user intevention (issue5431)

Queued per Mateusz' review, thanks.

> @@ -782,6 +787,8 @@ def _dounshelve(ui, repo, *shelved, **op
>  
>          try:
>              state = shelvedstate.load(repo)
> +            if opts['keep'] is None:

Changed this to opts.get('keep') like other uses.

> +                opts['keep'] = state.keep


More information about the Mercurial-devel mailing list