This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6553

shelve: move shelve extension to core
ClosedPublic

Authored by navaneeth.suresh on Jun 20 2019, 2:01 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3de4f17f4824: shelve: move shelve extension to core
rHG46087aeb8ae2: shelve: move shelve extension to core
Summary

Until now, shelve was bootstrapped as an extension. This patch adds
shelve on core.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

Kwan added a subscriber: Kwan.Jun 23 2019, 7:11 AM

You should probably run hg mv -A hgext/shelve.py mercurial/shelve.py and amend and re-send to preserve history.

navaneeth.suresh added a comment.Jun 23 2019, 7:32 AM

@Kwan Thanks for the review. I have updated the patch as you suggested.

pulkit added a subscriber: pulkit.Jun 24 2019, 8:44 AM
pulkit added inline comments.
mercurial/shelve.py
643

We don't import things from hgext in mercurial. I am not sure why.

I think it will be fine to duplicate clearstatus() from rebase to shelve.py for the movement and add a comment that it's copied.

navaneeth.suresh marked an inline comment as done.Jun 28 2019, 4:01 AM
navaneeth.suresh updated this revision to Diff 15692.
navaneeth.suresh added inline comments.Jun 28 2019, 4:05 AM
mercurial/shelve.py
643

Done. Now, shelve will no longer be dependent on rebase.

pulkit accepted this revision.Jun 28 2019, 8:50 AM

Thanks a lot for working on this. This needs to be rebased on tip of default branch. Also, can you add an entry about shelve extension being moved to core in relnotes/next file.

This revision is now accepted and ready to land.Jun 28 2019, 8:50 AM
martinvonz added a subscriber: martinvonz.Jun 28 2019, 12:31 PM
martinvonz added inline comments.
mercurial/shelve.py
296–304

This doesn't seem right. It seems D3693 just forgot to delete clearstatus(). Could you send a patch before this one to do that?

navaneeth.suresh added inline comments.Jun 28 2019, 1:25 PM
mercurial/shelve.py
296–304

Doing that right away!

navaneeth.suresh edited the summary of this revision. (Show Details)Jun 28 2019, 2:12 PM
navaneeth.suresh updated this revision to Diff 15700.
navaneeth.suresh marked an inline comment as done.Jun 28 2019, 2:16 PM
navaneeth.suresh updated this revision to Diff 15701.
navaneeth.suresh added a comment.Jun 28 2019, 2:18 PM

@pulkit Changes have been made.

pulkit accepted this revision.Jun 29 2019, 11:47 AM
navaneeth.suresh added a commit: rHG46087aeb8ae2: shelve: move shelve extension to core.Jun 29 2019, 7:03 PM
Closed by commit rHG46087aeb8ae2: shelve: move shelve extension to core (authored by navaneeth.suresh). · Explain Why
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jun 30 2019, 12:07 AM

Need to update extensions._builtin so the shelve "extension" is silently
ignored.

Please send a follow up.

navaneeth.suresh added a comment.Jun 30 2019, 3:39 AM
In D6553#96119, @yuja wrote:

Need to update extensions._builtin so the shelve "extension" is silently
ignored.
Please send a follow up.

Doing that right away! Thanks @yuja!

pulkit added inline comments.Jul 2 2019, 5:42 PM
mercurial/commands.py
6190

I just noticed that the function _dounshelve() still has _ prefix. We generally have that to mark if functions are local to that file or class. So can you send a followup and rename that to dounshelve?

navaneeth.suresh marked an inline comment as done.Jul 4 2019, 11:07 AM
navaneeth.suresh added inline comments.
mercurial/commands.py
6190

Doing that right away!

Revision Contents
Changeset List

Diff 15634

contrib/win32/mercurial.ini

;patchbomb = ;patchbomb =
;progress = ;progress =
;purge = ;purge =
;rebase = ;rebase =
;record = ;record =
;relink = ;relink =
;schemes = ;schemes =
;share = ;share =
;shelve =
;transplant = ;transplant =
;win32mbcs = ;win32mbcs =
;zeroconf = ;zeroconf =
; ;
; Define external diff commands ; Define external diff commands
; ;
[extdiff] [extdiff]

hgext/shelve.py

  • This file was moved to mercurial/shelve.py.

mercurial/cmdutil.py

# A list of state files kept by multistep operations like graft. # A list of state files kept by multistep operations like graft.
# Since graft cannot be aborted, it is considered 'clearable' by update. # Since graft cannot be aborted, it is considered 'clearable' by update.
# note: bisect is intentionally excluded # note: bisect is intentionally excluded
# (state file, clearable, allowcommit, error, hint) # (state file, clearable, allowcommit, error, hint)
unfinishedstates = [ unfinishedstates = [
('graftstate', True, False, _('graft in progress'), ('graftstate', True, False, _('graft in progress'),
_("use 'hg graft --continue' or 'hg graft --stop' to stop")), _("use 'hg graft --continue' or 'hg graft --stop' to stop")),
('shelvedstate', False, False,
_('unshelve already in progress'),
_("use 'hg unshelve --continue' or 'hg unshelve --abort'")),
('updatestate', True, False, _('last update was interrupted'), ('updatestate', True, False, _('last update was interrupted'),
_("use 'hg update' to get a consistent checkout")) _("use 'hg update' to get a consistent checkout"))
] ]
def checkunfinished(repo, commit=False): def checkunfinished(repo, commit=False):
'''Look for an unfinished multistep operation, like graft, and abort '''Look for an unfinished multistep operation, like graft, and abort
if found. It's probably good to check this right before if found. It's probably good to check this right before
bailifchanged(). bailifchanged().
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
for f, clearable, allowcommit, msg, hint in unfinishedstates: for f, clearable, allowcommit, msg, hint in unfinishedstates:
if clearable and repo.vfs.exists(f): if clearable and repo.vfs.exists(f):
util.unlink(repo.vfs.join(f)) util.unlink(repo.vfs.join(f))
afterresolvedstates = [ afterresolvedstates = [
('graftstate', ('graftstate',
_('hg graft --continue')), _('hg graft --continue')),
('shelvedstate',
_('hg unshelve --continue')),
] ]
def howtocontinue(repo): def howtocontinue(repo):
'''Check for an unfinished operation and return the command to finish '''Check for an unfinished operation and return the command to finish
it. it.
afterresolvedstates tuples define a .hg/{file} and the corresponding afterresolvedstates tuples define a .hg/{file} and the corresponding
command needed to finish it. command needed to finish it.

