Mercurial > hg
comparison hgext/shelve.py @ 19963:6f29cc567845 stable
shelve: disallow commit while unshelve is in progress
Before this patch, commit is allowed even while unshelve is in
progress.
In the other hand, "hg unshelve --abort" and "hg unshelve --continue"
check whether parent revisions of the working directory have changed
or not since last "hg unshelve", and abort without clearing state for
unshelve in progress if they have.
This causes that accidental commit makes clearing state for unshelve
difficult in ordinary ways.
This patch disallows commit while unshelve is in progress for
consistency.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 29 Oct 2013 01:03:43 +0900 |
parents | 1d7a36ff2615 |
children | ff38dfbce4f8 |
comparison
equal
deleted
inserted
replaced
19962:66b21ce60a19 | 19963:6f29cc567845 |
---|---|
702 "used when shelving a change") % (i,)) | 702 "used when shelving a change") % (i,)) |
703 return createcmd(ui, repo, pats, opts) | 703 return createcmd(ui, repo, pats, opts) |
704 | 704 |
705 def extsetup(ui): | 705 def extsetup(ui): |
706 cmdutil.unfinishedstates.append( | 706 cmdutil.unfinishedstates.append( |
707 [shelvedstate._filename, False, True, _('unshelve already in progress'), | 707 [shelvedstate._filename, False, False, |
708 _('unshelve already in progress'), | |
708 _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) | 709 _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) |