mercurial-scm/hg: hgext/shelve.py annotate

annotate hgext/shelve.py @ 26523:1d23bf6cd90a

shelve: restore shelved dirstate explicitly after aborting transaction Before this patch, "hg shelve" uses aborting a current transaction to discard temporary changes while shelving. This assumes that dirstate changes in a transaction scope are kept even after aborting it. But this assumption will be broken by "transactional dirstate". See the wiki page below for detail about it. https://mercurial.selenic.com/wiki/DirstateTransactionPlan This patch explicitly saves shelved dirstate just before aborting current transaction, and restore dirstate with it after aborting by utility function '_aborttransaction()' added by previous patch. This patch replaces 'if tr: tr.abort()' by 'lockmod.release(tr)', because the former is already done in '_aborttransaction()' (and the latter has no effect), if current transaction is aborted in it successfully. Otherwise, the latter is enough to trigger aborting.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Thu, 08 Oct 2015 01:41:30 +0900
parents	10f14bb22950
children	61c295d9d402

rev	line source
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1 # shelve.py - save/restore working directory state
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	2 #
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	3 # Copyright 2013 Facebook, Inc.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	4 #
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	7
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	8 """save and restore changes to the working directory
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	9
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	10 The "hg shelve" command saves changes made to the working directory
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	11 and reverts those changes, resetting the working directory to a clean
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	12 state.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	13
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	14 Later on, the "hg unshelve" command restores the changes saved by "hg
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	15 shelve". Changes can be restored even after updating to a different
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	16 parent, in which case Mercurial's merge machinery will resolve any
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	17 conflicts if necessary.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	18
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	19 You can have more than one shelved change outstanding at a time; each
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	20 shelved change has a distinct name. For details, see the help for "hg
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	21 shelve".
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	22 """
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	23
25113 0ca8410ea345 util: drop alias for collections.deque Martin von Zweigbergk <martinvonz@google.com> parents: 25104 diff changeset	24 import collections
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	25 import itertools
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	26 from mercurial.i18n import _
20407 955547eb2e20 shelve: publicancestors do not have to visit nullrev Mads Kiilerich <madski@unity3d.com> parents: 20149 diff changeset	27 from mercurial.node import nullid, nullrev, bin, hex
20409 0b7a9940a397 shelve: mention walk options in help Mads Kiilerich <madski@unity3d.com> parents: 20408 diff changeset	28 from mercurial import changegroup, cmdutil, scmutil, phases, commands
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	29 from mercurial import error, hg, mdiff, merge, patch, repair, util
22898 43816070284e shelve: add a bundlerepo method Matt Mackall <mpm@selenic.com> parents: 22844 diff changeset	30 from mercurial import templatefilters, exchange, bundlerepo
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	31 from mercurial import lock as lockmod
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	32 from hgext import rebase
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	33 import errno
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	34
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	35 cmdtable = {}
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	36 command = cmdutil.command(cmdtable)
25186 80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25113 diff changeset	37 # Note for extension authors: ONLY specify testedwith = 'internal' for
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25113 diff changeset	38 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25113 diff changeset	39 # be specifying the version(s) of Mercurial they are tested with, or
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25113 diff changeset	40 # leave the attribute unspecified.
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	41 testedwith = 'internal'
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	42
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	43 backupdir = 'shelve-backup'
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	44
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	45 class shelvedfile(object):
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	46 """Helper for the file storing a single shelve
df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	47
22581 c5ece02fb211 shelve: avoid writing file that is never read from Martin von Zweigbergk <martinvonz@gmail.com> parents: 22202 diff changeset	48 Handles common functions on shelve files (.hg/.patch) using
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	49 the vfs layer"""
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	50 def __init__(self, repo, name, filetype=None):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	51 self.repo = repo
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	52 self.name = name
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	53 self.vfs = scmutil.vfs(repo.join('shelved'))
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	54 self.backupvfs = scmutil.vfs(repo.join(backupdir))
23895 cda18ded2c48 changegroup.writebundle: provide ui Eric Sumner <ericsumner@fb.com> parents: 23877 diff changeset	55 self.ui = self.repo.ui
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	56 if filetype:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	57 self.fname = name + '.' + filetype
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	58 else:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	59 self.fname = name
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	60
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	61 def exists(self):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	62 return self.vfs.exists(self.fname)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	63
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	64 def filename(self):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	65 return self.vfs.join(self.fname)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	66
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	67 def backupfilename(self):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	68 def gennames(base):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	69 yield base
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	70 base, ext = base.rsplit('.', 1)
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	71 for i in itertools.count(1):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	72 yield '%s-%d.%s' % (base, i, ext)
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	73
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	74 name = self.backupvfs.join(self.fname)
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	75 for n in gennames(name):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	76 if not self.backupvfs.exists(n):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	77 return n
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	78
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	79 def movetobackup(self):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	80 if not self.backupvfs.isdir():
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	81 self.backupvfs.makedir()
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	82 util.rename(self.filename(), self.backupfilename())
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	83
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	84 def stat(self):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	85 return self.vfs.stat(self.fname)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	86
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	87 def opener(self, mode='rb'):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	88 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	89 return self.vfs(self.fname, mode)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25260 diff changeset	90 except IOError as err:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	91 if err.errno != errno.ENOENT:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	92 raise
19964 ff38dfbce4f8 shelve: remove useless and incorrect code paths for file access FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19963 diff changeset	93 raise util.Abort(_("shelved change '%s' not found") % self.name)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	94
20982 1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	95 def applybundle(self):
1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	96 fp = self.opener()
1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	97 try:
21064 4d9d490d7bbe bundle2: add a ui argument to readbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21063 diff changeset	98 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
20982 1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	99 changegroup.addchangegroup(self.repo, gen, 'unshelve',
22042 8d99c107b041 shelve: use `targetphase` while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22040 diff changeset	100 'bundle:' + self.vfs.join(self.fname),
8d99c107b041 shelve: use `targetphase` while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 22040 diff changeset	101 targetphase=phases.secret)
20982 1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	102 finally:
1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	103 fp.close()
1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	104
22898 43816070284e shelve: add a bundlerepo method Matt Mackall <mpm@selenic.com> parents: 22844 diff changeset	105 def bundlerepo(self):
43816070284e shelve: add a bundlerepo method Matt Mackall <mpm@selenic.com> parents: 22844 diff changeset	106 return bundlerepo.bundlerepository(self.repo.baseui, self.repo.root,
43816070284e shelve: add a bundlerepo method Matt Mackall <mpm@selenic.com> parents: 22844 diff changeset	107 self.vfs.join(self.fname))
26506 edecf059fda6 shelve: move changegroup generation inside writebundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 26505 diff changeset	108 def writebundle(self, bases, node):
26507 ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	109 btype = 'HG10BZ'
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	110 cgversion = '01'
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	111 compression = None
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	112 if 'generaldelta' in self.repo.requirements:
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	113 btype = 'HG20'
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	114 cgversion = '02'
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	115 compression = 'BZ'
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	116
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	117 cg = changegroup.changegroupsubset(self.repo, bases, [node], 'shelve',
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	118 version=cgversion)
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	119 changegroup.writebundle(self.ui, cg, self.fname, btype, self.vfs,
ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	120 compression=compression)
20983 2778616de7ce shelve: add "writebundle()" to invoke "writebundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20982 diff changeset	121
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	122 class shelvedstate(object):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	123 """Handle persistence during unshelving operations.
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	124
df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	125 Handles saving and restoring a shelved state. Ensures that different
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	126 versions of a shelved state are possible and handles them appropriately.
1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	127 """
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	128 _version = 1
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	129 _filename = 'shelvedstate'
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	130
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	131 @classmethod
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	132 def load(cls, repo):
23877 7cc77030c557 localrepo: remove all external users of localrepo.opener Angel Ezquerra <angel.ezquerra@gmail.com> parents: 22922 diff changeset	133 fp = repo.vfs(cls._filename)
19904 5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	134 try:
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	135 version = int(fp.readline().strip())
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	136
19904 5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	137 if version != cls._version:
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	138 raise util.Abort(_('this version of shelve is incompatible '
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	139 'with the version used in this repo'))
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	140 name = fp.readline().strip()
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	141 wctx = fp.readline().strip()
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	142 pendingctx = fp.readline().strip()
19904 5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	143 parents = [bin(h) for h in fp.readline().split()]
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	144 stripnodes = [bin(h) for h in fp.readline().split()]
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	145 finally:
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	146 fp.close()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	147
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	148 obj = cls()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	149 obj.name = name
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	150 obj.wctx = repo[bin(wctx)]
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	151 obj.pendingctx = repo[bin(pendingctx)]
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	152 obj.parents = parents
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	153 obj.stripnodes = stripnodes
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	154
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	155 return obj
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	156
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	157 @classmethod
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	158 def save(cls, repo, name, originalwctx, pendingctx, stripnodes):
23877 7cc77030c557 localrepo: remove all external users of localrepo.opener Angel Ezquerra <angel.ezquerra@gmail.com> parents: 22922 diff changeset	159 fp = repo.vfs(cls._filename, 'wb')
19904 5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	160 fp.write('%i\n' % cls._version)
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	161 fp.write('%s\n' % name)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	162 fp.write('%s\n' % hex(originalwctx.node()))
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	163 fp.write('%s\n' % hex(pendingctx.node()))
19904 5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	164 fp.write('%s\n' % ' '.join([hex(p) for p in repo.dirstate.parents()]))
5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	165 fp.write('%s\n' % ' '.join([hex(n) for n in stripnodes]))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	166 fp.close()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	167
19908 07ee5c8867ca shelve: use the class constant in the clear method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19904 diff changeset	168 @classmethod
07ee5c8867ca shelve: use the class constant in the clear method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19904 diff changeset	169 def clear(cls, repo):
07ee5c8867ca shelve: use the class constant in the clear method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19904 diff changeset	170 util.unlinkpath(repo.join(cls._filename), ignoremissing=True)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	171
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	172 def cleanupoldbackups(repo):
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	173 vfs = scmutil.vfs(repo.join(backupdir))
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	174 maxbackups = repo.ui.configint('shelve', 'maxbackups', 10)
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	175 hgfiles = [f for f in vfs.listdir() if f.endswith('.hg')]
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	176 hgfiles = sorted([(vfs.stat(f).st_mtime, f) for f in hgfiles])
25774 4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	177 if 0 < maxbackups and maxbackups < len(hgfiles):
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	178 bordermtime = hgfiles[-maxbackups][0]
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	179 else:
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	180 bordermtime = None
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	181 for mtime, f in hgfiles[:len(hgfiles) - maxbackups]:
25774 4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	182 if mtime == bordermtime:
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	183 # keep it, because timestamp can't decide exact order of backups
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	184 continue
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	185 base = f[:-3]
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	186 for ext in 'hg patch'.split():
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	187 try:
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	188 vfs.unlink(base + '.' + ext)
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	189 except OSError as err:
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	190 if err.errno != errno.ENOENT:
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	191 raise
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	192
26522 10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	193 def _aborttransaction(repo):
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	194 '''Abort current transaction for shelve/unshelve, but keep dirstate
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	195 '''
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	196 backupname = 'dirstate.shelve'
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	197 dirstatebackup = None
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	198 try:
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	199 # create backup of (un)shelved dirstate, because aborting transaction
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	200 # should restore dirstate to one at the beginning of the
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	201 # transaction, which doesn't include the result of (un)shelving
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	202 fp = repo.vfs.open(backupname, "w")
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	203 dirstatebackup = backupname
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	204 # clearing _dirty/_dirtypl of dirstate by _writedirstate below
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	205 # is unintentional. but it doesn't cause problem in this case,
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	206 # because no code path refers them until transaction is aborted.
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	207 repo.dirstate._writedirstate(fp) # write in-memory changes forcibly
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	208
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	209 tr = repo.currenttransaction()
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	210 tr.abort()
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	211
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	212 # TODO: this should be done via transaction.abort()
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	213 repo.dirstate.invalidate() # prevent wlock from writing changes out
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	214
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	215 # restore to backuped dirstate
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	216 repo.vfs.rename(dirstatebackup, 'dirstate')
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	217 dirstatebackup = None
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	218 finally:
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	219 if dirstatebackup:
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	220 repo.vfs.unlink(dirstatebackup)
10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	221
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	222 def createcmd(ui, repo, pats, opts):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	223 """subcommand that creates a new shelve"""
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	224
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	225 def publicancestors(ctx):
20408 3392695abd68 shelve: really pass publicancestors to changegroupsubset - not the parents Mads Kiilerich <madski@unity3d.com> parents: 20407 diff changeset	226 """Compute the public ancestors of a commit.
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	227
20408 3392695abd68 shelve: really pass publicancestors to changegroupsubset - not the parents Mads Kiilerich <madski@unity3d.com> parents: 20407 diff changeset	228 Much faster than the revset ancestors(ctx) & draft()"""
20407 955547eb2e20 shelve: publicancestors do not have to visit nullrev Mads Kiilerich <madski@unity3d.com> parents: 20149 diff changeset	229 seen = set([nullrev])
25113 0ca8410ea345 util: drop alias for collections.deque Martin von Zweigbergk <martinvonz@google.com> parents: 25104 diff changeset	230 visit = collections.deque()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	231 visit.append(ctx)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	232 while visit:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	233 ctx = visit.popleft()
20408 3392695abd68 shelve: really pass publicancestors to changegroupsubset - not the parents Mads Kiilerich <madski@unity3d.com> parents: 20407 diff changeset	234 yield ctx.node()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	235 for parent in ctx.parents():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	236 rev = parent.rev()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	237 if rev not in seen:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	238 seen.add(rev)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	239 if parent.mutable():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	240 visit.append(parent)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	241
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	242 wctx = repo[None]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	243 parents = wctx.parents()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	244 if len(parents) > 1:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	245 raise util.Abort(_('cannot shelve while merging'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	246 parent = parents[0]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	247
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	248 # we never need the user, so we use a generic user for all shelve operations
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	249 user = 'shelve@localhost'
24947 a02d293a1079 bookmarks: rename bookmarkcurrent to activebookmark (API) Ryan McElroy <rmcelroy@fb.com> parents: 24872 diff changeset	250 label = repo._activebookmark or parent.branch() or 'default'
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	251
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	252 # slashes aren't allowed in filenames, therefore we rename it
20937 c0bf8bea10dd shelve: remove unused variable caught by pyflakes Sean Farley <sean.michael.farley@gmail.com> parents: 20149 diff changeset	253 label = label.replace('/', '_')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	254
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	255 def gennames():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	256 yield label
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	257 for i in xrange(1, 100):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	258 yield '%s-%02d' % (label, i)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	259
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	260 def commitfunc(ui, repo, message, match, opts):
19885 6cc696179869 shelve: only save mq state if enabled Sean Farley <sean.michael.farley@gmail.com> parents: 19881 diff changeset	261 hasmq = util.safehasattr(repo, 'mq')
6cc696179869 shelve: only save mq state if enabled Sean Farley <sean.michael.farley@gmail.com> parents: 19881 diff changeset	262 if hasmq:
6cc696179869 shelve: only save mq state if enabled Sean Farley <sean.michael.farley@gmail.com> parents: 19881 diff changeset	263 saved, repo.mq.checkapplied = repo.mq.checkapplied, False
22040 122fa73657c6 shelve: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22005 diff changeset	264 backup = repo.ui.backupconfig('phases', 'new-commit')
19856 28b1b7b9b4a9 shelve: allow shelving of a change with an mq patch applied David Soria Parra <dsp@experimentalworks.net> parents: 19855 diff changeset	265 try:
22040 122fa73657c6 shelve: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22005 diff changeset	266 repo.ui. setconfig('phases', 'new-commit', phases.secret)
22005 dabf8fb8a91e shelve: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21852 diff changeset	267 editor = cmdutil.getcommiteditor(editform='shelve.shelve', **opts)
21852 37a5decc6924 shelve: accept '--edit' like other commands creating new changeset FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21851 diff changeset	268 return repo.commit(message, user, opts.get('date'), match,
22005 dabf8fb8a91e shelve: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21852 diff changeset	269 editor=editor)
19856 28b1b7b9b4a9 shelve: allow shelving of a change with an mq patch applied David Soria Parra <dsp@experimentalworks.net> parents: 19855 diff changeset	270 finally:
22040 122fa73657c6 shelve: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22005 diff changeset	271 repo.ui.restoreconfig(backup)
19885 6cc696179869 shelve: only save mq state if enabled Sean Farley <sean.michael.farley@gmail.com> parents: 19881 diff changeset	272 if hasmq:
6cc696179869 shelve: only save mq state if enabled Sean Farley <sean.michael.farley@gmail.com> parents: 19881 diff changeset	273 repo.mq.checkapplied = saved
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	274
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	275 if parent.node() != nullid:
20411 66359d8b8d7e shelve: add 'changes to' prefix to default shelve message Mads Kiilerich <madski@unity3d.com> parents: 20410 diff changeset	276 desc = "changes to '%s'" % parent.description().split('\n', 1)[0]
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	277 else:
20411 66359d8b8d7e shelve: add 'changes to' prefix to default shelve message Mads Kiilerich <madski@unity3d.com> parents: 20410 diff changeset	278 desc = '(changes in empty repository)'
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	279
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	280 if not opts['message']:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	281 opts['message'] = desc
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	282
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	283 name = opts['name']
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	284
26520 46dec89fe888 bookmarks: use recordchange instead of writing if transaction is active FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26507 diff changeset	285 wlock = lock = tr = None
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	286 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	287 wlock = repo.wlock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	288 lock = repo.lock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	289
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19943 diff changeset	290 # use an uncommitted transaction to generate the bundle to avoid
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	291 # pull races. ensure we don't print the abort message to stderr.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	292 tr = repo.transaction('commit', report=lambda x: None)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	293
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	294 if name:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	295 if shelvedfile(repo, name, 'hg').exists():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	296 raise util.Abort(_("a shelved change named '%s' already exists")
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	297 % name)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	298 else:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	299 for n in gennames():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	300 if not shelvedfile(repo, n, 'hg').exists():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	301 name = n
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	302 break
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	303 else:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	304 raise util.Abort(_("too many shelved changes named '%s'") %
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	305 label)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	306
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	307 # ensure we are not creating a subdirectory or a hidden file
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	308 if '/' in name or '\\' in name:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	309 raise util.Abort(_('shelved change names may not contain slashes'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	310 if name.startswith('.'):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	311 raise util.Abort(_("shelved change names may not start with '.'"))
24477 325f03de849d shelve: add interactive mode command line option Laurent Charignon <lcharignon@fb.com> parents: 23895 diff changeset	312 interactive = opts.get('interactive', False)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	313
24478 95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	314 def interactivecommitfunc(ui, repo, pats, *opts):
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	315 match = scmutil.match(repo['.'], pats, {})
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	316 message = opts['message']
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	317 return commitfunc(ui, repo, message, match, opts)
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	318 if not interactive:
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	319 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	320 else:
25799 0eb093e40813 shelve: omit incorrect 'commit' suggestion at 'hg shelve -i' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25774 diff changeset	321 node = cmdutil.dorecord(ui, repo, interactivecommitfunc, None,
24478 95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	322 False, cmdutil.recordfilter, pats, *opts)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	323 if not node:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	324 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
22922 ebef5fcf7bd0 shelve: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22898 diff changeset	325 if stat.deleted:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	326 ui.status(_("nothing changed (%d missing files, see "
22922 ebef5fcf7bd0 shelve: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22898 diff changeset	327 "'hg status')\n") % len(stat.deleted))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	328 else:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	329 ui.status(_("nothing changed\n"))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	330 return 1
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	331
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	332 bases = list(publicancestors(repo[node]))
26506 edecf059fda6 shelve: move changegroup generation inside writebundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 26505 diff changeset	333 shelvedfile(repo, name, 'hg').writebundle(bases, node)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	334 cmdutil.export(repo, [node],
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	335 fp=shelvedfile(repo, name, 'patch').opener('wb'),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	336 opts=mdiff.diffopts(git=True))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	337
19874 5836edcbdc2e shelve: copy bookmarks and restore them after a commit David Soria Parra <dsp@experimentalworks.net> parents: 19856 diff changeset	338
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	339 if ui.formatted():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	340 desc = util.ellipsis(desc, ui.termwidth())
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	341 ui.status(_('shelved as %s\n') % name)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	342 hg.update(repo, parent.node())
26523 1d23bf6cd90a shelve: restore shelved dirstate explicitly after aborting transaction FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26522 diff changeset	343
1d23bf6cd90a shelve: restore shelved dirstate explicitly after aborting transaction FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26522 diff changeset	344 _aborttransaction(repo)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	345 finally:
26523 1d23bf6cd90a shelve: restore shelved dirstate explicitly after aborting transaction FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26522 diff changeset	346 lockmod.release(tr, lock, wlock)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	347
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	348 def cleanupcmd(ui, repo):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	349 """subcommand that deletes all shelves"""
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	350
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	351 wlock = None
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	352 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	353 wlock = repo.wlock()
22199 b3e51675f98e cleanup: avoid _ for local unused tmp variables - that is reserved for i18n Mads Kiilerich <madski@unity3d.com> parents: 22184 diff changeset	354 for (name, _type) in repo.vfs.readdir('shelved'):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	355 suffix = name.rsplit('.', 1)[-1]
22581 c5ece02fb211 shelve: avoid writing file that is never read from Martin von Zweigbergk <martinvonz@gmail.com> parents: 22202 diff changeset	356 if suffix in ('hg', 'patch'):
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	357 shelvedfile(repo, name).movetobackup()
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	358 cleanupoldbackups(repo)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	359 finally:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	360 lockmod.release(wlock)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	361
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	362 def deletecmd(ui, repo, pats):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	363 """subcommand that deletes a specific shelve"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	364 if not pats:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	365 raise util.Abort(_('no shelved changes specified!'))
25080 68f456f2f425 shelve: use try/except/finally Matt Mackall <mpm@selenic.com> parents: 24947 diff changeset	366 wlock = repo.wlock()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	367 try:
25080 68f456f2f425 shelve: use try/except/finally Matt Mackall <mpm@selenic.com> parents: 24947 diff changeset	368 for name in pats:
68f456f2f425 shelve: use try/except/finally Matt Mackall <mpm@selenic.com> parents: 24947 diff changeset	369 for suffix in 'hg patch'.split():
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	370 shelvedfile(repo, name, suffix).movetobackup()
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	371 cleanupoldbackups(repo)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25260 diff changeset	372 except OSError as err:
25080 68f456f2f425 shelve: use try/except/finally Matt Mackall <mpm@selenic.com> parents: 24947 diff changeset	373 if err.errno != errno.ENOENT:
68f456f2f425 shelve: use try/except/finally Matt Mackall <mpm@selenic.com> parents: 24947 diff changeset	374 raise
68f456f2f425 shelve: use try/except/finally Matt Mackall <mpm@selenic.com> parents: 24947 diff changeset	375 raise util.Abort(_("shelved change '%s' not found") % name)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	376 finally:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	377 lockmod.release(wlock)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	378
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	379 def listshelves(repo):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	380 """return all shelves in repo as list of (time, filename)"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	381 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	382 names = repo.vfs.readdir('shelved')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25260 diff changeset	383 except OSError as err:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	384 if err.errno != errno.ENOENT:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	385 raise
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	386 return []
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	387 info = []
22199 b3e51675f98e cleanup: avoid _ for local unused tmp variables - that is reserved for i18n Mads Kiilerich <madski@unity3d.com> parents: 22184 diff changeset	388 for (name, _type) in names:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	389 pfx, sfx = name.rsplit('.', 1)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	390 if not pfx or sfx != 'patch':
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	391 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	392 st = shelvedfile(repo, name).stat()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	393 info.append((st.st_mtime, shelvedfile(repo, pfx).filename()))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	394 return sorted(info, reverse=True)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	395
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	396 def listcmd(ui, repo, pats, opts):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	397 """subcommand that displays the list of shelves"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	398 pats = set(pats)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	399 width = 80
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	400 if not ui.plain():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	401 width = ui.termwidth()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	402 namelabel = 'shelve.newest'
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	403 for mtime, name in listshelves(repo):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	404 sname = util.split(name)[1]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	405 if pats and sname not in pats:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	406 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	407 ui.write(sname, label=namelabel)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	408 namelabel = 'shelve.name'
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	409 if ui.quiet:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	410 ui.write('\n')
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	411 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	412 ui.write(' ' * (16 - len(sname)))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	413 used = 16
19855 a3b285882724 shelve: new output format for shelve listings David Soria Parra <dsp@experimentalworks.net> parents: 19854 diff changeset	414 age = '(%s)' % templatefilters.age(util.makedate(mtime), abbrev=True)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	415 ui.write(age, label='shelve.age')
19855 a3b285882724 shelve: new output format for shelve listings David Soria Parra <dsp@experimentalworks.net> parents: 19854 diff changeset	416 ui.write(' ' * (12 - len(age)))
a3b285882724 shelve: new output format for shelve listings David Soria Parra <dsp@experimentalworks.net> parents: 19854 diff changeset	417 used += 12
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	418 fp = open(name + '.patch', 'rb')
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	419 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	420 while True:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	421 line = fp.readline()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	422 if not line:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	423 break
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	424 if not line.startswith('#'):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	425 desc = line.rstrip()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	426 if ui.formatted():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	427 desc = util.ellipsis(desc, width - used)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	428 ui.write(desc)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	429 break
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	430 ui.write('\n')
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	431 if not (opts['patch'] or opts['stat']):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	432 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	433 difflines = fp.readlines()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	434 if opts['patch']:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	435 for chunk, label in patch.difflabel(iter, difflines):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	436 ui.write(chunk, label=label)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	437 if opts['stat']:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	438 for chunk, label in patch.diffstatui(difflines, width=width,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	439 git=True):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	440 ui.write(chunk, label=label)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	441 finally:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	442 fp.close()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	443
25104 d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	444 def singlepatchcmds(ui, repo, pats, opts, subcommand):
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	445 """subcommand that displays a single shelf"""
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	446 if len(pats) != 1:
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	447 raise util.Abort(_("--%s expects a single shelf") % subcommand)
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	448 shelfname = pats[0]
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	449
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	450 if not shelvedfile(repo, shelfname, 'patch').exists():
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	451 raise util.Abort(_("cannot find shelf %s") % shelfname)
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	452
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	453 listcmd(ui, repo, pats, opts)
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	454
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	455 def checkparents(repo, state):
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	456 """check parent while resuming an unshelve"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	457 if state.parents != repo.dirstate.parents():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	458 raise util.Abort(_('working directory parents do not match unshelve '
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	459 'state'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	460
19943 4de116871044 shelve: make unshelve work even if it don't run in repository root Takumi IINO <trot.thunder@gmail.com> parents: 19911 diff changeset	461 def pathtofiles(repo, files):
4de116871044 shelve: make unshelve work even if it don't run in repository root Takumi IINO <trot.thunder@gmail.com> parents: 19911 diff changeset	462 cwd = repo.getcwd()
4de116871044 shelve: make unshelve work even if it don't run in repository root Takumi IINO <trot.thunder@gmail.com> parents: 19911 diff changeset	463 return [repo.pathto(f, cwd) for f in files]
4de116871044 shelve: make unshelve work even if it don't run in repository root Takumi IINO <trot.thunder@gmail.com> parents: 19911 diff changeset	464
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	465 def unshelveabort(ui, repo, state, opts):
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	466 """subcommand that abort an in-progress unshelve"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	467 wlock = repo.wlock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	468 lock = None
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	469 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	470 checkparents(repo, state)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	471
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	472 util.rename(repo.join('unshelverebasestate'),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	473 repo.join('rebasestate'))
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	474 try:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	475 rebase.rebase(ui, repo, **{
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	476 'abort' : True
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	477 })
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	478 except Exception:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	479 util.rename(repo.join('rebasestate'),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	480 repo.join('unshelverebasestate'))
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	481 raise
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	482
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	483 lock = repo.lock()
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	484
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	485 mergefiles(ui, repo, state.wctx, state.pendingctx)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	486
22057 445472225ccd strip: remove -b/--backup codepaths Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22042 diff changeset	487 repair.strip(ui, repo, state.stripnodes, backup=False, topic='shelve')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	488 shelvedstate.clear(repo)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	489 ui.warn(_("unshelve of '%s' aborted\n") % state.name)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	490 finally:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	491 lockmod.release(lock, wlock)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	492
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	493 def mergefiles(ui, repo, wctx, shelvectx):
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	494 """updates to wctx and merges the changes from shelvectx into the
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	495 dirstate."""
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	496 oldquiet = ui.quiet
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	497 try:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	498 ui.quiet = True
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	499 hg.update(repo, wctx.node())
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	500 files = []
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	501 files.extend(shelvectx.files())
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	502 files.extend(shelvectx.parents()[0].files())
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	503
578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	504 # revert will overwrite unknown files, so move them out of the way
22922 ebef5fcf7bd0 shelve: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22898 diff changeset	505 for file in repo.status(unknown=True).unknown:
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	506 if file in files:
578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	507 util.rename(file, file + ".orig")
22184 fb8065de47b0 unshelve: silence internal revert Matt Mackall <mpm@selenic.com> parents: 22057 diff changeset	508 ui.pushbuffer(True)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	509 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	510 *pathtofiles(repo, files),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	511 **{'no_backup': True})
22184 fb8065de47b0 unshelve: silence internal revert Matt Mackall <mpm@selenic.com> parents: 22057 diff changeset	512 ui.popbuffer()
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	513 finally:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	514 ui.quiet = oldquiet
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	515
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	516 def unshelvecleanup(ui, repo, name, opts):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	517 """remove related files after an unshelve"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	518 if not opts['keep']:
22581 c5ece02fb211 shelve: avoid writing file that is never read from Martin von Zweigbergk <martinvonz@gmail.com> parents: 22202 diff changeset	519 for filetype in 'hg patch'.split():
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	520 shelvedfile(repo, name, filetype).movetobackup()
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	521 cleanupoldbackups(repo)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	522
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	523 def unshelvecontinue(ui, repo, state, opts):
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	524 """subcommand to continue an in-progress unshelve"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	525 # We're finishing off a merge. First parent is our original
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	526 # parent, second is the temporary "fake" commit we're unshelving.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	527 wlock = repo.wlock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	528 lock = None
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	529 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	530 checkparents(repo, state)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	531 ms = merge.mergestate(repo)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	532 if [f for f in ms if ms[f] == 'u']:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	533 raise util.Abort(
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	534 _("unresolved conflicts, can't continue"),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	535 hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	536
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	537 lock = repo.lock()
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	538
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	539 util.rename(repo.join('unshelverebasestate'),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	540 repo.join('rebasestate'))
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	541 try:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	542 rebase.rebase(ui, repo, **{
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	543 'continue' : True
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	544 })
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	545 except Exception:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	546 util.rename(repo.join('rebasestate'),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	547 repo.join('unshelverebasestate'))
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	548 raise
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	549
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	550 shelvectx = repo['tip']
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	551 if not shelvectx in state.pendingctx.children():
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	552 # rebase was a no-op, so it produced no child commit
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	553 shelvectx = state.pendingctx
22842 d43d116a118c shelve: don't delete "." when rebase is a no-op (issue4398) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 21852 diff changeset	554 else:
d43d116a118c shelve: don't delete "." when rebase is a no-op (issue4398) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 21852 diff changeset	555 # only strip the shelvectx if the rebase produced it
d43d116a118c shelve: don't delete "." when rebase is a no-op (issue4398) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 21852 diff changeset	556 state.stripnodes.append(shelvectx.node())
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	557
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	558 mergefiles(ui, repo, state.wctx, shelvectx)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	559
22057 445472225ccd strip: remove -b/--backup codepaths Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 22042 diff changeset	560 repair.strip(ui, repo, state.stripnodes, backup=False, topic='shelve')
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	561 shelvedstate.clear(repo)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	562 unshelvecleanup(ui, repo, state.name, opts)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	563 ui.status(_("unshelve of '%s' complete\n") % state.name)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	564 finally:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	565 lockmod.release(lock, wlock)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	566
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	567 @command('unshelve',
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	568 [('a', 'abort', None,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	569 _('abort an incomplete unshelve operation')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	570 ('c', 'continue', None,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	571 _('continue an incomplete unshelve operation')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	572 ('', 'keep', None,
20960 8e5b21ce8ee9 shelve: introduce secret option for using fixed date for temporary commit Mads Kiilerich <madski@unity3d.com> parents: 20958 diff changeset	573 _('keep shelve after unshelving')),
8e5b21ce8ee9 shelve: introduce secret option for using fixed date for temporary commit Mads Kiilerich <madski@unity3d.com> parents: 20958 diff changeset	574 ('', 'date', '',
8e5b21ce8ee9 shelve: introduce secret option for using fixed date for temporary commit Mads Kiilerich <madski@unity3d.com> parents: 20958 diff changeset	575 _('set date for temporary commits (DEPRECATED)'), _('DATE'))],
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	576 _('hg unshelve [SHELVED]'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	577 def unshelve(ui, repo, shelved, *opts):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	578 """restore a shelved change to the working directory
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	579
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	580 This command accepts an optional name of a shelved change to
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	581 restore. If none is given, the most recent shelved change is used.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	582
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	583 If a shelved change is applied successfully, the bundle that
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	584 contains the shelved changes is moved to a backup location
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	585 (.hg/shelve-backup).
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	586
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	587 Since you can restore a shelved change on top of an arbitrary
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	588 commit, it is possible that unshelving will result in a conflict
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	589 between your changes and the commits you are unshelving onto. If
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	590 this occurs, you must resolve the conflict, then use
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	591 ``--continue`` to complete the unshelve operation. (The bundle
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	592 will not be moved until you successfully complete the unshelve.)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	593
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	594 (Alternatively, you can use ``--abort`` to abandon an unshelve
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	595 that causes a conflict. This reverts the unshelved changes, and
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	596 leaves the bundle in place.)
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	597
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	598 After a successful unshelve, the shelved changes are stored in a
2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	599 backup directory. Only the N most recent backups are kept. N
25852 870e361e049c shelve: make maxbackup doc check-config friendly Matt Mackall <mpm@selenic.com> parents: 25799 diff changeset	600 defaults to 10 but can be overridden using the ``shelve.maxbackups``
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	601 configuration option.
25774 4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	602
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	603 .. container:: verbose
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	604
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	605 Timestamp in seconds is used to decide order of backups. More
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	606 than ``maxbackups`` backups are kept, if same timestamp
4f8c20fe66f0 shelve: keep old backups if timestamp can't decide exact order of them FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25713 diff changeset	607 prevents from deciding exact order of them, for safety.
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	608 """
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	609 abortf = opts['abort']
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	610 continuef = opts['continue']
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	611 if not abortf and not continuef:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	612 cmdutil.checkunfinished(repo)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	613
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	614 if abortf or continuef:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	615 if abortf and continuef:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	616 raise util.Abort(_('cannot use both abort and continue'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	617 if shelved:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	618 raise util.Abort(_('cannot combine abort/continue with '
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	619 'naming a shelved change'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	620
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	621 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	622 state = shelvedstate.load(repo)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25260 diff changeset	623 except IOError as err:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	624 if err.errno != errno.ENOENT:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	625 raise
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	626 raise util.Abort(_('no unshelve operation underway'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	627
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	628 if abortf:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	629 return unshelveabort(ui, repo, state, opts)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	630 elif continuef:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	631 return unshelvecontinue(ui, repo, state, opts)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	632 elif len(shelved) > 1:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	633 raise util.Abort(_('can only unshelve one change at a time'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	634 elif not shelved:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	635 shelved = listshelves(repo)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	636 if not shelved:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	637 raise util.Abort(_('no shelved changes to apply!'))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	638 basename = util.split(shelved[0][1])[1]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	639 ui.status(_("unshelving change '%s'\n") % basename)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	640 else:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	641 basename = shelved[0]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	642
22581 c5ece02fb211 shelve: avoid writing file that is never read from Martin von Zweigbergk <martinvonz@gmail.com> parents: 22202 diff changeset	643 if not shelvedfile(repo, basename, 'patch').exists():
19970 065e6f1c9259 shelve: remove unused variable assignment FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19964 diff changeset	644 raise util.Abort(_("shelved change '%s' not found") % basename)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	645
20412 e584fc30456b shelve: be quiet when unshelve pulls from the shelve bundle Mads Kiilerich <madski@unity3d.com> parents: 20411 diff changeset	646 oldquiet = ui.quiet
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	647 wlock = lock = tr = None
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	648 try:
24704 03f92741487f shelve: acquire lock in the right order Pierre-Yves David <pierre-yves.david@fb.com> parents: 24478 diff changeset	649 wlock = repo.wlock()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	650 lock = repo.lock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	651
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	652 tr = repo.transaction('unshelve', report=lambda x: None)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	653 oldtiprev = len(repo)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	654
20958 df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	655 pctx = repo['.']
df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	656 tmpwctx = pctx
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	657 # The goal is to have a commit structure like so:
20958 df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	658 # ...-> pctx -> tmpwctx -> shelvectx
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	659 # where tmpwctx is an optional commit with the user's pending changes
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	660 # and shelvectx is the unshelved changes. Then we merge it all down
20958 df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	661 # to the original pctx.
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	662
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	663 # Store pending changes in a commit
22922 ebef5fcf7bd0 shelve: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22898 diff changeset	664 s = repo.status()
ebef5fcf7bd0 shelve: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22898 diff changeset	665 if s.modified or s.added or s.removed or s.deleted:
20413 0ac94c0a3a38 shelve: status messages from unshelve Mads Kiilerich <madski@unity3d.com> parents: 20412 diff changeset	666 ui.status(_("temporarily committing pending changes "
0ac94c0a3a38 shelve: status messages from unshelve Mads Kiilerich <madski@unity3d.com> parents: 20412 diff changeset	667 "(restore with 'hg unshelve --abort')\n"))
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	668 def commitfunc(ui, repo, message, match, opts):
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	669 hasmq = util.safehasattr(repo, 'mq')
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	670 if hasmq:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	671 saved, repo.mq.checkapplied = repo.mq.checkapplied, False
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	672
22040 122fa73657c6 shelve: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22005 diff changeset	673 backup = repo.ui.backupconfig('phases', 'new-commit')
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	674 try:
22040 122fa73657c6 shelve: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22005 diff changeset	675 repo.ui. setconfig('phases', 'new-commit', phases.secret)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	676 return repo.commit(message, 'shelve@localhost',
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	677 opts.get('date'), match)
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	678 finally:
22040 122fa73657c6 shelve: do not retract phase boundary by hand Pierre-Yves David <pierre-yves.david@fb.com> parents: 22005 diff changeset	679 repo.ui.restoreconfig(backup)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	680 if hasmq:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	681 repo.mq.checkapplied = saved
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	682
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	683 tempopts = {}
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	684 tempopts['message'] = "pending changes temporary commit"
20960 8e5b21ce8ee9 shelve: introduce secret option for using fixed date for temporary commit Mads Kiilerich <madski@unity3d.com> parents: 20958 diff changeset	685 tempopts['date'] = opts.get('date')
20412 e584fc30456b shelve: be quiet when unshelve pulls from the shelve bundle Mads Kiilerich <madski@unity3d.com> parents: 20411 diff changeset	686 ui.quiet = True
e584fc30456b shelve: be quiet when unshelve pulls from the shelve bundle Mads Kiilerich <madski@unity3d.com> parents: 20411 diff changeset	687 node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	688 tmpwctx = repo[node]
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	689
20982 1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	690 ui.quiet = True
1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	691 shelvedfile(repo, basename, 'hg').applybundle()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	692
20412 e584fc30456b shelve: be quiet when unshelve pulls from the shelve bundle Mads Kiilerich <madski@unity3d.com> parents: 20411 diff changeset	693 ui.quiet = oldquiet
e584fc30456b shelve: be quiet when unshelve pulls from the shelve bundle Mads Kiilerich <madski@unity3d.com> parents: 20411 diff changeset	694
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	695 shelvectx = repo['tip']
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	696
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	697 # If the shelve is not immediately on top of the commit
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	698 # we'll be merging with, rebase it to be on top.
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	699 if tmpwctx.node() != shelvectx.parents()[0].node():
20413 0ac94c0a3a38 shelve: status messages from unshelve Mads Kiilerich <madski@unity3d.com> parents: 20412 diff changeset	700 ui.status(_('rebasing shelved changes\n'))
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	701 try:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	702 rebase.rebase(ui, repo, **{
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	703 'rev' : [shelvectx.rev()],
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	704 'dest' : str(tmpwctx.rev()),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	705 'keep' : True,
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	706 })
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	707 except error.InterventionRequired:
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	708 tr.close()
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	709
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	710 stripnodes = [repo.changelog.node(rev)
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	711 for rev in xrange(oldtiprev, len(repo))]
20958 df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	712 shelvedstate.save(repo, basename, pctx, tmpwctx, stripnodes)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	713
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	714 util.rename(repo.join('rebasestate'),
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	715 repo.join('unshelverebasestate'))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	716 raise error.InterventionRequired(
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	717 _("unresolved conflicts (see 'hg resolve', then "
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	718 "'hg unshelve --continue')"))
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	719
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	720 # refresh ctx after rebase completes
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	721 shelvectx = repo['tip']
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	722
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	723 if not shelvectx in tmpwctx.children():
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	724 # rebase was a no-op, so it produced no child commit
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	725 shelvectx = tmpwctx
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	726
20958 df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	727 mergefiles(ui, repo, pctx, shelvectx)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	728 shelvedstate.clear(repo)
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	729
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	730 # The transaction aborting will strip all the commits for us,
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	731 # but it doesn't update the inmemory structures, so addchangegroup
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	732 # hooks still fire and try to operate on the missing commits.
1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	733 # Clean up manually to prevent this.
20064 99c4b8f79324 shelve: unshelve using an unfiltered repository David Soria Parra <davidsp@fb.com> parents: 19970 diff changeset	734 repo.unfiltered().changelog.strip(oldtiprev, tr)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	735
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	736 unshelvecleanup(ui, repo, basename, opts)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	737 finally:
20412 e584fc30456b shelve: be quiet when unshelve pulls from the shelve bundle Mads Kiilerich <madski@unity3d.com> parents: 20411 diff changeset	738 ui.quiet = oldquiet
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	739 if tr:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	740 tr.release()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	741 lockmod.release(lock, wlock)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	742
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	743 @command('shelve',
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	744 [('A', 'addremove', None,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	745 _('mark new/missing files as added/removed before shelving')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	746 ('', 'cleanup', None,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	747 _('delete all shelved changes')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	748 ('', 'date', '',
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	749 _('shelve with the specified commit date'), _('DATE')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	750 ('d', 'delete', None,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	751 _('delete the named shelved change(s)')),
21852 37a5decc6924 shelve: accept '--edit' like other commands creating new changeset FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21851 diff changeset	752 ('e', 'edit', False,
37a5decc6924 shelve: accept '--edit' like other commands creating new changeset FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21851 diff changeset	753 _('invoke editor on commit messages')),
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	754 ('l', 'list', None,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	755 _('list current shelves')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	756 ('m', 'message', '',
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	757 _('use text as shelve message'), _('TEXT')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	758 ('n', 'name', '',
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	759 _('use the given name for the shelved commit'), _('NAME')),
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	760 ('p', 'patch', None,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	761 _('show patch')),
24477 325f03de849d shelve: add interactive mode command line option Laurent Charignon <lcharignon@fb.com> parents: 23895 diff changeset	762 ('i', 'interactive', None,
25260 8fa3e995a375 selve: make 'shelve --interactive' not experimental Laurent Charignon <lcharignon@fb.com> parents: 25186 diff changeset	763 _('interactive mode, only works while creating a shelve')),
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	764 ('', 'stat', None,
20409 0b7a9940a397 shelve: mention walk options in help Mads Kiilerich <madski@unity3d.com> parents: 20408 diff changeset	765 _('output diffstat-style summary of changes'))] + commands.walkopts,
20410 fc5354648224 shelve: mention FILE options in help Mads Kiilerich <madski@unity3d.com> parents: 20409 diff changeset	766 _('hg shelve [OPTION]... [FILE]...'))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	767 def shelvecmd(ui, repo, pats, *opts):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	768 '''save and set aside changes from the working directory
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	769
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	770 Shelving takes files that "hg status" reports as not clean, saves
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	771 the modifications to a bundle (a shelved change), and reverts the
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	772 files so that their state in the working directory becomes clean.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	773
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	774 To restore these changes to the working directory, using "hg
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	775 unshelve"; this will work even if you switch to a different
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	776 commit.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	777
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	778 When no files are specified, "hg shelve" saves all not-clean
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	779 files. If specific files or directories are named, only changes to
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	780 those files are shelved.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	781
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	782 Each shelved change has a name that makes it easier to find later.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	783 The name of a shelved change defaults to being based on the active
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	784 bookmark, or if there is no active bookmark, the current named
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	785 branch. To specify a different name, use ``--name``.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	786
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	787 To see a list of existing shelved changes, use the ``--list``
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	788 option. For each shelved change, this will print its name, age,
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	789 and description; use ``--patch`` or ``--stat`` for more details.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	790
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	791 To delete specific shelved changes, use ``--delete``. To delete
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	792 all shelved changes, use ``--cleanup``.
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	793 '''
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	794 cmdutil.checkunfinished(repo)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	795
21851 aad28ff87788 shelve: refactor option combination check to easily add new ones FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21064 diff changeset	796 allowables = [
25103 ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	797 ('addremove', set(['create'])), # 'create' is pseudo action
ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	798 ('cleanup', set(['cleanup'])),
ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	799 # ('date', set(['create'])), # ignored for passing '--date "0 0"' in tests
ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	800 ('delete', set(['delete'])),
ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	801 ('edit', set(['create'])),
ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	802 ('list', set(['list'])),
ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	803 ('message', set(['create'])),
ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	804 ('name', set(['create'])),
25104 d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	805 ('patch', set(['patch', 'list'])),
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	806 ('stat', set(['stat', 'list'])),
21851 aad28ff87788 shelve: refactor option combination check to easily add new ones FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21064 diff changeset	807 ]
aad28ff87788 shelve: refactor option combination check to easily add new ones FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21064 diff changeset	808 def checkopt(opt):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	809 if opts[opt]:
21851 aad28ff87788 shelve: refactor option combination check to easily add new ones FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21064 diff changeset	810 for i, allowable in allowables:
25103 ce00b2e96d09 shelve: refactor allowables to specify sets of valid operations Tony Tung <tonytung@fb.com> parents: 25080 diff changeset	811 if opts[i] and opt not in allowable:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	812 raise util.Abort(_("options '--%s' and '--%s' may not be "
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	813 "used together") % (opt, i))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	814 return True
21851 aad28ff87788 shelve: refactor option combination check to easily add new ones FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21064 diff changeset	815 if checkopt('cleanup'):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	816 if pats:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	817 raise util.Abort(_("cannot specify names when using '--cleanup'"))
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	818 return cleanupcmd(ui, repo)
21851 aad28ff87788 shelve: refactor option combination check to easily add new ones FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21064 diff changeset	819 elif checkopt('delete'):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	820 return deletecmd(ui, repo, pats)
21851 aad28ff87788 shelve: refactor option combination check to easily add new ones FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21064 diff changeset	821 elif checkopt('list'):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	822 return listcmd(ui, repo, pats, opts)
25104 d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	823 elif checkopt('patch'):
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	824 return singlepatchcmds(ui, repo, pats, opts, subcommand='patch')
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	825 elif checkopt('stat'):
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	826 return singlepatchcmds(ui, repo, pats, opts, subcommand='stat')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	827 else:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	828 return createcmd(ui, repo, pats, opts)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	829
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	830 def extsetup(ui):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	831 cmdutil.unfinishedstates.append(
19963 6f29cc567845 shelve: disallow commit while unshelve is in progress FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19961 diff changeset	832 [shelvedstate._filename, False, False,
6f29cc567845 shelve: disallow commit while unshelve is in progress FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19961 diff changeset	833 _('unshelve already in progress'),
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	834 _("use 'hg unshelve --continue' or 'hg unshelve --abort'")])

Mercurial > public > mercurial-scm > hg

annotate hgext/shelve.py @ 26523:1d23bf6cd90a