mercurial/commands.py

pycompat, pycompat,
rcutil, rcutil,
registrar, registrar,
repair, repair,
revsetlang, revsetlang,
rewriteutil, rewriteutil,
scmutil, scmutil,
server, server,
shelve as shelvemod,
state as statemod, state as statemod,
streamclone, streamclone,
tags as tagsmod, tags as tagsmod,
ui as uimod, ui as uimod,
util, util,
verify as verifymod, verify as verifymod,
wireprotoserver, wireprotoserver,
) )
raise error.RepoError(_("there is no Mercurial repository here" raise error.RepoError(_("there is no Mercurial repository here"
" (.hg not found)")) " (.hg not found)"))
s = wireprotoserver.sshserver(ui, repo) s = wireprotoserver.sshserver(ui, repo)
s.serve_forever() s.serve_forever()
service = server.createservice(ui, repo, opts) service = server.createservice(ui, repo, opts)
return server.runservice(opts, initfn=service.init, runfn=service.run) return server.runservice(opts, initfn=service.init, runfn=service.run)
@command('shelve',
[('A', 'addremove', None,
_('mark new/missing files as added/removed before shelving')),
('u', 'unknown', None,
_('store unknown files in the shelve')),
('', 'cleanup', None,
_('delete all shelved changes')),
('', 'date', '',
_('shelve with the specified commit date'), _('DATE')),
('d', 'delete', None,
_('delete the named shelved change(s)')),
('e', 'edit', False,
_('invoke editor on commit messages')),
('k', 'keep', False,
_('shelve, but keep changes in the working directory')),
('l', 'list', None,
_('list current shelves')),
('m', 'message', '',
_('use text as shelve message'), _('TEXT')),
('n', 'name', '',
_('use the given name for the shelved commit'), _('NAME')),
('p', 'patch', None,
_('output patches for changes (provide the names of the shelved '
'changes as positional arguments)')),
('i', 'interactive', None,
_('interactive mode, only works while creating a shelve')),
('', 'stat', None,
_('output diffstat-style summary of changes (provide the names of '
'the shelved changes as positional arguments)')
)] + cmdutil.walkopts,
_('hg shelve [OPTION]... [FILE]...'),
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
def shelve(ui, repo, *pats, **opts):
'''save and set aside changes from the working directory
Shelving takes files that "hg status" reports as not clean, saves
the modifications to a bundle (a shelved change), and reverts the
files so that their state in the working directory becomes clean.
To restore these changes to the working directory, using "hg
unshelve"; this will work even if you switch to a different
commit.
When no files are specified, "hg shelve" saves all not-clean
files. If specific files or directories are named, only changes to
those files are shelved.
In bare shelve (when no files are specified, without interactive,
include and exclude option), shelving remembers information if the
working directory was on newly created branch, in other words working
directory was on different branch than its first parent. In this
situation unshelving restores branch information to the working directory.
Each shelved change has a name that makes it easier to find later.
The name of a shelved change defaults to being based on the active
bookmark, or if there is no active bookmark, the current named
branch. To specify a different name, use ``--name``.
To see a list of existing shelved changes, use the ``--list``
option. For each shelved change, this will print its name, age,
and description; use ``--patch`` or ``--stat`` for more details.
To delete specific shelved changes, use ``--delete``. To delete
all shelved changes, use ``--cleanup``.
'''
opts = pycompat.byteskwargs(opts)
allowables = [
('addremove', {'create'}), # 'create' is pseudo action
('unknown', {'create'}),
('cleanup', {'cleanup'}),
# ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
('delete', {'delete'}),
('edit', {'create'}),
('keep', {'create'}),
('list', {'list'}),
('message', {'create'}),
('name', {'create'}),
('patch', {'patch', 'list'}),
('stat', {'stat', 'list'}),
]
def checkopt(opt):
if opts.get(opt):
for i, allowable in allowables:
if opts[i] and opt not in allowable:
raise error.Abort(_("options '--%s' and '--%s' may not be "
"used together") % (opt, i))
return True
if checkopt('cleanup'):
if pats:
raise error.Abort(_("cannot specify names when using '--cleanup'"))
return shelvemod.cleanupcmd(ui, repo)
elif checkopt('delete'):
return shelvemod.deletecmd(ui, repo, pats)
elif checkopt('list'):
return shelvemod.listcmd(ui, repo, pats, opts)
elif checkopt('patch') or checkopt('stat'):
return shelvemod.patchcmds(ui, repo, pats, opts)
else:
return shelvemod.createcmd(ui, repo, pats, opts)
_NOTTERSE = 'nothing' _NOTTERSE = 'nothing'
@command('status|st', @command('status|st',
[('A', 'all', None, _('show status of all files')), [('A', 'all', None, _('show status of all files')),
('m', 'modified', None, _('show only modified files')), ('m', 'modified', None, _('show only modified files')),
('a', 'added', None, _('show only added files')), ('a', 'added', None, _('show only added files')),
('r', 'removed', None, _('show only removed files')), ('r', 'removed', None, _('show only removed files')),
('d', 'deleted', None, _('show only deleted (but tracked) files')), ('d', 'deleted', None, _('show only deleted (but tracked) files')),
_('%s: unknown bundle feature, %s') % (fname, exc), _('%s: unknown bundle feature, %s') % (fname, exc),
hint=_("see https://mercurial-scm.org/" hint=_("see https://mercurial-scm.org/"
"wiki/BundleFeature for more " "wiki/BundleFeature for more "
"information")) "information"))
modheads = bundle2.combinechangegroupresults(op) modheads = bundle2.combinechangegroupresults(op)
return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
@command('unshelve',
[('a', 'abort', None,
_('abort an incomplete unshelve operation')),
('c', 'continue', None,
_('continue an incomplete unshelve operation')),
('k', 'keep', None,
_('keep shelve after unshelving')),
('n', 'name', '',
_('restore shelved change with given name'), _('NAME')),
('t', 'tool', '', _('specify merge tool')),
('', 'date', '',
_('set date for temporary commits (DEPRECATED)'), _('DATE'))],
_('hg unshelve [[-n] SHELVED]'),
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
def unshelve(ui, repo, *shelved, **opts):
"""restore a shelved change to the working directory
This command accepts an optional name of a shelved change to
restore. If none is given, the most recent shelved change is used.
If a shelved change is applied successfully, the bundle that
contains the shelved changes is moved to a backup location
(.hg/shelve-backup).
Since you can restore a shelved change on top of an arbitrary
commit, it is possible that unshelving will result in a conflict
between your changes and the commits you are unshelving onto. If
this occurs, you must resolve the conflict, then use
``--continue`` to complete the unshelve operation. (The bundle
will not be moved until you successfully complete the unshelve.)
(Alternatively, you can use ``--abort`` to abandon an unshelve
that causes a conflict. This reverts the unshelved changes, and
leaves the bundle in place.)
If bare shelved change (when no files are specified, without interactive,
include and exclude option) was done on newly created branch it would
restore branch information to the working directory.
After a successful unshelve, the shelved changes are stored in a
backup directory. Only the N most recent backups are kept. N
defaults to 10 but can be overridden using the ``shelve.maxbackups``
configuration option.
.. container:: verbose
Timestamp in seconds is used to decide order of backups. More
than ``maxbackups`` backups are kept, if same timestamp
prevents from deciding exact order of them, for safety.
"""
with repo.wlock():
return shelvemod._dounshelve(ui, repo, *shelved, **opts)
pulkitUnsubmitted
Not Done

I just noticed that the function _dounshelve() still has _ prefix. We generally have that to mark if functions are local to that file or class. So can you send a followup and rename that to dounshelve?

pulkit: I just noticed that the function `_dounshelve()` still has `_` prefix. We generally have that…
navaneeth.sureshAuthorUnsubmitted
Done

Doing that right away!

navaneeth.suresh: Doing that right away!
@command('update|up|checkout|co', @command('update|up|checkout|co',
[('C', 'clean', None, _('discard uncommitted changes (no backup)')), [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
('c', 'check', None, _('require clean working directory')), ('c', 'check', None, _('require clean working directory')),
('m', 'merge', None, _('merge uncommitted changes')), ('m', 'merge', None, _('merge uncommitted changes')),
('d', 'date', '', _('tipmost revision matching date'), _('DATE')), ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
('r', 'rev', '', _('revision'), _('REV')) ('r', 'rev', '', _('revision'), _('REV'))
] + mergetoolopts, ] + mergetoolopts,
_('[-C|-c|-m] [-d DATE] [[-r] REV]'), _('[-C|-c|-m] [-d DATE] [[-r] REV]'),

mercurial/configitems.py

default=3, default=3,
) )
coreconfigitem('share', 'pool', coreconfigitem('share', 'pool',
default=None, default=None,
) )
coreconfigitem('share', 'poolnaming', coreconfigitem('share', 'poolnaming',
default='identity', default='identity',
) )
coreconfigitem('shelve','maxbackups',
default=10,
)
coreconfigitem('smtp', 'host', coreconfigitem('smtp', 'host',
default=None, default=None,
) )
coreconfigitem('smtp', 'local_hostname', coreconfigitem('smtp', 'local_hostname',
default=None, default=None,
) )
coreconfigitem('smtp', 'password', coreconfigitem('smtp', 'password',
default=None, default=None,

mercurial/shelve.py

  • This file was moved from hgext/shelve.py.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import errno import errno
import itertools import itertools
import stat import stat
from mercurial.i18n import _ from .i18n import _
from mercurial import ( from . import (
bookmarks, bookmarks,
bundle2, bundle2,
bundlerepo, bundlerepo,
changegroup, changegroup,
cmdutil, cmdutil,
discovery, discovery,
error, error,
exchange, exchange,
hg, hg,
lock as lockmod, lock as lockmod,
mdiff, mdiff,
merge, merge,
node as nodemod, node as nodemod,
patch, patch,
phases, phases,
pycompat, pycompat,
registrar,
repair, repair,
scmutil, scmutil,
templatefilters, templatefilters,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
from .utils import (
from . import (
rebase,
)
from mercurial.utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
cmdtable = {}
command = registrar.command(cmdtable)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = 'ships-with-hg-core'
configtable = {}
configitem = registrar.configitem(configtable)
configitem('shelve', 'maxbackups',
default=10,
)
backupdir = 'shelve-backup' backupdir = 'shelve-backup'
shelvedir = 'shelved' shelvedir = 'shelved'
shelvefileextensions = ['hg', 'patch', 'shelve'] shelvefileextensions = ['hg', 'patch', 'shelve']
# universal extension is present in all types of shelves # universal extension is present in all types of shelves
patchextension = 'patch' patchextension = 'patch'
# we never need the user, so we use a # we never need the user, so we use a
# generic user for all shelve operations # generic user for all shelve operations
for mtime, f in hgfiles[:len(hgfiles) - maxbackups]: for mtime, f in hgfiles[:len(hgfiles) - maxbackups]:
if mtime == bordermtime: if mtime == bordermtime:
# keep it, because timestamp can't decide exact order of backups # keep it, because timestamp can't decide exact order of backups
continue continue
base = f[:-(1 + len(patchextension))] base = f[:-(1 + len(patchextension))]
for ext in shelvefileextensions: for ext in shelvefileextensions:
vfs.tryunlink(base + '.' + ext) vfs.tryunlink(base + '.' + ext)
def _backupactivebookmark(repo): def _backupactivebookmark(repo):
activebookmark = repo._activebookmark activebookmark = repo._activebookmark
if activebookmark: if activebookmark:
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
return activebookmark return activebookmark
def _restoreactivebookmark(repo, mark): def _restoreactivebookmark(repo, mark):
if mark: if mark:
bookmarks.activate(repo, mark) bookmarks.activate(repo, mark)
martinvonzUnsubmitted
Done

This doesn't seem right. It seems D3693 just forgot to delete clearstatus(). Could you send a patch before this one to do that?

martinvonz: This doesn't seem right. It seems D3693 just forgot to delete `clearstatus()`. Could you send a…
navaneeth.sureshAuthorUnsubmitted
Done

Doing that right away!

navaneeth.suresh: Doing that right away!
def _aborttransaction(repo, tr): def _aborttransaction(repo, tr):
'''Abort current transaction for shelve/unshelve, but keep dirstate '''Abort current transaction for shelve/unshelve, but keep dirstate
''' '''
dirstatebackupname = 'dirstate.shelve' dirstatebackupname = 'dirstate.shelve'
repo.dirstate.savebackup(tr, dirstatebackupname) repo.dirstate.savebackup(tr, dirstatebackupname)
tr.abort() tr.abort()
repo.dirstate.restorebackup(None, dirstatebackupname) repo.dirstate.restorebackup(None, dirstatebackupname)
merge.update(repo, state.pendingctx, branchmerge=False, force=True) merge.update(repo, state.pendingctx, branchmerge=False, force=True)
if (state.activebookmark if (state.activebookmark
and state.activebookmark in repo._bookmarks): and state.activebookmark in repo._bookmarks):
bookmarks.activate(repo, state.activebookmark) bookmarks.activate(repo, state.activebookmark)
if repo.vfs.exists('unshelverebasestate'): if repo.vfs.exists('unshelverebasestate'):
repo.vfs.rename('unshelverebasestate', 'rebasestate') repo.vfs.rename('unshelverebasestate', 'rebasestate')
from hgext import rebase
pulkitUnsubmitted
Done

We don't import things from hgext in mercurial. I am not sure why.

I think it will be fine to duplicate clearstatus() from rebase to shelve.py for the movement and add a comment that it's copied.

pulkit: We don't import things from hgext in mercurial. I am not sure why. I think it will be fine to…
navaneeth.sureshAuthorUnsubmitted
Done

Done. Now, shelve will no longer be dependent on rebase.

navaneeth.suresh: Done. Now, `shelve` will no longer be dependent on `rebase`.
rebase.clearstatus(repo) rebase.clearstatus(repo)
mergefiles(ui, repo, state.wctx, state.pendingctx) mergefiles(ui, repo, state.wctx, state.pendingctx)
if not phases.supportinternal(repo): if not phases.supportinternal(repo):
repair.strip(ui, repo, state.nodestoremove, backup=False, repair.strip(ui, repo, state.nodestoremove, backup=False,
topic='shelve') topic='shelve')
finally: finally:
shelvedstate.clear(repo) shelvedstate.clear(repo)
# only strip the shelvectx if we produced one # only strip the shelvectx if we produced one
state.nodestoremove.append(newnode) state.nodestoremove.append(newnode)
shelvectx = repo[newnode] shelvectx = repo[newnode]
hg.updaterepo(repo, pendingctx.node(), overwrite=False) hg.updaterepo(repo, pendingctx.node(), overwrite=False)
if repo.vfs.exists('unshelverebasestate'): if repo.vfs.exists('unshelverebasestate'):
repo.vfs.rename('unshelverebasestate', 'rebasestate') repo.vfs.rename('unshelverebasestate', 'rebasestate')
from hgext import rebase
rebase.clearstatus(repo) rebase.clearstatus(repo)
mergefiles(ui, repo, state.wctx, shelvectx) mergefiles(ui, repo, state.wctx, shelvectx)
restorebranch(ui, repo, state.branchtorestore) restorebranch(ui, repo, state.branchtorestore)
if not phases.supportinternal(repo): if not phases.supportinternal(repo):
repair.strip(ui, repo, state.nodestoremove, backup=False, repair.strip(ui, repo, state.nodestoremove, backup=False,
topic='shelve') topic='shelve')
wcdeleted = set(repo.status().deleted) wcdeleted = set(repo.status().deleted)
shelvetouched = set(shelvectx.files()) shelvetouched = set(shelvectx.files())
intersection = wcdeleted.intersection(shelvetouched) intersection = wcdeleted.intersection(shelvetouched)
if intersection: if intersection:
m = _("shelved change touches missing files") m = _("shelved change touches missing files")
hint = _("run hg status to see which files are missing") hint = _("run hg status to see which files are missing")
raise error.Abort(m, hint=hint) raise error.Abort(m, hint=hint)
@command('unshelve',
[('a', 'abort', None,
_('abort an incomplete unshelve operation')),
('c', 'continue', None,
_('continue an incomplete unshelve operation')),
('k', 'keep', None,
_('keep shelve after unshelving')),
('n', 'name', '',
_('restore shelved change with given name'), _('NAME')),
('t', 'tool', '', _('specify merge tool')),
('', 'date', '',
_('set date for temporary commits (DEPRECATED)'), _('DATE'))],
_('hg unshelve [[-n] SHELVED]'),
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
def unshelve(ui, repo, *shelved, **opts):
"""restore a shelved change to the working directory
This command accepts an optional name of a shelved change to
restore. If none is given, the most recent shelved change is used.
If a shelved change is applied successfully, the bundle that
contains the shelved changes is moved to a backup location
(.hg/shelve-backup).
Since you can restore a shelved change on top of an arbitrary
commit, it is possible that unshelving will result in a conflict
between your changes and the commits you are unshelving onto. If
this occurs, you must resolve the conflict, then use
``--continue`` to complete the unshelve operation. (The bundle
will not be moved until you successfully complete the unshelve.)
(Alternatively, you can use ``--abort`` to abandon an unshelve
that causes a conflict. This reverts the unshelved changes, and
leaves the bundle in place.)
If bare shelved change(when no files are specified, without interactive,
include and exclude option) was done on newly created branch it would
restore branch information to the working directory.
After a successful unshelve, the shelved changes are stored in a
backup directory. Only the N most recent backups are kept. N
defaults to 10 but can be overridden using the ``shelve.maxbackups``
configuration option.
.. container:: verbose
Timestamp in seconds is used to decide order of backups. More
than ``maxbackups`` backups are kept, if same timestamp
prevents from deciding exact order of them, for safety.
"""
with repo.wlock():
return _dounshelve(ui, repo, *shelved, **opts)
def _dounshelve(ui, repo, *shelved, **opts): def _dounshelve(ui, repo, *shelved, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
abortf = opts.get('abort') abortf = opts.get('abort')
continuef = opts.get('continue') continuef = opts.get('continue')
if not abortf and not continuef: if not abortf and not continuef:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
shelved = list(shelved) shelved = list(shelved)
if opts.get("name"): if opts.get("name"):
shelvedstate.clear(repo) shelvedstate.clear(repo)
_finishunshelve(repo, oldtiprev, tr, activebookmark) _finishunshelve(repo, oldtiprev, tr, activebookmark)
unshelvecleanup(ui, repo, basename, opts) unshelvecleanup(ui, repo, basename, opts)
finally: finally:
if tr: if tr:
tr.release() tr.release()
lockmod.release(lock) lockmod.release(lock)
@command('shelve',
[('A', 'addremove', None,
_('mark new/missing files as added/removed before shelving')),
('u', 'unknown', None,
_('store unknown files in the shelve')),
('', 'cleanup', None,
_('delete all shelved changes')),
('', 'date', '',
_('shelve with the specified commit date'), _('DATE')),
('d', 'delete', None,
_('delete the named shelved change(s)')),
('e', 'edit', False,
_('invoke editor on commit messages')),
('k', 'keep', False,
_('shelve, but keep changes in the working directory')),
('l', 'list', None,
_('list current shelves')),
('m', 'message', '',
_('use text as shelve message'), _('TEXT')),
('n', 'name', '',
_('use the given name for the shelved commit'), _('NAME')),
('p', 'patch', None,
_('output patches for changes (provide the names of the shelved '
'changes as positional arguments)')),
('i', 'interactive', None,
_('interactive mode, only works while creating a shelve')),
('', 'stat', None,
_('output diffstat-style summary of changes (provide the names of '
'the shelved changes as positional arguments)')
)] + cmdutil.walkopts,
_('hg shelve [OPTION]... [FILE]...'),
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
def shelvecmd(ui, repo, *pats, **opts):
'''save and set aside changes from the working directory
Shelving takes files that "hg status" reports as not clean, saves
the modifications to a bundle (a shelved change), and reverts the
files so that their state in the working directory becomes clean.
To restore these changes to the working directory, using "hg
unshelve"; this will work even if you switch to a different
commit.
When no files are specified, "hg shelve" saves all not-clean
files. If specific files or directories are named, only changes to
those files are shelved.
In bare shelve (when no files are specified, without interactive,
include and exclude option), shelving remembers information if the
working directory was on newly created branch, in other words working
directory was on different branch than its first parent. In this
situation unshelving restores branch information to the working directory.
Each shelved change has a name that makes it easier to find later.
The name of a shelved change defaults to being based on the active
bookmark, or if there is no active bookmark, the current named
branch. To specify a different name, use ``--name``.
To see a list of existing shelved changes, use the ``--list``
option. For each shelved change, this will print its name, age,
and description; use ``--patch`` or ``--stat`` for more details.
To delete specific shelved changes, use ``--delete``. To delete
all shelved changes, use ``--cleanup``.
'''
opts = pycompat.byteskwargs(opts)
allowables = [
('addremove', {'create'}), # 'create' is pseudo action
('unknown', {'create'}),
('cleanup', {'cleanup'}),
# ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
('delete', {'delete'}),
('edit', {'create'}),
('keep', {'create'}),
('list', {'list'}),
('message', {'create'}),
('name', {'create'}),
('patch', {'patch', 'list'}),
('stat', {'stat', 'list'}),
]
def checkopt(opt):
if opts.get(opt):
for i, allowable in allowables:
if opts[i] and opt not in allowable:
raise error.Abort(_("options '--%s' and '--%s' may not be "
"used together") % (opt, i))
return True
if checkopt('cleanup'):
if pats:
raise error.Abort(_("cannot specify names when using '--cleanup'"))
return cleanupcmd(ui, repo)
elif checkopt('delete'):
return deletecmd(ui, repo, pats)
elif checkopt('list'):
return listcmd(ui, repo, pats, opts)
elif checkopt('patch') or checkopt('stat'):
return patchcmds(ui, repo, pats, opts)
else:
return createcmd(ui, repo, pats, opts)
def extsetup(ui):
cmdutil.unfinishedstates.append(
[shelvedstate._filename, False, False,
_('unshelve already in progress'),
_("use 'hg unshelve --continue' or 'hg unshelve --abort'")])
cmdutil.afterresolvedstates.append(
[shelvedstate._filename, _('hg unshelve --continue')])

mercurial/ui.py

# paginate = never # paginate = never
[extensions] [extensions]
# uncomment the lines below to enable some popular extensions # uncomment the lines below to enable some popular extensions
# (see 'hg help extensions' for more info) # (see 'hg help extensions' for more info)
# #
# histedit = # histedit =
# rebase = # rebase =
# shelve =
# uncommit = # uncommit =
""", """,
'cloned': 'cloned':
b"""# example repository config (see 'hg help config' for more info) b"""# example repository config (see 'hg help config' for more info)
[paths] [paths]
default = %s default = %s

tests/test-bookflow.t

$ hg up Z | grep Z $ hg up Z | grep Z
(activating bookmark Z) (activating bookmark Z)
$ hg book | grep \* # make sure active bookmark $ hg book | grep \* # make sure active bookmark
\* Z 10:* (glob) \* Z 10:* (glob)
$ echo "test b" >> test $ echo "test b" >> test
$ hg diff --stat $ hg diff --stat
test | 1 + test | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ hg --config extensions.shelve= shelve $ hg shelve
shelved as Z shelved as Z
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -uq $ hg pull -uq
$ hg --trace --config extensions.shelve= unshelve $ hg unshelve
unshelving change 'Z' unshelving change 'Z'
rebasing shelved changes rebasing shelved changes
$ hg diff --stat $ hg diff --stat
test | 1 + test | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
make the bookmark move by updating it on a, and then pulling with a local change make the bookmark move by updating it on a, and then pulling with a local change

tests/test-completion.t

recover recover
remove remove
rename rename
resolve resolve
revert revert
rollback rollback
root root
serve serve
shelve
status status
summary summary
tag tag
tags tags
tip tip
unbundle unbundle
unshelve
update update
verify verify
version version
Show all commands that start with "a" Show all commands that start with "a"
$ hg debugcomplete a $ hg debugcomplete a
add add
addremove addremove
-q -q
-t -t
-v -v
-y -y
Show an error if we use --options with an ambiguous abbreviation Show an error if we use --options with an ambiguous abbreviation
$ hg debugcomplete --options s $ hg debugcomplete --options s
hg: command 's' is ambiguous: hg: command 's' is ambiguous:
serve showconfig status summary serve shelve showconfig status summary
[255] [255]
Show all commands + options Show all commands + options
$ hg debugcommands $ hg debugcommands
add: include, exclude, subrepos, dry-run add: include, exclude, subrepos, dry-run
addremove: similarity, subrepos, include, exclude, dry-run addremove: similarity, subrepos, include, exclude, dry-run
annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template
archive: no-decode, prefix, rev, type, subrepos, include, exclude archive: no-decode, prefix, rev, type, subrepos, include, exclude
recover: verify recover: verify
remove: after, force, subrepos, include, exclude, dry-run remove: after, force, subrepos, include, exclude, dry-run
rename: after, force, include, exclude, dry-run rename: after, force, include, exclude, dry-run
resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template
revert: all, date, rev, no-backup, interactive, include, exclude, dry-run revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
rollback: dry-run, force rollback: dry-run, force
root: root:
serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos
shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, include, exclude
status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
summary: remote summary: remote
tag: force, local, rev, remove, edit, message, date, user tag: force, local, rev, remove, edit, message, date, user
tags: template tags: template
tip: patch, git, style, template tip: patch, git, style, template
unbundle: update unbundle: update
unshelve: abort, continue, keep, name, tool, date
update: clean, check, merge, date, rev, tool update: clean, check, merge, date, rev, tool
verify: full verify: full
version: template version: template
$ hg init a $ hg init a
$ cd a $ cd a
$ echo fee > fee $ echo fee > fee
$ hg ci -q -Amfee $ hg ci -q -Amfee

tests/test-copytrace-heuristics.t

> EOF > EOF
> } > }
> __EOF__ > __EOF__
$ . "$TESTTMP/copytrace.sh" $ . "$TESTTMP/copytrace.sh"
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> rebase= > rebase=
> shelve=
> [alias] > [alias]
> l = log -G -T 'rev: {rev}\ndesc: {desc}\n' > l = log -G -T 'rev: {rev}\ndesc: {desc}\n'
> pl = log -G -T 'rev: {rev}, phase: {phase}\ndesc: {desc}\n' > pl = log -G -T 'rev: {rev}, phase: {phase}\ndesc: {desc}\n'
> EOF > EOF
NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to
prevent the full copytrace algorithm to run and test the heuristic algorithm prevent the full copytrace algorithm to run and test the heuristic algorithm
without complexing the test cases with public and draft commits. without complexing the test cases with public and draft commits.

tests/test-globalopts.t

addremove add all new files, delete all missing files addremove add all new files, delete all missing files
files list tracked files files list tracked files
forget forget the specified files on the next commit forget forget the specified files on the next commit
remove remove the specified files on the next commit remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files resolve redo merges or set/view the merge status of files
revert restore files to their checkout state revert restore files to their checkout state
root print the root (top) of the current working directory root print the root (top) of the current working directory
shelve save and set aside changes from the working directory
status show changed files in the working directory status show changed files in the working directory
summary summarize working directory state summary summarize working directory state
unshelve restore a shelved change to the working directory
update update working directory (or switch revisions) update update working directory (or switch revisions)
Change import/export: Change import/export:
archive create an unversioned archive of a repository revision archive create an unversioned archive of a repository revision
bundle create a bundle file bundle create a bundle file
export dump the header and diffs for one or more changesets export dump the header and diffs for one or more changesets
import import an ordered set of patches import import an ordered set of patches
addremove add all new files, delete all missing files addremove add all new files, delete all missing files
files list tracked files files list tracked files
forget forget the specified files on the next commit forget forget the specified files on the next commit
remove remove the specified files on the next commit remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files resolve redo merges or set/view the merge status of files
revert restore files to their checkout state revert restore files to their checkout state
root print the root (top) of the current working directory root print the root (top) of the current working directory
shelve save and set aside changes from the working directory
status show changed files in the working directory status show changed files in the working directory
summary summarize working directory state summary summarize working directory state
unshelve restore a shelved change to the working directory
update update working directory (or switch revisions) update update working directory (or switch revisions)
Change import/export: Change import/export:
archive create an unversioned archive of a repository revision archive create an unversioned archive of a repository revision
bundle create a bundle file bundle create a bundle file
export dump the header and diffs for one or more changesets export dump the header and diffs for one or more changesets
import import an ordered set of patches import import an ordered set of patches

tests/test-help-hide.t

addremove add all new files, delete all missing files addremove add all new files, delete all missing files
files list tracked files files list tracked files
forget forget the specified files on the next commit forget forget the specified files on the next commit
remove remove the specified files on the next commit remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files resolve redo merges or set/view the merge status of files
revert restore files to their checkout state revert restore files to their checkout state
root print the root (top) of the current working directory root print the root (top) of the current working directory
shelve save and set aside changes from the working directory
status show changed files in the working directory status show changed files in the working directory
summary summarize working directory state summary summarize working directory state
unshelve restore a shelved change to the working directory
update update working directory (or switch revisions) update update working directory (or switch revisions)
Change import/export: Change import/export:
archive create an unversioned archive of a repository revision archive create an unversioned archive of a repository revision
bundle create a bundle file bundle create a bundle file
export dump the header and diffs for one or more changesets export dump the header and diffs for one or more changesets
import import an ordered set of patches import import an ordered set of patches
addremove add all new files, delete all missing files addremove add all new files, delete all missing files
files list tracked files files list tracked files
forget forget the specified files on the next commit forget forget the specified files on the next commit
remove remove the specified files on the next commit remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files resolve redo merges or set/view the merge status of files
revert restore files to their checkout state revert restore files to their checkout state
root print the root (top) of the current working directory root print the root (top) of the current working directory
shelve save and set aside changes from the working directory
status show changed files in the working directory status show changed files in the working directory
summary summarize working directory state summary summarize working directory state
unshelve restore a shelved change to the working directory
update update working directory (or switch revisions) update update working directory (or switch revisions)
Change import/export: Change import/export:
archive create an unversioned archive of a repository revision archive create an unversioned archive of a repository revision
bundle create a bundle file bundle create a bundle file
export dump the header and diffs for one or more changesets export dump the header and diffs for one or more changesets
import import an ordered set of patches import import an ordered set of patches

tests/test-help.t

addremove add all new files, delete all missing files addremove add all new files, delete all missing files
files list tracked files files list tracked files
forget forget the specified files on the next commit forget forget the specified files on the next commit
remove remove the specified files on the next commit remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files resolve redo merges or set/view the merge status of files
revert restore files to their checkout state revert restore files to their checkout state
root print the root (top) of the current working directory root print the root (top) of the current working directory
shelve save and set aside changes from the working directory
status show changed files in the working directory status show changed files in the working directory
summary summarize working directory state summary summarize working directory state
unshelve restore a shelved change to the working directory
update update working directory (or switch revisions) update update working directory (or switch revisions)
Change import/export: Change import/export:
archive create an unversioned archive of a repository revision archive create an unversioned archive of a repository revision
bundle create a bundle file bundle create a bundle file
export dump the header and diffs for one or more changesets export dump the header and diffs for one or more changesets
import import an ordered set of patches import import an ordered set of patches
addremove add all new files, delete all missing files addremove add all new files, delete all missing files
files list tracked files files list tracked files
forget forget the specified files on the next commit forget forget the specified files on the next commit
remove remove the specified files on the next commit remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files resolve redo merges or set/view the merge status of files
revert restore files to their checkout state revert restore files to their checkout state
root print the root (top) of the current working directory root print the root (top) of the current working directory
shelve save and set aside changes from the working directory
status show changed files in the working directory status show changed files in the working directory
summary summarize working directory state summary summarize working directory state
unshelve restore a shelved change to the working directory
update update working directory (or switch revisions) update update working directory (or switch revisions)
Change import/export: Change import/export:
archive create an unversioned archive of a repository revision archive create an unversioned archive of a repository revision
bundle create a bundle file bundle create a bundle file
export dump the header and diffs for one or more changesets export dump the header and diffs for one or more changesets
import import an ordered set of patches import import an ordered set of patches
mq manage a stack of patches mq manage a stack of patches
notify hooks for sending email push notifications notify hooks for sending email push notifications
patchbomb command to send changesets as (a series of) patch emails patchbomb command to send changesets as (a series of) patch emails
purge command to delete untracked files from the working purge command to delete untracked files from the working
directory directory
relink recreates hardlinks between repository clones relink recreates hardlinks between repository clones
schemes extend schemes with shortcuts to repository swarms schemes extend schemes with shortcuts to repository swarms
share share a common history between several working directories share share a common history between several working directories
shelve save and restore changes to the working directory
strip strip changesets and their descendants from history strip strip changesets and their descendants from history
transplant command to transplant changesets from another branch transplant command to transplant changesets from another branch
win32mbcs allow the use of MBCS paths with problematic encodings win32mbcs allow the use of MBCS paths with problematic encodings
zeroconf discover and advertise repositories on the local network zeroconf discover and advertise repositories on the local network
#endif #endif
Verify that deprecated extensions are included if --verbose: Verify that deprecated extensions are included if --verbose:
<tr><td> <tr><td>
<a href="/help/shellalias"> <a href="/help/shellalias">
shellalias shellalias
</a> </a>
</td><td> </td><td>
(no help text available) (no help text available)
</td></tr> </td></tr>
<tr><td> <tr><td>
<a href="/help/shelve">
shelve
</a>
</td><td>
save and set aside changes from the working directory
</td></tr>
<tr><td>
<a href="/help/tag"> <a href="/help/tag">
tag tag
</a> </a>
</td><td> </td><td>
add one or more tags for the current or given revision add one or more tags for the current or given revision
</td></tr> </td></tr>
<tr><td> <tr><td>
<a href="/help/tags"> <a href="/help/tags">
tags tags
</a> </a>
</td><td> </td><td>
list repository tags list repository tags
</td></tr> </td></tr>
<tr><td> <tr><td>
<a href="/help/unbundle"> <a href="/help/unbundle">
unbundle unbundle
</a> </a>
</td><td> </td><td>
apply one or more bundle files apply one or more bundle files
</td></tr> </td></tr>
<tr><td> <tr><td>
<a href="/help/unshelve">
unshelve
</a>
</td><td>
restore a shelved change to the working directory
</td></tr>
<tr><td>
<a href="/help/verify"> <a href="/help/verify">
verify verify
</a> </a>
</td><td> </td><td>
verify the integrity of the repository verify the integrity of the repository
</td></tr> </td></tr>
<tr><td> <tr><td>
<a href="/help/version"> <a href="/help/version">

tests/test-hgweb-json.t

"summary": "restore files to their checkout state", "summary": "restore files to their checkout state",
"topic": "revert" "topic": "revert"
}, },
{ {
"summary": "print the root (top) of the current working directory", "summary": "print the root (top) of the current working directory",
"topic": "root" "topic": "root"
}, },
{ {
"summary": "save and set aside changes from the working directory",
"topic": "shelve"
},
{
"summary": "add one or more tags for the current or given revision", "summary": "add one or more tags for the current or given revision",
"topic": "tag" "topic": "tag"
}, },
{ {
"summary": "list repository tags", "summary": "list repository tags",
"topic": "tags" "topic": "tags"
}, },
{ {
"summary": "apply one or more bundle files", "summary": "apply one or more bundle files",
"topic": "unbundle" "topic": "unbundle"
}, },
{ {
"summary": "restore a shelved change to the working directory",
"topic": "unshelve"
},
{
"summary": "verify the integrity of the repository", "summary": "verify the integrity of the repository",
"topic": "verify" "topic": "verify"
}, },
{ {
"summary": "output version and copyright information", "summary": "output version and copyright information",
"topic": "version" "topic": "version"
} }
], ],

tests/test-keyword.t

a a
enable keyword expansion again enable keyword expansion again
$ cat $HGRCPATH.backup >> $HGRCPATH $ cat $HGRCPATH.backup >> $HGRCPATH
Test restricted mode with unshelve Test restricted mode with unshelve
$ cat <<EOF >> $HGRCPATH
> [extensions]
> shelve =
> EOF
$ echo xxxx >> a $ echo xxxx >> a
$ hg diff $ hg diff
diff -r 800511b3a22d a diff -r 800511b3a22d a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a * (glob) +++ b/a * (glob)
@@ -2,3 +2,4 @@ @@ -2,3 +2,4 @@
do not process $Id: do not process $Id:
xxx $ xxx $

tests/test-shelve.t

#testcases stripbased phasebased #testcases stripbased phasebased
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq = > mq =
> shelve =
> [defaults] > [defaults]
> diff = --nodates --git > diff = --nodates --git
> qnew = --date '0 0' > qnew = --date '0 0'
> [shelve] > [shelve]
> maxbackups = 2 > maxbackups = 2
> EOF > EOF
#if phasebased #if phasebased
To see a list of existing shelved changes, use the "--list" option. For To see a list of existing shelved changes, use the "--list" option. For
each shelved change, this will print its name, age, and description; use " each shelved change, this will print its name, age, and description; use "
--patch" or "--stat" for more details. --patch" or "--stat" for more details.
To delete specific shelved changes, use "--delete". To delete all shelved To delete specific shelved changes, use "--delete". To delete all shelved
changes, use "--cleanup". changes, use "--cleanup".
(use 'hg help -e shelve' to show help for the shelve extension)
options ([+] can be repeated): options ([+] can be repeated):
-A --addremove mark new/missing files as added/removed before -A --addremove mark new/missing files as added/removed before
shelving shelving
-u --unknown store unknown files in the shelve -u --unknown store unknown files in the shelve
--cleanup delete all shelved changes --cleanup delete all shelved changes
--date DATE shelve with the specified commit date --date DATE shelve with the specified commit date
-d --delete delete the named shelved change(s) -d --delete delete the named shelved change(s)

tests/test-shelve2.t

#testcases stripbased phasebased #testcases stripbased phasebased
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq = > mq =
> shelve =
> [defaults] > [defaults]
> diff = --nodates --git > diff = --nodates --git
> qnew = --date '0 0' > qnew = --date '0 0'
> [shelve] > [shelve]
> maxbackups = 2 > maxbackups = 2
> EOF > EOF
#if phasebased #if phasebased

tests/test-treemanifest.t

1 5 25ecb8cb8618 000000000000 000000000000 1 5 25ecb8cb8618 000000000000 000000000000
2 6 5b16163a30c6 25ecb8cb8618 000000000000 2 6 5b16163a30c6 25ecb8cb8618 000000000000
$ hg st --change tip $ hg st --change tip
M dir1/a M dir1/a
Shelving and unshelving should work Shelving and unshelving should work
$ echo foo >> dir1/a $ echo foo >> dir1/a
$ hg --config extensions.shelve= shelve $ hg shelve
shelved as default shelved as default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --config extensions.shelve= unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
$ hg diff --nodates $ hg diff --nodates
diff -r 708a273da119 dir1/a diff -r 708a273da119 dir1/a
--- a/dir1/a --- a/dir1/a
+++ b/dir1/a +++ b/dir1/a
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
1 1
+foo +foo