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

annotate mercurial/shelve.py @ 43076:2372284d9457

formatting: blacken the codebase This is using my patch to black (https://github.com/psf/black/pull/826) so we don't un-wrap collection literals. Done with: hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S # skip-blame mass-reformatting only # no-check-commit reformats foo_bar functions Differential Revision: https://phab.mercurial-scm.org/D6971

author	Augie Fackler <augie@google.com>
date	Sun, 06 Oct 2019 09:45:02 -0400
parents	5c285c8e4f98
children	687b865b95ad

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 """
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	23 from __future__ import absolute_import
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	24
25113 0ca8410ea345 util: drop alias for collections.deque Martin von Zweigbergk <martinvonz@google.com> parents: 25104 diff changeset	25 import collections
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	26 import errno
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	27 import itertools
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 36636 diff changeset	28 import stat
29205 a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 28862 diff changeset	29
42548 3de4f17f4824 shelve: move shelve extension to core Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42547 diff changeset	30 from .i18n import _
3de4f17f4824 shelve: move shelve extension to core Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42547 diff changeset	31 from . import (
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	32 bookmarks,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	33 bundle2,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	34 bundlerepo,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	35 changegroup,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	36 cmdutil,
34112 f7d41b85bbf6 changegroup: replace changegroupsubset with makechangegroup Durham Goode <durham@fb.com> parents: 33440 diff changeset	37 discovery,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	38 error,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	39 exchange,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	40 hg,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	41 lock as lockmod,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	42 mdiff,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	43 merge,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	44 node as nodemod,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	45 patch,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	46 phases,
35046 aad6b9fdfc75 py3: handle keyword arguments in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34496 diff changeset	47 pycompat,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	48 repair,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	49 scmutil,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	50 templatefilters,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	51 util,
31254 636f55b9ba23 vfs: use 'vfs' module directly in 'hgext.shelve' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31113 diff changeset	52 vfs as vfsmod,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	53 )
42548 3de4f17f4824 shelve: move shelve extension to core Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42547 diff changeset	54 from .utils import (
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	55 dateutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	56 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	57 )
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	58
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	59 backupdir = 'shelve-backup'
28862 39130afcce60 shelve: refactor directory name into constant Oleg Afanasyev <olegaf@fb.com> parents: 28666 diff changeset	60 shelvedir = 'shelved'
39399 da121c9dc0f2 shelve: store shelved node in a new data file Boris Feld <boris.feld@octobus.net> parents: 39371 diff changeset	61 shelvefileextensions = ['hg', 'patch', 'shelve']
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	62 # universal extension is present in all types of shelves
1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	63 patchextension = 'patch'
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	64
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	65 # we never need the user, so we use a
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	66 # generic user for all shelve operations
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	67 shelveuser = 'shelve@localhost'
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	68
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	69
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	70 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	71 """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	72
22581 c5ece02fb211 shelve: avoid writing file that is never read from Martin von Zweigbergk <martinvonz@gmail.com> parents: 22202 diff changeset	73 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	74 the vfs layer"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	75
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	76 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	77 self.repo = repo
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	78 self.name = name
31344 3acc7af5859c shelve: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31321 diff changeset	79 self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir))
3acc7af5859c shelve: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31321 diff changeset	80 self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir))
23895 cda18ded2c48 changegroup.writebundle: provide ui Eric Sumner <ericsumner@fb.com> parents: 23877 diff changeset	81 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	82 if filetype:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	83 self.fname = name + '.' + filetype
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	84 else:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	85 self.fname = name
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 exists(self):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	88 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	89
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	90 def filename(self):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	91 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	92
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	93 def backupfilename(self):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	94 def gennames(base):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	95 yield base
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	96 base, ext = base.rsplit('.', 1)
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	97 for i in itertools.count(1):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	98 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	99
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	100 name = self.backupvfs.join(self.fname)
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	101 for n in gennames(name):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	102 if not self.backupvfs.exists(n):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	103 return n
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	104
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	105 def movetobackup(self):
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	106 if not self.backupvfs.isdir():
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	107 self.backupvfs.makedir()
8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	108 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	109
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	110 def stat(self):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	111 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	112
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	113 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	114 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	115 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	116 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	117 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	118 raise
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26577 diff changeset	119 raise error.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	120
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	121 def applybundle(self, tr):
20982 1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	122 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	123 try:
39536 5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	124 targetphase = phases.internal
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	125 if not phases.supportinternal(self.repo):
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	126 targetphase = phases.secret
21064 4d9d490d7bbe bundle2: add a ui argument to readbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21063 diff changeset	127 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
39894 d9ba836fc234 shelve: find shelvedctx from bundle even if they are already in the repo Boris Feld <boris.feld@octobus.net> parents: 39893 diff changeset	128 pretip = self.repo['tip']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	129 bundle2.applybundle(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	130 self.repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	131 gen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	132 tr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	133 source='unshelve',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	134 url='bundle:' + self.vfs.join(self.fname),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	135 targetphase=targetphase,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	136 )
39894 d9ba836fc234 shelve: find shelvedctx from bundle even if they are already in the repo Boris Feld <boris.feld@octobus.net> parents: 39893 diff changeset	137 shelvectx = self.repo['tip']
d9ba836fc234 shelve: find shelvedctx from bundle even if they are already in the repo Boris Feld <boris.feld@octobus.net> parents: 39893 diff changeset	138 if pretip == shelvectx:
d9ba836fc234 shelve: find shelvedctx from bundle even if they are already in the repo Boris Feld <boris.feld@octobus.net> parents: 39893 diff changeset	139 shelverev = tr.changes['revduplicates'][-1]
d9ba836fc234 shelve: find shelvedctx from bundle even if they are already in the repo Boris Feld <boris.feld@octobus.net> parents: 39893 diff changeset	140 shelvectx = self.repo[shelverev]
d9ba836fc234 shelve: find shelvedctx from bundle even if they are already in the repo Boris Feld <boris.feld@octobus.net> parents: 39893 diff changeset	141 return shelvectx
20982 1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	142 finally:
1df99f1ea28d shelve: add "applybundle()" to invoke "readbundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20960 diff changeset	143 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	144
22898 43816070284e shelve: add a bundlerepo method Matt Mackall <mpm@selenic.com> parents: 22844 diff changeset	145 def bundlerepo(self):
39617 84d6e9a2b104 shelve: use bundlerepo.instance() to construct a repo object Gregory Szorc <gregory.szorc@gmail.com> parents: 39536 diff changeset	146 path = self.vfs.join(self.fname)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	147 return bundlerepo.instance(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	148 self.repo.baseui, 'bundle://%s+%s' % (self.repo.root, path)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	149 )
39617 84d6e9a2b104 shelve: use bundlerepo.instance() to construct a repo object Gregory Szorc <gregory.szorc@gmail.com> parents: 39536 diff changeset	150
26506 edecf059fda6 shelve: move changegroup generation inside writebundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 26505 diff changeset	151 def writebundle(self, bases, node):
27931 1289a122cf3f shelve: use cg3 for treemanifests Martin von Zweigbergk <martinvonz@google.com> parents: 27921 diff changeset	152 cgversion = changegroup.safeversion(self.repo)
1289a122cf3f shelve: use cg3 for treemanifests Martin von Zweigbergk <martinvonz@google.com> parents: 27921 diff changeset	153 if cgversion == '01':
1289a122cf3f shelve: use cg3 for treemanifests Martin von Zweigbergk <martinvonz@google.com> parents: 27921 diff changeset	154 btype = 'HG10BZ'
1289a122cf3f shelve: use cg3 for treemanifests Martin von Zweigbergk <martinvonz@google.com> parents: 27921 diff changeset	155 compression = None
1289a122cf3f shelve: use cg3 for treemanifests Martin von Zweigbergk <martinvonz@google.com> parents: 27921 diff changeset	156 else:
26507 ae29cffa05db shelve: bundle using bundle2 if repository is general delta (issue4862) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26506 diff changeset	157 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	158 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	159
39400 6a71324cb68b shelve: handle shelved node on unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 39399 diff changeset	160 repo = self.repo.unfiltered()
6a71324cb68b shelve: handle shelved node on unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 39399 diff changeset	161
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	162 outgoing = discovery.outgoing(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	163 repo, missingroots=bases, missingheads=[node]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	164 )
39400 6a71324cb68b shelve: handle shelved node on unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 39399 diff changeset	165 cg = changegroup.makechangegroup(repo, outgoing, cgversion, 'shelve')
34112 f7d41b85bbf6 changegroup: replace changegroupsubset with makechangegroup Durham Goode <durham@fb.com> parents: 33440 diff changeset	166
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	167 bundle2.writebundle(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	168 self.ui, cg, self.fname, btype, self.vfs, compression=compression
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	169 )
20983 2778616de7ce shelve: add "writebundle()" to invoke "writebundle()" with relative path and vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20982 diff changeset	170
39370 bab58b1d87c7 shelve: rename method for data write/read Boris Feld <boris.feld@octobus.net> parents: 39369 diff changeset	171 def writeinfo(self, info):
31560 7485e45807e4 shelve: add an ability to write key-val data to a new type of shelve files Kostia Balytskyi <ikostia@fb.com> parents: 31549 diff changeset	172 scmutil.simplekeyvaluefile(self.vfs, self.fname).write(info)
7485e45807e4 shelve: add an ability to write key-val data to a new type of shelve files Kostia Balytskyi <ikostia@fb.com> parents: 31549 diff changeset	173
39370 bab58b1d87c7 shelve: rename method for data write/read Boris Feld <boris.feld@octobus.net> parents: 39369 diff changeset	174 def readinfo(self):
31560 7485e45807e4 shelve: add an ability to write key-val data to a new type of shelve files Kostia Balytskyi <ikostia@fb.com> parents: 31549 diff changeset	175 return scmutil.simplekeyvaluefile(self.vfs, self.fname).read()
7485e45807e4 shelve: add an ability to write key-val data to a new type of shelve files Kostia Balytskyi <ikostia@fb.com> parents: 31549 diff changeset	176
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	177
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	178 class shelvedstate(object):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	179 """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	180
df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	181 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	182 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	183 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	184
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	185 _version = 2
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	186 _filename = 'shelvedstate'
30531 7b3136bc7bfd shelve: make --keep option survive user intervention (issue5431) Kostia Balytskyi <ikostia@fb.com> parents: 30466 diff changeset	187 _keep = 'keep'
7b3136bc7bfd shelve: make --keep option survive user intervention (issue5431) Kostia Balytskyi <ikostia@fb.com> parents: 30466 diff changeset	188 _nokeep = 'nokeep'
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	189 # colon is essential to differentiate from a real bookmark name
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	190 _noactivebook = ':no-active-bookmark'
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	191 _interactive = 'interactive'
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	192
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	193 @classmethod
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	194 def _verifyandtransform(cls, d):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	195 """Some basic shelvestate syntactic verification and transformation"""
19904 5b327880a660 shelve: drop pickle usage Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19887 diff changeset	196 try:
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	197 d['originalwctx'] = nodemod.bin(d['originalwctx'])
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	198 d['pendingctx'] = nodemod.bin(d['pendingctx'])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	199 d['parents'] = [nodemod.bin(h) for h in d['parents'].split(' ')]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	200 d['nodestoremove'] = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	201 nodemod.bin(h) for h in d['nodestoremove'].split(' ')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	202 ]
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	203 except (ValueError, TypeError, KeyError) as err:
36526 7af7443877da py3: replace str() with it's bytes equivalent in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 36223 diff changeset	204 raise error.CorruptedState(pycompat.bytestr(err))
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	205
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	206 @classmethod
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	207 def _getversion(cls, repo):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	208 """Read version information from shelvestate file"""
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	209 fp = repo.vfs(cls._filename)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	210 try:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	211 version = int(fp.readline().strip())
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	212 except ValueError as err:
36526 7af7443877da py3: replace str() with it's bytes equivalent in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 36223 diff changeset	213 raise error.CorruptedState(pycompat.bytestr(err))
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	214 finally:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	215 fp.close()
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	216 return version
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	217
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	218 @classmethod
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	219 def _readold(cls, repo):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	220 """Read the old position-based version of a shelvestate file"""
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	221 # Order is important, because old shelvestate file uses it
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	222 # to detemine values of fields (i.g. name is on the second line,
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	223 # originalwctx is on the third and so forth). Please do not change.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	224 keys = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	225 'version',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	226 'name',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	227 'originalwctx',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	228 'pendingctx',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	229 'parents',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	230 'nodestoremove',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	231 'branchtorestore',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	232 'keep',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	233 'activebook',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	234 ]
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	235 # this is executed only seldomly, so it is not a big deal
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	236 # that we open this file twice
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	237 fp = repo.vfs(cls._filename)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	238 d = {}
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	239 try:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	240 for key in keys:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	241 d[key] = fp.readline().strip()
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	242 finally:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	243 fp.close()
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	244 return d
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	245
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	246 @classmethod
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	247 def load(cls, repo):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	248 version = cls._getversion(repo)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	249 if version < cls._version:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	250 d = cls._readold(repo)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	251 elif version == cls._version:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	252 d = scmutil.simplekeyvaluefile(repo.vfs, cls._filename).read(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	253 firstlinenonkeyval=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	254 )
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	255 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	256 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	257 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	258 'this version of shelve is incompatible '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	259 'with the version used in this repo'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	260 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	261 )
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	262
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	263 cls._verifyandtransform(d)
29536 b17a6e3cd2ac shelve: make unshelve be able to abort in any case Kostia Balytskyi <ikostia@fb.com> parents: 29270 diff changeset	264 try:
b17a6e3cd2ac shelve: make unshelve be able to abort in any case Kostia Balytskyi <ikostia@fb.com> parents: 29270 diff changeset	265 obj = cls()
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	266 obj.name = d['name']
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	267 obj.wctx = repo[d['originalwctx']]
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	268 obj.pendingctx = repo[d['pendingctx']]
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	269 obj.parents = d['parents']
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	270 obj.nodestoremove = d['nodestoremove']
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	271 obj.branchtorestore = d.get('branchtorestore', '')
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	272 obj.keep = d.get('keep') == cls._keep
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	273 obj.activebookmark = ''
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	274 if d.get('activebook', '') != cls._noactivebook:
16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	275 obj.activebookmark = d.get('activebook', '')
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	276 obj.interactive = d.get('interactive') == cls._interactive
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	277 except (error.RepoLookupError, KeyError) as err:
36526 7af7443877da py3: replace str() with it's bytes equivalent in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 36223 diff changeset	278 raise error.CorruptedState(pycompat.bytestr(err))
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 return obj
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	281
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	282 @classmethod
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	283 def save(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	284 cls,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	285 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	286 name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	287 originalwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	288 pendingctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	289 nodestoremove,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	290 branchtorestore,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	291 keep=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	292 activebook='',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	293 interactive=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	294 ):
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	295 info = {
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	296 "name": name,
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	297 "originalwctx": nodemod.hex(originalwctx.node()),
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	298 "pendingctx": nodemod.hex(pendingctx.node()),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	299 "parents": ' '.join(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	300 [nodemod.hex(p) for p in repo.dirstate.parents()]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	301 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	302 "nodestoremove": ' '.join([nodemod.hex(n) for n in nodestoremove]),
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	303 "branchtorestore": branchtorestore,
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	304 "keep": cls._keep if keep else cls._nokeep,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	305 "activebook": activebook or cls._noactivebook,
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	306 }
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	307 if interactive:
ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	308 info['interactive'] = cls._interactive
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	309 scmutil.simplekeyvaluefile(repo.vfs, cls._filename).write(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	310 info, firstline=("%d" % cls._version)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	311 )
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	312
19908 07ee5c8867ca shelve: use the class constant in the clear method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19904 diff changeset	313 @classmethod
07ee5c8867ca shelve: use the class constant in the clear method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19904 diff changeset	314 def clear(cls, repo):
31320 f59b6cf663a9 vfs: use repo.vfs.unlinkpath Mads Kiilerich <mads@kiilerich.com> parents: 31254 diff changeset	315 repo.vfs.unlinkpath(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	316
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	317
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	318 def cleanupoldbackups(repo):
31344 3acc7af5859c shelve: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31321 diff changeset	319 vfs = vfsmod.vfs(repo.vfs.join(backupdir))
34496 18cd210535b3 configitems: register the 'shelve.maxbackups' config Boris Feld <boris.feld@octobus.net> parents: 34112 diff changeset	320 maxbackups = repo.ui.configint('shelve', 'maxbackups')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	321 hgfiles = [f for f in vfs.listdir() if f.endswith('.' + patchextension)]
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 36636 diff changeset	322 hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles])
40030 e2697acd9381 cleanup: some Yoda conditions, this patch removes Martin von Zweigbergk <martinvonz@google.com> parents: 39894 diff changeset	323 if maxbackups > 0 and maxbackups < len(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	324 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	325 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	326 bordermtime = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	327 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	328 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	329 # 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	330 continue
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	331 base = f[: -(1 + len(patchextension))]
30388 c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	332 for ext in shelvefileextensions:
31549 d5758760c0f4 shelve: use tryunlink Ryan McElroy <rmcelroy@fb.com> parents: 31471 diff changeset	333 vfs.tryunlink(base + '.' + ext)
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	334
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	335
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	336 def _backupactivebookmark(repo):
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	337 activebookmark = repo._activebookmark
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	338 if activebookmark:
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	339 bookmarks.deactivate(repo)
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	340 return activebookmark
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	341
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	342
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	343 def _restoreactivebookmark(repo, mark):
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	344 if mark:
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	345 bookmarks.activate(repo, mark)
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	346
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	347
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	348 def _aborttransaction(repo, tr):
26522 10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	349 '''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	350 '''
38908 ad24b581e4d9 narrow: call narrowspec.{save,restore,clear}backup directly Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	351 dirstatebackupname = 'dirstate.shelve'
ad24b581e4d9 narrow: call narrowspec.{save,restore,clear}backup directly Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	352 repo.dirstate.savebackup(tr, dirstatebackupname)
29270 48b38b16a8f8 shelve: use backup functions instead of manually copying dirstate Mateusz Kwapich <mitrandir@fb.com> parents: 29205 diff changeset	353 tr.abort()
38908 ad24b581e4d9 narrow: call narrowspec.{save,restore,clear}backup directly Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	354 repo.dirstate.restorebackup(None, dirstatebackupname)
26522 10f14bb22950 shelve: add utility to abort current transaction but keep dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26520 diff changeset	355
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	356
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	357 def getshelvename(repo, parent, opts):
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	358 """Decide on the name this shelve is going to have"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	359
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	360 def gennames():
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	361 yield label
32986 4107eb8a5648 shelve: allow unlimited shelved changes per name Jun Wu <quark@fb.com> parents: 32948 diff changeset	362 for i in itertools.count(1):
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	363 yield '%s-%02d' % (label, i)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	364
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	365 name = opts.get('name')
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	366 label = repo._activebookmark or parent.branch() or 'default'
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	367 # slashes aren't allowed in filenames, therefore we rename it
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	368 label = label.replace('/', '_')
30674 64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	369 label = label.replace('\\', '_')
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	370 # filenames must not start with '.' as it should not be hidden
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	371 if label.startswith('.'):
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	372 label = label.replace('.', '_', 1)
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	373
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	374 if name:
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	375 if shelvedfile(repo, name, patchextension).exists():
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	376 e = _("a shelved change named '%s' already exists") % name
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	377 raise error.Abort(e)
30674 64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	378
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	379 # ensure we are not creating a subdirectory or a hidden file
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	380 if '/' in name or '\\' in name:
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	381 raise error.Abort(_('shelved change names can not contain slashes'))
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	382 if name.startswith('.'):
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	383 raise error.Abort(_("shelved change names can not start with '.'"))
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	384
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	385 else:
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	386 for n in gennames():
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	387 if not shelvedfile(repo, n, patchextension).exists():
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	388 name = n
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	389 break
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	390
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	391 return name
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	392
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	393
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	394 def mutableancestors(ctx):
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	395 """return all mutable ancestors for ctx (included)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	396
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	397 Much faster than the revset ancestors(ctx) & draft()"""
32331 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32325 diff changeset	398 seen = {nodemod.nullrev}
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	399 visit = collections.deque()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	400 visit.append(ctx)
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	401 while visit:
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	402 ctx = visit.popleft()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	403 yield ctx.node()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	404 for parent in ctx.parents():
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	405 rev = parent.rev()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	406 if rev not in seen:
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	407 seen.add(rev)
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	408 if parent.mutable():
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	409 visit.append(parent)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	410
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	411
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	412 def getcommitfunc(extra, interactive, editor=False):
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	413 def commitfunc(ui, repo, message, match, opts):
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	414 hasmq = util.safehasattr(repo, 'mq')
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	415 if hasmq:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	416 saved, repo.mq.checkapplied = repo.mq.checkapplied, False
39536 5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	417
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	418 targetphase = phases.internal
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	419 if not phases.supportinternal(repo):
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	420 targetphase = phases.secret
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	421 overrides = {('phases', 'new-commit'): targetphase}
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	422 try:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	423 editor_ = False
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	424 if editor:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	425 editor_ = cmdutil.getcommiteditor(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	426 editform='shelve.shelve', **pycompat.strkwargs(opts)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	427 )
31471 d1ce2124ec83 shelve: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31344 diff changeset	428 with repo.ui.configoverride(overrides):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	429 return repo.commit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	430 message,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	431 shelveuser,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	432 opts.get('date'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	433 match,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	434 editor=editor_,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	435 extra=extra,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	436 )
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	437 finally:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	438 if hasmq:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	439 repo.mq.checkapplied = saved
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	440
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	441 def interactivecommitfunc(ui, repo, pats, *opts):
35046 aad6b9fdfc75 py3: handle keyword arguments in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34496 diff changeset	442 opts = pycompat.byteskwargs(opts)
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	443 match = scmutil.match(repo['.'], pats, {})
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	444 message = opts['message']
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	445 return commitfunc(ui, repo, message, match, opts)
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	446
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	447 return interactivecommitfunc if interactive else commitfunc
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	448
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	449
30392 dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	450 def _nothingtoshelvemessaging(ui, repo, pats, opts):
dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	451 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	452 if stat.deleted:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	453 ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	454 _("nothing changed (%d missing files, see " "'hg status')\n")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	455 % len(stat.deleted)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	456 )
30392 dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	457 else:
dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	458 ui.status(_("nothing changed\n"))
dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	459
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	460
42012 9b78bbb76111 shelve: refactor _shelvecreatedcommit's match object into calling site Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42011 diff changeset	461 def _shelvecreatedcommit(repo, node, name, match):
39399 da121c9dc0f2 shelve: store shelved node in a new data file Boris Feld <boris.feld@octobus.net> parents: 39371 diff changeset	462 info = {'node': nodemod.hex(node)}
da121c9dc0f2 shelve: store shelved node in a new data file Boris Feld <boris.feld@octobus.net> parents: 39371 diff changeset	463 shelvedfile(repo, name, 'shelve').writeinfo(info)
30393 455f7856db20 shelve: move actual created commit shelving to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30392 diff changeset	464 bases = list(mutableancestors(repo[node]))
455f7856db20 shelve: move actual created commit shelving to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30392 diff changeset	465 shelvedfile(repo, name, 'hg').writebundle(bases, node)
37603 678d760c71ff export: extract function to write patch to file object (API) Yuya Nishihara <yuya@tcha.org> parents: 37087 diff changeset	466 with shelvedfile(repo, name, patchextension).opener('wb') as fp:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	467 cmdutil.exportfile(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	468 repo, [node], fp, opts=mdiff.diffopts(git=True), match=match
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	469 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	470
30393 455f7856db20 shelve: move actual created commit shelving to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30392 diff changeset	471
30394 21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	472 def _includeunknownfiles(repo, pats, opts, extra):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	473 s = repo.status(match=scmutil.match(repo[None], pats, opts), unknown=True)
30394 21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	474 if s.unknown:
21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	475 extra['shelve_unknown'] = '\0'.join(s.unknown)
21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	476 repo[None].add(s.unknown)
21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	477
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	478
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	479 def _finishshelve(repo, tr):
39760 52dfa1eb0ad4 shelve: no longer strip internal commit when using internal phase Boris Feld <boris.feld@octobus.net> parents: 39617 diff changeset	480 if phases.supportinternal(repo):
52dfa1eb0ad4 shelve: no longer strip internal commit when using internal phase Boris Feld <boris.feld@octobus.net> parents: 39617 diff changeset	481 tr.close()
52dfa1eb0ad4 shelve: no longer strip internal commit when using internal phase Boris Feld <boris.feld@octobus.net> parents: 39617 diff changeset	482 else:
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	483 _aborttransaction(repo, tr)
30395 b573d7ca31c4 shelve: move shelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30394 diff changeset	484
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	485
39369 d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	486 def createcmd(ui, repo, pats, opts):
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	487 """subcommand that creates a new shelve"""
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	488 with repo.wlock():
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	489 cmdutil.checkunfinished(repo)
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	490 return _docreatecmd(ui, repo, pats, opts)
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	491
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	492
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	493 def _docreatecmd(ui, repo, pats, opts):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	494 wctx = repo[None]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	495 parents = wctx.parents()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	496 parent = parents[0]
28571 3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	497 origbranch = wctx.branch()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	498
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	499 if parent.node() != nodemod.nullid:
27092 156985f2dec0 shelve: use colon instead of quotes in 'changes to' description Siddharth Agarwal <sid0@fb.com> parents: 27021 diff changeset	500 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	501 else:
20411 66359d8b8d7e shelve: add 'changes to' prefix to default shelve message Mads Kiilerich <madski@unity3d.com> parents: 20410 diff changeset	502 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	503
28401 2565fe39a76c shelve: changes getting opts values by get method liscju <piotr.listkiewicz@gmail.com> parents: 28378 diff changeset	504 if not opts.get('message'):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	505 opts['message'] = desc
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	506
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	507 lock = tr = activebookmark = None
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	508 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	509 lock = repo.lock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	510
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19943 diff changeset	511 # 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	512 # pull races. ensure we don't print the abort message to stderr.
40872 236af7cfa4c3 shelve: change transaction description from "commit" to "shelve" Martin von Zweigbergk <martinvonz@google.com> parents: 40871 diff changeset	513 tr = repo.transaction('shelve', report=lambda x: None)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	514
24477 325f03de849d shelve: add interactive mode command line option Laurent Charignon <lcharignon@fb.com> parents: 23895 diff changeset	515 interactive = opts.get('interactive', False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	516 includeunknown = opts.get('unknown', False) and not opts.get(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	517 'addremove', False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	518 )
27908 d73a5ab18015 shelve: permit shelves to contain unknown files Simon Farnsworth <simonfar@fb.com> parents: 27888 diff changeset	519
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	520 name = getshelvename(repo, parent, opts)
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	521 activebookmark = _backupactivebookmark(repo)
39403 5f8282f368b2 shelve: add an "internal" extra Boris Feld <boris.feld@octobus.net> parents: 39402 diff changeset	522 extra = {'internal': 'shelve'}
27908 d73a5ab18015 shelve: permit shelves to contain unknown files Simon Farnsworth <simonfar@fb.com> parents: 27888 diff changeset	523 if includeunknown:
30394 21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	524 _includeunknownfiles(repo, pats, opts, extra)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	525
28572 43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	526 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts):
43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	527 # In non-bare shelve we don't store newly created branch
43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	528 # at bundled commit
43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	529 repo.dirstate.setbranch(repo['.'].branch())
43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	530
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	531 commitfunc = getcommitfunc(extra, interactive, editor=True)
24478 95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	532 if not interactive:
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	533 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	534 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	535 node = cmdutil.dorecord(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	536 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	537 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	538 commitfunc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	539 None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	540 False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	541 cmdutil.recordfilter,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	542 *pats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	543 **pycompat.strkwargs(opts)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	544 )
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	545 if not node:
30392 dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	546 _nothingtoshelvemessaging(ui, repo, pats, opts)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	547 return 1
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	548
42012 9b78bbb76111 shelve: refactor _shelvecreatedcommit's match object into calling site Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42011 diff changeset	549 # Create a matcher so that prefetch doesn't attempt to fetch
42013 50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	550 # the entire repository pointlessly, and as an optimisation
50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	551 # for movedirstate, if needed.
42012 9b78bbb76111 shelve: refactor _shelvecreatedcommit's match object into calling site Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42011 diff changeset	552 match = scmutil.matchfiles(repo, repo[node].files())
9b78bbb76111 shelve: refactor _shelvecreatedcommit's match object into calling site Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42011 diff changeset	553 _shelvecreatedcommit(repo, node, name, match)
19874 5836edcbdc2e shelve: copy bookmarks and restore them after a commit David Soria Parra <dsp@experimentalworks.net> parents: 19856 diff changeset	554
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	555 if ui.formatted():
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	556 desc = stringutil.ellipsis(desc, ui.termwidth())
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	557 ui.status(_('shelved as %s\n') % name)
42013 50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	558 if opts['keep']:
50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	559 with repo.dirstate.parentchange():
50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	560 scmutil.movedirstate(repo, parent, match)
50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	561 else:
50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	562 hg.update(repo, parent.node())
28571 3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	563 if origbranch != repo['.'].branch() and not _isbareshelve(pats, opts):
3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	564 repo.dirstate.setbranch(origbranch)
26523 1d23bf6cd90a shelve: restore shelved dirstate explicitly after aborting transaction FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26522 diff changeset	565
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	566 _finishshelve(repo, tr)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	567 finally:
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	568 _restoreactivebookmark(repo, activebookmark)
27197 6df3ec5bb813 shelve: widen wlock scope of shelve for consistency while processing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27092 diff changeset	569 lockmod.release(tr, lock)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	570
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	571
28571 3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	572 def _isbareshelve(pats, opts):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	573 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	574 not pats
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	575 and not opts.get('interactive', False)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	576 and not opts.get('include', False)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	577 and not opts.get('exclude', False)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	578 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	579
28571 3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	580
28572 43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	581 def _iswctxonnewbranch(repo):
43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	582 return repo[None].branch() != repo['.'].branch()
43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	583
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	584
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	585 def cleanupcmd(ui, repo):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	586 """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	587
27835 c448d7e00bf9 with: use context manager for wlock in shelve cleanupcmd Bryan O'Sullivan <bryano@fb.com> parents: 27834 diff changeset	588 with repo.wlock():
28862 39130afcce60 shelve: refactor directory name into constant Oleg Afanasyev <olegaf@fb.com> parents: 28666 diff changeset	589 for (name, _type) in repo.vfs.readdir(shelvedir):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	590 suffix = name.rsplit('.', 1)[-1]
30388 c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	591 if suffix in shelvefileextensions:
25712 8a6264a2ee60 shelve: always backup shelves instead of deleting them Colin Chan <colinchan@fb.com> parents: 25660 diff changeset	592 shelvedfile(repo, name).movetobackup()
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	593 cleanupoldbackups(repo)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	594
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	595
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	596 def deletecmd(ui, repo, pats):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	597 """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	598 if not pats:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26577 diff changeset	599 raise error.Abort(_('no shelved changes specified!'))
27836 1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	600 with repo.wlock():
1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	601 try:
1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	602 for name in pats:
30388 c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	603 for suffix in shelvefileextensions:
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	604 shfile = shelvedfile(repo, name, suffix)
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	605 # patch file is necessary, as it should
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	606 # be present for any kind of shelve,
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	607 # but the .hg file is optional as in future we
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	608 # will add obsolete shelve with does not create a
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	609 # bundle
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	610 if shfile.exists() or suffix == patchextension:
30388 c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	611 shfile.movetobackup()
27836 1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	612 cleanupoldbackups(repo)
1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	613 except OSError as err:
1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	614 if err.errno != errno.ENOENT:
1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	615 raise
1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	616 raise error.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	617
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	618
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	619 def listshelves(repo):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	620 """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	621 try:
28862 39130afcce60 shelve: refactor directory name into constant Oleg Afanasyev <olegaf@fb.com> parents: 28666 diff changeset	622 names = repo.vfs.readdir(shelvedir)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25260 diff changeset	623 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	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 return []
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	627 info = []
22199 b3e51675f98e cleanup: avoid _ for local unused tmp variables - that is reserved for i18n Mads Kiilerich <madski@unity3d.com> parents: 22184 diff changeset	628 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	629 pfx, sfx = name.rsplit('.', 1)
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	630 if not pfx or sfx != patchextension:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	631 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	632 st = shelvedfile(repo, name).stat()
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 36636 diff changeset	633 info.append((st[stat.ST_MTIME], shelvedfile(repo, pfx).filename()))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	634 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	635
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	636
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	637 def listcmd(ui, repo, pats, opts):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	638 """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	639 pats = set(pats)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	640 width = 80
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	641 if not ui.plain():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	642 width = ui.termwidth()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	643 namelabel = 'shelve.newest'
31113 356937ea7a02 pager: add support to --patch, --list and --stat options of hg shelve Pulkit Goyal <7895pulkit@gmail.com> parents: 31041 diff changeset	644 ui.pager('shelve')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	645 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	646 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	647 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	648 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	649 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	650 namelabel = 'shelve.name'
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	651 if ui.quiet:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	652 ui.write('\n')
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	653 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	654 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	655 used = 16
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36526 diff changeset	656 date = dateutil.makedate(mtime)
c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36526 diff changeset	657 age = '(%s)' % templatefilters.age(date, abbrev=True)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	658 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	659 ui.write(' ' * (12 - len(age)))
a3b285882724 shelve: new output format for shelve listings David Soria Parra <dsp@experimentalworks.net> parents: 19854 diff changeset	660 used += 12
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	661 with open(name + '.' + patchextension, 'rb') as fp:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	662 while True:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	663 line = fp.readline()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	664 if not line:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	665 break
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	666 if not line.startswith('#'):
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	667 desc = line.rstrip()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	668 if ui.formatted():
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	669 desc = stringutil.ellipsis(desc, width - used)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	670 ui.write(desc)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	671 break
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	672 ui.write('\n')
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	673 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	674 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	675 difflines = fp.readlines()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	676 if opts['patch']:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	677 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	678 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	679 if opts['stat']:
30417 e1677cc29da6 patch: remove unused git parameter from patch.diffstat() Henning Schild <henning@hennsch.de> parents: 30395 diff changeset	680 for chunk, label in patch.diffstatui(difflines, width=width):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	681 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	682
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	683
38715 905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	684 def patchcmds(ui, repo, pats, opts):
30823 806a830e6612 shelve: allow multiple shelves with --patch and --stat Pulkit Goyal <7895pulkit@gmail.com> parents: 30674 diff changeset	685 """subcommand that displays shelves"""
806a830e6612 shelve: allow multiple shelves with --patch and --stat Pulkit Goyal <7895pulkit@gmail.com> parents: 30674 diff changeset	686 if len(pats) == 0:
38715 905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	687 shelves = listshelves(repo)
905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	688 if not shelves:
905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	689 raise error.Abort(_("there are no shelves to show"))
905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	690 mtime, name = shelves[0]
905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	691 sname = util.split(name)[1]
905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	692 pats = [sname]
25104 d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	693
30823 806a830e6612 shelve: allow multiple shelves with --patch and --stat Pulkit Goyal <7895pulkit@gmail.com> parents: 30674 diff changeset	694 for shelfname in pats:
806a830e6612 shelve: allow multiple shelves with --patch and --stat Pulkit Goyal <7895pulkit@gmail.com> parents: 30674 diff changeset	695 if not shelvedfile(repo, shelfname, patchextension).exists():
806a830e6612 shelve: allow multiple shelves with --patch and --stat Pulkit Goyal <7895pulkit@gmail.com> parents: 30674 diff changeset	696 raise error.Abort(_("cannot find shelf %s") % shelfname)
25104 d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	697
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	698 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	699
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	700
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	701 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	702 """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	703 if state.parents != repo.dirstate.parents():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	704 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	705 _('working directory parents do not match unshelve ' 'state')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	706 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	707
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	708
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	709 def _loadshelvedstate(ui, repo, opts):
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	710 try:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	711 state = shelvedstate.load(repo)
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	712 if opts.get('keep') is None:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	713 opts['keep'] = state.keep
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	714 except IOError as err:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	715 if err.errno != errno.ENOENT:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	716 raise
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	717 cmdutil.wrongtooltocontinue(repo, _('unshelve'))
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	718 except error.CorruptedState as err:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	719 ui.debug(pycompat.bytestr(err) + '\n')
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	720 if opts.get('continue'):
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	721 msg = _('corrupted shelved state file')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	722 hint = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	723 'please run hg unshelve --abort to abort unshelve ' 'operation'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	724 )
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	725 raise error.Abort(msg, hint=hint)
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	726 elif opts.get('abort'):
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	727 shelvedstate.clear(repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	728 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	729 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	730 'could not read shelved state file, your '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	731 'working copy may be in an unexpected state\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	732 'please update to some commit\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	733 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	734 )
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	735 return state
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	736
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	737
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	738 def unshelveabort(ui, repo, state):
19909 df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	739 """subcommand that abort an in-progress unshelve"""
27841 83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	740 with repo.lock():
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	741 try:
27841 83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	742 checkparents(repo, state)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	743
40366 b14fdf1fb615 update: clarify update() call sites by specifying argument names Martin von Zweigbergk <martinvonz@google.com> parents: 40293 diff changeset	744 merge.update(repo, state.pendingctx, branchmerge=False, force=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	745 if state.activebookmark and state.activebookmark in repo._bookmarks:
38466 61e4cf1be5b2 shelve: directly handle the abort process Boris Feld <boris.feld@octobus.net> parents: 38011 diff changeset	746 bookmarks.activate(repo, state.activebookmark)
27841 83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	747 mergefiles(ui, repo, state.wctx, state.pendingctx)
39760 52dfa1eb0ad4 shelve: no longer strip internal commit when using internal phase Boris Feld <boris.feld@octobus.net> parents: 39617 diff changeset	748 if not phases.supportinternal(repo):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	749 repair.strip(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	750 ui, repo, state.nodestoremove, backup=False, topic='shelve'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	751 )
27841 83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	752 finally:
83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	753 shelvedstate.clear(repo)
83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	754 ui.warn(_("unshelve of '%s' aborted\n") % state.name)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	755
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	756
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	757 def hgabortunshelve(ui, repo):
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	758 """logic to abort unshelve using 'hg abort"""
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	759 with repo.wlock():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	760 state = _loadshelvedstate(ui, repo, {'abort': True})
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	761 return unshelveabort(ui, repo, state)
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	762
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	763
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	764 def mergefiles(ui, repo, wctx, shelvectx):
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	765 """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	766 dirstate."""
31762 473f2fcc7629 shelve: move ui.quiet manipulations to configoverride Kostia Balytskyi <ikostia@fb.com> parents: 31669 diff changeset	767 with ui.configoverride({('ui', 'quiet'): True}):
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	768 hg.update(repo, wctx.node())
22184 fb8065de47b0 unshelve: silence internal revert Matt Mackall <mpm@selenic.com> parents: 22057 diff changeset	769 ui.pushbuffer(True)
42038 e08559769bc6 shelve: let cmdutil.revert() take care of backing up untracked files Martin von Zweigbergk <martinvonz@google.com> parents: 42037 diff changeset	770 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents())
22184 fb8065de47b0 unshelve: silence internal revert Matt Mackall <mpm@selenic.com> parents: 22057 diff changeset	771 ui.popbuffer()
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	772
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	773
28573 6a42564081cb shelve: adds restoring newly created branch (issue5048) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28572 diff changeset	774 def restorebranch(ui, repo, branchtorestore):
6a42564081cb shelve: adds restoring newly created branch (issue5048) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28572 diff changeset	775 if branchtorestore and branchtorestore != repo.dirstate.branch():
6a42564081cb shelve: adds restoring newly created branch (issue5048) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28572 diff changeset	776 repo.dirstate.setbranch(branchtorestore)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	777 ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	778 _('marked working directory as branch %s\n') % branchtorestore
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	779 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	780
28573 6a42564081cb shelve: adds restoring newly created branch (issue5048) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28572 diff changeset	781
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	782 def unshelvecleanup(ui, repo, name, opts):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	783 """remove related files after an unshelve"""
28401 2565fe39a76c shelve: changes getting opts values by get method liscju <piotr.listkiewicz@gmail.com> parents: 28378 diff changeset	784 if not opts.get('keep'):
30388 c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	785 for filetype in shelvefileextensions:
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	786 shfile = shelvedfile(repo, name, filetype)
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	787 if shfile.exists():
c5126aab9c37 shelve: move possible shelve file extensions to a single place Kostia Balytskyi <ikostia@fb.com> parents: 29852 diff changeset	788 shfile.movetobackup()
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	789 cleanupoldbackups(repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	790
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	791
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	792 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	793 """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	794 # 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	795 # parent, second is the temporary "fake" commit we're unshelving.
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	796 interactive = state.interactive
ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	797 basename = state.name
27838 60b850b7e4ef with: use context manager for lock in continue Bryan O'Sullivan <bryano@fb.com> parents: 27837 diff changeset	798 with repo.lock():
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	799 checkparents(repo, state)
26992 b3b5ed560283 shelve: switch to mergestate.read() Siddharth Agarwal <sid0@fb.com> parents: 26942 diff changeset	800 ms = merge.mergestate.read(repo)
33313 ea03b3223611 shelve: don't reimplement mergestate.unresolved() Martin von Zweigbergk <martinvonz@google.com> parents: 33055 diff changeset	801 if list(ms.unresolved()):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26577 diff changeset	802 raise error.Abort(
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	803 _("unresolved conflicts, can't continue"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	804 hint=_("see 'hg resolve', then 'hg unshelve --continue'"),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	805 )
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	806
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	807 shelvectx = repo[state.parents[1]]
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	808 pendingctx = state.pendingctx
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	809
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	810 with repo.dirstate.parentchange():
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	811 repo.setparents(state.pendingctx.node(), nodemod.nullid)
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	812 repo.dirstate.write(repo.currenttransaction())
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	813
39536 5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	814 targetphase = phases.internal
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	815 if not phases.supportinternal(repo):
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	816 targetphase = phases.secret
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	817 overrides = {('phases', 'new-commit'): targetphase}
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	818 with repo.ui.configoverride(overrides, 'unshelve'):
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	819 with repo.dirstate.parentchange():
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	820 repo.setparents(state.parents[0], nodemod.nullid)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	821 newnode, ispartialunshelve = _createunshelvectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	822 ui, repo, shelvectx, basename, interactive, opts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	823 )
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	824
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	825 if newnode is None:
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	826 # If it ended up being a no-op commit, then the normal
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	827 # merge state clean-up path doesn't happen, so do it
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	828 # here. Fix issue5494
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	829 merge.mergestate.clean(repo)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	830 shelvectx = state.pendingctx
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	831 msg = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	832 'note: unshelved changes already existed '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	833 'in the working copy\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	834 )
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	835 ui.status(msg)
22842 d43d116a118c shelve: don't delete "." when rebase is a no-op (issue4398) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 21852 diff changeset	836 else:
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	837 # only strip the shelvectx if we produced one
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	838 state.nodestoremove.append(newnode)
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	839 shelvectx = repo[newnode]
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	840
38512 39db5a01cd53 cleanup: pass in overwrite flag to hg.updaterepo() as named argument Yuya Nishihara <yuya@tcha.org> parents: 38467 diff changeset	841 hg.updaterepo(repo, pendingctx.node(), overwrite=False)
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	842 mergefiles(ui, repo, state.wctx, shelvectx)
28573 6a42564081cb shelve: adds restoring newly created branch (issue5048) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28572 diff changeset	843 restorebranch(ui, repo, state.branchtorestore)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	844
42724 4814d993fe21 unshelve: handle stripping changesets on interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42695 diff changeset	845 if not phases.supportinternal(repo):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	846 repair.strip(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	847 ui, repo, state.nodestoremove, backup=False, topic='shelve'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	848 )
42725 073cfff9aaef unshelve: delete shelvedstate after a successful unshelve --continue Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42724 diff changeset	849 shelvedstate.clear(repo)
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	850 if not ispartialunshelve:
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	851 unshelvecleanup(ui, repo, state.name, opts)
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	852 _restoreactivebookmark(repo, state.activebookmark)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	853 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	854
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	855
42614 117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	856 def hgcontinueunshelve(ui, repo):
117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	857 """logic to resume unshelve using 'hg continue'"""
117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	858 with repo.wlock():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	859 state = _loadshelvedstate(ui, repo, {'continue': True})
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	860 return unshelvecontinue(ui, repo, state, {'keep': state.keep})
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	861
42614 117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	862
30462 2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	863 def _commitworkingcopychanges(ui, repo, opts, tmpwctx):
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	864 """Temporarily commit working copy changes before moving unshelve commit"""
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	865 # Store pending changes in a commit and remember added in case a shelve
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	866 # contains unknown files that are part of the pending change
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	867 s = repo.status()
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	868 addedbefore = frozenset(s.added)
30846 dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	869 if not (s.modified or s.added or s.removed):
30462 2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	870 return tmpwctx, addedbefore
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	871 ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	872 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	873 "temporarily committing pending changes "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	874 "(restore with 'hg unshelve --abort')\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	875 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	876 )
39403 5f8282f368b2 shelve: add an "internal" extra Boris Feld <boris.feld@octobus.net> parents: 39402 diff changeset	877 extra = {'internal': 'shelve'}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	878 commitfunc = getcommitfunc(extra=extra, interactive=False, editor=False)
30462 2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	879 tempopts = {}
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	880 tempopts['message'] = "pending changes temporary commit"
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	881 tempopts['date'] = opts.get('date')
31762 473f2fcc7629 shelve: move ui.quiet manipulations to configoverride Kostia Balytskyi <ikostia@fb.com> parents: 31669 diff changeset	882 with ui.configoverride({('ui', 'quiet'): True}):
473f2fcc7629 shelve: move ui.quiet manipulations to configoverride Kostia Balytskyi <ikostia@fb.com> parents: 31669 diff changeset	883 node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
30462 2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	884 tmpwctx = repo[node]
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	885 return tmpwctx, addedbefore
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	886
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	887
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	888 def _unshelverestorecommit(ui, repo, tr, basename):
30463 672026aece64 shelve: move commit restoration logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30462 diff changeset	889 """Recreate commit in the repository during the unshelve"""
39400 6a71324cb68b shelve: handle shelved node on unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 39399 diff changeset	890 repo = repo.unfiltered()
39414 da84cca65036 shelve: fix crash on unshelve without .shelve metadata file Yuya Nishihara <yuya@tcha.org> parents: 39403 diff changeset	891 node = None
39401 c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	892 if shelvedfile(repo, basename, 'shelve').exists():
c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	893 node = shelvedfile(repo, basename, 'shelve').readinfo()['node']
c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	894 if node is None or node not in repo:
c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	895 with ui.configoverride({('ui', 'quiet'): True}):
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	896 shelvectx = shelvedfile(repo, basename, 'hg').applybundle(tr)
39402 38373da1af02 shelve: write metadata file on the fly if they are missing Boris Feld <boris.feld@octobus.net> parents: 39401 diff changeset	897 # We might not strip the unbundled changeset, so we should keep track of
38373da1af02 shelve: write metadata file on the fly if they are missing Boris Feld <boris.feld@octobus.net> parents: 39401 diff changeset	898 # the unshelve node in case we need to reuse it (eg: unshelve --keep)
38373da1af02 shelve: write metadata file on the fly if they are missing Boris Feld <boris.feld@octobus.net> parents: 39401 diff changeset	899 if node is None:
39414 da84cca65036 shelve: fix crash on unshelve without .shelve metadata file Yuya Nishihara <yuya@tcha.org> parents: 39403 diff changeset	900 info = {'node': nodemod.hex(shelvectx.node())}
39402 38373da1af02 shelve: write metadata file on the fly if they are missing Boris Feld <boris.feld@octobus.net> parents: 39401 diff changeset	901 shelvedfile(repo, basename, 'shelve').writeinfo(info)
39401 c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	902 else:
c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	903 shelvectx = repo[node]
c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	904
30463 672026aece64 shelve: move commit restoration logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30462 diff changeset	905 return repo, shelvectx
672026aece64 shelve: move commit restoration logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30462 diff changeset	906
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	907
42688 c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	908 def _createunshelvectx(ui, repo, shelvectx, basename, interactive, opts):
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	909 """Handles the creation of unshelve commit and updates the shelve if it
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	910 was partially unshelved.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	911
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	912 If interactive is:
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	913
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	914 * False: Commits all the changes in the working directory.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	915 * True: Prompts the user to select changes to unshelve and commit them.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	916 Update the shelve with remaining changes.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	917
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	918 Returns the node of the new commit formed and a bool indicating whether
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	919 the shelve was partially unshelved.Creates a commit ctx to unshelve
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	920 interactively or non-interactively.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	921
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	922 The user might want to unshelve certain changes only from the stored
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	923 shelve in interactive. So, we would create two commits. One with requested
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	924 changes to unshelve at that time and the latter is shelved for future.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	925
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	926 Here, we return both the newnode which is created interactively and a
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	927 bool to know whether the shelve is partly done or completely done.
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	928 """
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	929 opts['message'] = shelvectx.description()
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	930 opts['interactive-unshelve'] = True
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	931 pats = []
42688 c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	932 if not interactive:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	933 newnode = repo.commit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	934 text=shelvectx.description(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	935 extra=shelvectx.extra(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	936 user=shelvectx.user(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	937 date=shelvectx.date(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	938 )
42688 c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	939 return newnode, False
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	940
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	941 commitfunc = getcommitfunc(shelvectx.extra(), interactive=True, editor=True)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	942 newnode = cmdutil.dorecord(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	943 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	944 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	945 commitfunc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	946 None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	947 False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	948 cmdutil.recordfilter,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	949 *pats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	950 **pycompat.strkwargs(opts)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	951 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	952 snode = repo.commit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	953 text=shelvectx.description(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	954 extra=shelvectx.extra(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	955 user=shelvectx.user(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	956 )
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	957 if snode:
42690 d5cdce3d9164 unshelve: create a matcher only if required on creating unshelve ctx Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42689 diff changeset	958 m = scmutil.matchfiles(repo, repo[snode].files())
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	959 _shelvecreatedcommit(repo, snode, basename, m)
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	960
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	961 return newnode, bool(snode)
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	962
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	963
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	964 def _rebaserestoredcommit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	965 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	966 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	967 opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	968 tr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	969 oldtiprev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	970 basename,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	971 pctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	972 tmpwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	973 shelvectx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	974 branchtorestore,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	975 activebookmark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	976 ):
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	977 """Rebase restored commit from its original location to a destination"""
10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	978 # If the shelve is not immediately on top of the commit
10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	979 # we'll be merging with, rebase it to be on top.
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	980 interactive = opts.get('interactive')
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	981 if tmpwctx.node() == shelvectx.p1().node() and not interactive:
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	982 # We won't skip on interactive mode because, the user might want to
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	983 # unshelve certain changes only.
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	984 return shelvectx, False
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	985
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	986 overrides = {
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	987 ('ui', 'forcemerge'): opts.get('tool', ''),
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	988 ('phases', 'new-commit'): phases.secret,
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	989 }
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	990 with repo.ui.configoverride(overrides, 'unshelve'):
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	991 ui.status(_('rebasing shelved changes\n'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	992 stats = merge.graft(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	993 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	994 shelvectx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	995 shelvectx.p1(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	996 labels=['shelve', 'working-copy'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	997 keepconflictparent=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	998 )
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	999 if stats.unresolvedcount:
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1000 tr.close()
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1001
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1002 nodestoremove = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1003 repo.changelog.node(rev)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1004 for rev in pycompat.xrange(oldtiprev, len(repo))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1005 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1006 shelvedstate.save(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1007 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1008 basename,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1009 pctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1010 tmpwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1011 nodestoremove,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1012 branchtorestore,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1013 opts.get('keep'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1014 activebookmark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1015 interactive,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1016 )
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1017 raise error.InterventionRequired(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1018 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1019 "unresolved conflicts (see 'hg resolve', then "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1020 "'hg unshelve --continue')"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1021 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1022 )
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1023
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1024 with repo.dirstate.parentchange():
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1025 repo.setparents(tmpwctx.node(), nodemod.nullid)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1026 newnode, ispartialunshelve = _createunshelvectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1027 ui, repo, shelvectx, basename, interactive, opts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1028 )
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1029
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1030 if newnode is None:
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1031 # If it ended up being a no-op commit, then the normal
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1032 # merge state clean-up path doesn't happen, so do it
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1033 # here. Fix issue5494
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1034 merge.mergestate.clean(repo)
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1035 shelvectx = tmpwctx
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1036 msg = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1037 'note: unshelved changes already existed '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1038 'in the working copy\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1039 )
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1040 ui.status(msg)
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1041 else:
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1042 shelvectx = repo[newnode]
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1043 hg.updaterepo(repo, tmpwctx.node(), False)
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1044
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	1045 return shelvectx, ispartialunshelve
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1046
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1047
30465 b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1048 def _forgetunknownfiles(repo, shelvectx, addedbefore):
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1049 # Forget any files that were unknown before the shelve, unknown before
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1050 # unshelve started, but are now added.
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1051 shelveunknown = shelvectx.extra().get('shelve_unknown')
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1052 if not shelveunknown:
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1053 return
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1054 shelveunknown = frozenset(shelveunknown.split('\0'))
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1055 addedafter = frozenset(repo.status().added)
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1056 toforget = (addedafter & shelveunknown) - addedbefore
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1057 repo[None].forget(toforget)
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1058
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1059
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	1060 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	1061 _restoreactivebookmark(repo, activebookmark)
30466 893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1062 # The transaction aborting will strip all the commits for us,
893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1063 # but it doesn't update the inmemory structures, so addchangegroup
893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1064 # hooks still fire and try to operate on the missing commits.
893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1065 # Clean up manually to prevent this.
893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1066 repo.unfiltered().changelog.strip(oldtiprev, tr)
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	1067 _aborttransaction(repo, tr)
30466 893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1068
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1069
30846 dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1070 def _checkunshelveuntrackedproblems(ui, repo, shelvectx):
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1071 """Check potential problems which may result from working
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1072 copy having untracked changes."""
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1073 wcdeleted = set(repo.status().deleted)
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1074 shelvetouched = set(shelvectx.files())
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1075 intersection = wcdeleted.intersection(shelvetouched)
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1076 if intersection:
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1077 m = _("shelved change touches missing files")
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1078 hint = _("run hg status to see which files are missing")
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1079 raise error.Abort(m, hint=hint)
dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1080
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1081
42563 70f1a84d0794 unshelve: rename _dounshelve() to dounshelve() Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42548 diff changeset	1082 def dounshelve(ui, repo, shelved, *opts):
35046 aad6b9fdfc75 py3: handle keyword arguments in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34496 diff changeset	1083 opts = pycompat.byteskwargs(opts)
28401 2565fe39a76c shelve: changes getting opts values by get method liscju <piotr.listkiewicz@gmail.com> parents: 28378 diff changeset	1084 abortf = opts.get('abort')
2565fe39a76c shelve: changes getting opts values by get method liscju <piotr.listkiewicz@gmail.com> parents: 28378 diff changeset	1085 continuef = opts.get('continue')
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	1086 interactive = opts.get('interactive')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1087 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	1088 cmdutil.checkunfinished(repo)
31041 4189d790e8a4 shelve: add -n/--name option to unshelve (issue5475) liscju <piotr.listkiewicz@gmail.com> parents: 30846 diff changeset	1089 shelved = list(shelved)
4189d790e8a4 shelve: add -n/--name option to unshelve (issue5475) liscju <piotr.listkiewicz@gmail.com> parents: 30846 diff changeset	1090 if opts.get("name"):
4189d790e8a4 shelve: add -n/--name option to unshelve (issue5475) liscju <piotr.listkiewicz@gmail.com> parents: 30846 diff changeset	1091 shelved.append(opts["name"])
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1092
42777 5c285c8e4f98 unshelve: abort on using --keep and --interactive together Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42750 diff changeset	1093 if interactive and opts.get('keep'):
5c285c8e4f98 unshelve: abort on using --keep and --interactive together Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42750 diff changeset	1094 raise error.Abort(_('--keep on --interactive is not yet supported'))
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	1095 if abortf or continuef:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1096 if abortf and continuef:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26577 diff changeset	1097 raise error.Abort(_('cannot use both abort and continue'))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1098 if shelved:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1099 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1100 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1101 'cannot combine abort/continue with '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1102 'naming a shelved change'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1103 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1104 )
27021 f2554154509f unshelve: add support for custom merge tools Siddharth Agarwal <sid0@fb.com> parents: 27020 diff changeset	1105 if abortf and opts.get('tool', False):
f2554154509f unshelve: add support for custom merge tools Siddharth Agarwal <sid0@fb.com> parents: 27020 diff changeset	1106 ui.warn(_('tool option will be ignored\n'))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1107
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	1108 state = _loadshelvedstate(ui, repo, opts)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1109 if abortf:
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	1110 return unshelveabort(ui, repo, state)
42695 52a383451739 unshelve: add abort on using continue and interactive together Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42691 diff changeset	1111 elif continuef and interactive:
52a383451739 unshelve: add abort on using continue and interactive together Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42691 diff changeset	1112 raise error.Abort(_('cannot use both continue and interactive'))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1113 elif continuef:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1114 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	1115 elif len(shelved) > 1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26577 diff changeset	1116 raise error.Abort(_('can only unshelve one change at a time'))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1117 elif not shelved:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1118 shelved = listshelves(repo)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1119 if not shelved:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26577 diff changeset	1120 raise error.Abort(_('no shelved changes to apply!'))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1121 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	1122 ui.status(_("unshelving change '%s'\n") % basename)
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	1123 else:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1124 basename = shelved[0]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1125
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	1126 if not shelvedfile(repo, basename, patchextension).exists():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26577 diff changeset	1127 raise error.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	1128
39400 6a71324cb68b shelve: handle shelved node on unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 39399 diff changeset	1129 repo = repo.unfiltered()
27287 c9ceea3f2d8e shelve: widen wlock scope of unshelve for consistency while processing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27198 diff changeset	1130 lock = tr = None
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1131 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1132 lock = repo.lock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1133 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	1134 oldtiprev = len(repo)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1135
20958 df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	1136 pctx = repo['.']
df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	1137 tmpwctx = pctx
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1138 # 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	1139 # ...-> pctx -> tmpwctx -> shelvectx
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1140 # 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	1141 # 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	1142 # to the original pctx.
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1143
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	1144 activebookmark = _backupactivebookmark(repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1145 tmpwctx, addedbefore = _commitworkingcopychanges(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1146 ui, repo, opts, tmpwctx
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1147 )
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	1148 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
38011 7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1149 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1150 branchtorestore = ''
7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1151 if shelvectx.branch() != shelvectx.p1().branch():
7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1152 branchtorestore = shelvectx.branch()
7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1153
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1154 shelvectx, ispartialunshelve = _rebaserestoredcommit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1155 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1156 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1157 opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1158 tr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1159 oldtiprev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1160 basename,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1161 pctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1162 tmpwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1163 shelvectx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1164 branchtorestore,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1165 activebookmark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1166 )
31471 d1ce2124ec83 shelve: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31344 diff changeset	1167 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
d1ce2124ec83 shelve: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31344 diff changeset	1168 with ui.configoverride(overrides, 'unshelve'):
38011 7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1169 mergefiles(ui, repo, pctx, shelvectx)
7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1170 restorebranch(ui, repo, branchtorestore)
42726 6957f7b93e03 unshelve: clear shelvedstate and _finishunshelve() on partial unshelve Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42725 diff changeset	1171 shelvedstate.clear(repo)
6957f7b93e03 unshelve: clear shelvedstate and _finishunshelve() on partial unshelve Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42725 diff changeset	1172 _finishunshelve(repo, oldtiprev, tr, activebookmark)
42750 d684449eef67 unshelve: forget unknown files after a partial unshelve Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42726 diff changeset	1173 _forgetunknownfiles(repo, shelvectx, addedbefore)
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	1174 if not ispartialunshelve:
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	1175 unshelvecleanup(ui, repo, basename, opts)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1176 finally:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1177 if tr:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1178 tr.release()
27287 c9ceea3f2d8e shelve: widen wlock scope of unshelve for consistency while processing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27198 diff changeset	1179 lockmod.release(lock)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/shelve.py @ 43076:2372284d9457