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

annotate mercurial/shelve.py @ 46286:3b08f56c8a11

shelve: teach new shelf class to check if .shelve file exists This removes the only remaining use for `shelvedfile`, so the class now goes away. Differential Revision: https://phab.mercurial-scm.org/D9713

author	Martin von Zweigbergk <martinvonz@google.com>
date	Thu, 07 Jan 2021 23:18:24 -0800
parents	e79f8ae0901b
children	ae7a77a7ebc0

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 _
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	31 from .node import (
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	32 bin,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	33 hex,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	34 nullid,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	35 nullrev,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	36 )
42548 3de4f17f4824 shelve: move shelve extension to core Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42547 diff changeset	37 from . import (
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	38 bookmarks,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	39 bundle2,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	40 changegroup,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	41 cmdutil,
34112 f7d41b85bbf6 changegroup: replace changegroupsubset with makechangegroup Durham Goode <durham@fb.com> parents: 33440 diff changeset	42 discovery,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	43 error,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	44 exchange,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	45 hg,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	46 lock as lockmod,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	47 mdiff,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	48 merge,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44602 diff changeset	49 mergestate as mergestatemod,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	50 patch,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	51 phases,
35046 aad6b9fdfc75 py3: handle keyword arguments in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34496 diff changeset	52 pycompat,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	53 repair,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	54 scmutil,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	55 templatefilters,
96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	56 util,
31254 636f55b9ba23 vfs: use 'vfs' module directly in 'hgext.shelve' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31113 diff changeset	57 vfs as vfsmod,
28378 96a7368a79b6 shelve: use absolute_import timeless <timeless@mozdev.org> parents: 28124 diff changeset	58 )
42548 3de4f17f4824 shelve: move shelve extension to core Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42547 diff changeset	59 from .utils import (
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	60 dateutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	61 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	62 )
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	63
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	64 backupdir = b'shelve-backup'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	65 shelvedir = b'shelved'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	66 shelvefileextensions = [b'hg', b'patch', b'shelve']
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	67 # universal extension is present in all types of shelves
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	68 patchextension = b'patch'
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	69
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	70 # 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	71 # generic user for all shelve operations
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	72 shelveuser = b'shelve@localhost'
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	73
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	74
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	75 class Shelf(object):
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	76 """Represents a shelf, including possibly multiple files storing it.
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	77
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	78 Old shelves will have a .patch and a .hg file. Newer shelves will
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	79 also have a .shelve file. This class abstracts away some of the
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	80 differences and lets you work with the shelf as a whole.
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	81 """
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	82
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	83 def __init__(self, repo, name):
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	84 self.repo = repo
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	85 self.name = name
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	86 self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir))
46285 e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	87 self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir))
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	88
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	89 def exists(self):
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	90 return self.vfs.exists(self.name + b'.' + patchextension)
efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	91
46280 7e300d297547 shelve: move method for getting stat (mtime) to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46279 diff changeset	92 def mtime(self):
7e300d297547 shelve: move method for getting stat (mtime) to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46279 diff changeset	93 return self.vfs.stat(self.name + b'.' + patchextension)[stat.ST_MTIME]
7e300d297547 shelve: move method for getting stat (mtime) to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46279 diff changeset	94
46274 a344ec05b99c shelve: move method for writing .shelve to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46273 diff changeset	95 def writeinfo(self, info):
a344ec05b99c shelve: move method for writing .shelve to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46273 diff changeset	96 scmutil.simplekeyvaluefile(self.vfs, self.name + b'.shelve').write(info)
a344ec05b99c shelve: move method for writing .shelve to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46273 diff changeset	97
46286 3b08f56c8a11 shelve: teach new shelf class to check if .shelve file exists Martin von Zweigbergk <martinvonz@google.com> parents: 46285 diff changeset	98 def hasinfo(self):
3b08f56c8a11 shelve: teach new shelf class to check if .shelve file exists Martin von Zweigbergk <martinvonz@google.com> parents: 46285 diff changeset	99 return self.vfs.exists(self.name + b'.shelve')
3b08f56c8a11 shelve: teach new shelf class to check if .shelve file exists Martin von Zweigbergk <martinvonz@google.com> parents: 46285 diff changeset	100
46275 157305bf859f shelve: move method for reading .shelve file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46274 diff changeset	101 def readinfo(self):
157305bf859f shelve: move method for reading .shelve file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46274 diff changeset	102 return scmutil.simplekeyvaluefile(
157305bf859f shelve: move method for reading .shelve file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46274 diff changeset	103 self.vfs, self.name + b'.shelve'
157305bf859f shelve: move method for reading .shelve file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46274 diff changeset	104 ).read()
157305bf859f shelve: move method for reading .shelve file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46274 diff changeset	105
46276 eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	106 def writebundle(self, bases, node):
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	107 cgversion = changegroup.safeversion(self.repo)
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	108 if cgversion == b'01':
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	109 btype = b'HG10BZ'
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	110 compression = None
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	111 else:
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	112 btype = b'HG20'
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	113 compression = b'BZ'
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	114
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	115 repo = self.repo.unfiltered()
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	116
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	117 outgoing = discovery.outgoing(
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	118 repo, missingroots=bases, ancestorsof=[node]
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	119 )
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	120 cg = changegroup.makechangegroup(repo, outgoing, cgversion, b'shelve')
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	121
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	122 bundle_filename = self.vfs.join(self.name + b'.hg')
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	123 bundle2.writebundle(
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	124 self.repo.ui,
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	125 cg,
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	126 bundle_filename,
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	127 btype,
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	128 self.vfs,
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	129 compression=compression,
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	130 )
eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	131
46277 ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	132 def applybundle(self, tr):
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	133 filename = self.name + b'.hg'
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	134 fp = self.vfs(filename)
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	135 try:
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	136 targetphase = phases.internal
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	137 if not phases.supportinternal(self.repo):
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	138 targetphase = phases.secret
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	139 gen = exchange.readbundle(self.repo.ui, fp, filename, self.vfs)
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	140 pretip = self.repo[b'tip']
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	141 bundle2.applybundle(
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	142 self.repo,
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	143 gen,
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	144 tr,
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	145 source=b'unshelve',
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	146 url=b'bundle:' + self.vfs.join(filename),
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	147 targetphase=targetphase,
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	148 )
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	149 shelvectx = self.repo[b'tip']
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	150 if pretip == shelvectx:
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	151 shelverev = tr.changes[b'revduplicates'][-1]
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	152 shelvectx = self.repo[shelverev]
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	153 return shelvectx
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	154 finally:
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	155 fp.close()
ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	156
46278 58ca94869287 shelve: move function for opening .patch file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46277 diff changeset	157 def open_patch(self, mode=b'rb'):
58ca94869287 shelve: move function for opening .patch file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46277 diff changeset	158 return self.vfs(self.name + b'.patch', mode)
58ca94869287 shelve: move function for opening .patch file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46277 diff changeset	159
46285 e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	160 def _backupfilename(self, filename):
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	161 def gennames(base):
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	162 yield base
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	163 base, ext = base.rsplit(b'.', 1)
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	164 for i in itertools.count(1):
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	165 yield b'%s-%d.%s' % (base, i, ext)
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	166
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	167 for n in gennames(filename):
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	168 if not self.backupvfs.exists(n):
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	169 return self.backupvfs.join(n)
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	170
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	171 def movetobackup(self):
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	172 if not self.backupvfs.isdir():
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	173 self.backupvfs.makedir()
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	174 for suffix in shelvefileextensions:
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	175 filename = self.name + b'.' + suffix
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	176 if self.vfs.exists(filename):
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	177 util.rename(
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	178 self.vfs.join(filename), self._backupfilename(filename)
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	179 )
e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	180
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	181
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	182 class shelvedstate(object):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	183 """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	184
df54786a3203 shelve: add minimal documentation to all functions Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19908 diff changeset	185 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	186 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	187 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	188
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	189 _version = 2
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	190 _filename = b'shelvedstate'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	191 _keep = b'keep'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	192 _nokeep = b'nokeep'
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	193 # colon is essential to differentiate from a real bookmark name
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	194 _noactivebook = b':no-active-bookmark'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	195 _interactive = b'interactive'
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	196
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	197 @classmethod
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	198 def _verifyandtransform(cls, d):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	199 """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	200 try:
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	201 d[b'originalwctx'] = bin(d[b'originalwctx'])
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	202 d[b'pendingctx'] = bin(d[b'pendingctx'])
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	203 d[b'parents'] = [bin(h) for h in d[b'parents'].split(b' ')]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	204 d[b'nodestoremove'] = [
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	205 bin(h) for h in d[b'nodestoremove'].split(b' ')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	206 ]
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	207 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	208 raise error.CorruptedState(pycompat.bytestr(err))
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	209
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	210 @classmethod
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	211 def _getversion(cls, repo):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	212 """Read version information from shelvestate file"""
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	213 fp = repo.vfs(cls._filename)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	214 try:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	215 version = int(fp.readline().strip())
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	216 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	217 raise error.CorruptedState(pycompat.bytestr(err))
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	218 finally:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	219 fp.close()
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	220 return version
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	221
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	222 @classmethod
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	223 def _readold(cls, repo):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	224 """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	225 # Order is important, because old shelvestate file uses it
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	226 # 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	227 # 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	228 keys = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	229 b'version',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	230 b'name',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	231 b'originalwctx',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	232 b'pendingctx',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	233 b'parents',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	234 b'nodestoremove',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	235 b'branchtorestore',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	236 b'keep',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	237 b'activebook',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	238 ]
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	239 # 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	240 # that we open this file twice
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	241 fp = repo.vfs(cls._filename)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	242 d = {}
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	243 try:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	244 for key in keys:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	245 d[key] = fp.readline().strip()
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	246 finally:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	247 fp.close()
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	248 return d
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	249
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	250 @classmethod
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	251 def load(cls, repo):
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	252 version = cls._getversion(repo)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	253 if version < cls._version:
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	254 d = cls._readold(repo)
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	255 elif version == cls._version:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	256 d = scmutil.simplekeyvaluefile(repo.vfs, cls._filename).read(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	257 firstlinenonkeyval=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	258 )
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	259 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	260 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	261 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	262 b'this version of shelve is incompatible '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	263 b'with the version used in this repo'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	264 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	265 )
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	266
fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	267 cls._verifyandtransform(d)
29536 b17a6e3cd2ac shelve: make unshelve be able to abort in any case Kostia Balytskyi <ikostia@fb.com> parents: 29270 diff changeset	268 try:
b17a6e3cd2ac shelve: make unshelve be able to abort in any case Kostia Balytskyi <ikostia@fb.com> parents: 29270 diff changeset	269 obj = cls()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	270 obj.name = d[b'name']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	271 obj.wctx = repo[d[b'originalwctx']]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	272 obj.pendingctx = repo[d[b'pendingctx']]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	273 obj.parents = d[b'parents']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	274 obj.nodestoremove = d[b'nodestoremove']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	275 obj.branchtorestore = d.get(b'branchtorestore', b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	276 obj.keep = d.get(b'keep') == cls._keep
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	277 obj.activebookmark = b''
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	278 if d.get(b'activebook', b'') != cls._noactivebook:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	279 obj.activebookmark = d.get(b'activebook', b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	280 obj.interactive = d.get(b'interactive') == cls._interactive
32324 16d424b97125 shelve: refactor shelvestate loading Kostia Balytskyi <ikostia@fb.com> parents: 31888 diff changeset	281 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	282 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	283
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	284 return obj
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	285
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	286 @classmethod
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	287 def save(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	288 cls,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	289 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	290 name,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	291 originalwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	292 pendingctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	293 nodestoremove,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	294 branchtorestore,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	295 keep=False,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	296 activebook=b'',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	297 interactive=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	298 ):
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	299 info = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	300 b"name": name,
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	301 b"originalwctx": hex(originalwctx.node()),
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	302 b"pendingctx": hex(pendingctx.node()),
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	303 b"parents": b' '.join([hex(p) for p in repo.dirstate.parents()]),
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	304 b"nodestoremove": b' '.join([hex(n) for n in nodestoremove]),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	305 b"branchtorestore": branchtorestore,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	306 b"keep": cls._keep if keep else cls._nokeep,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	307 b"activebook": activebook or cls._noactivebook,
32325 fe3105e6e051 shelve: make shelvestate use simplekeyvaluefile Kostia Balytskyi <ikostia@fb.com> parents: 32324 diff changeset	308 }
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	309 if interactive:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	310 info[b'interactive'] = cls._interactive
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	311 scmutil.simplekeyvaluefile(repo.vfs, cls._filename).write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	312 info, firstline=(b"%d" % cls._version)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	313 )
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	314
19908 07ee5c8867ca shelve: use the class constant in the clear method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19904 diff changeset	315 @classmethod
07ee5c8867ca shelve: use the class constant in the clear method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19904 diff changeset	316 def clear(cls, repo):
31320 f59b6cf663a9 vfs: use repo.vfs.unlinkpath Mads Kiilerich <mads@kiilerich.com> parents: 31254 diff changeset	317 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	318
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	319
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	320 def cleanupoldbackups(repo):
31344 3acc7af5859c shelve: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31321 diff changeset	321 vfs = vfsmod.vfs(repo.vfs.join(backupdir))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	322 maxbackups = repo.ui.configint(b'shelve', b'maxbackups')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	323 hgfiles = [f for f in vfs.listdir() if f.endswith(b'.' + 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	324 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	325 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	326 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	327 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	328 bordermtime = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	329 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	330 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	331 # 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	332 continue
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	333 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	334 for ext in shelvefileextensions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	335 vfs.tryunlink(base + b'.' + ext)
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	336
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	337
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	338 def _backupactivebookmark(repo):
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	339 activebookmark = repo._activebookmark
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	340 if activebookmark:
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	341 bookmarks.deactivate(repo)
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	342 return activebookmark
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	343
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	344
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	345 def _restoreactivebookmark(repo, mark):
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	346 if mark:
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	347 bookmarks.activate(repo, mark)
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	348
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	349
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	350 def _aborttransaction(repo, tr):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45875 diff changeset	351 """Abort current transaction for shelve/unshelve, but keep dirstate"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	352 dirstatebackupname = b'dirstate.shelve'
38908 ad24b581e4d9 narrow: call narrowspec.{save,restore,clear}backup directly Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	353 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	354 tr.abort()
38908 ad24b581e4d9 narrow: call narrowspec.{save,restore,clear}backup directly Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	355 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	356
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	357
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	358 def getshelvename(repo, parent, opts):
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	359 """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	360
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	361 def gennames():
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	362 yield label
32986 4107eb8a5648 shelve: allow unlimited shelved changes per name Jun Wu <quark@fb.com> parents: 32948 diff changeset	363 for i in itertools.count(1):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	364 yield b'%s-%02d' % (label, i)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	365
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	366 name = opts.get(b'name')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	367 label = repo._activebookmark or parent.branch() or b'default'
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	368 # slashes aren't allowed in filenames, therefore we rename it
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	369 label = label.replace(b'/', b'_')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	370 label = label.replace(b'\\', b'_')
30674 64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	371 # filenames must not start with '.' as it should not be hidden
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	372 if label.startswith(b'.'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	373 label = label.replace(b'.', b'_', 1)
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	374
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	375 if name:
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	376 if Shelf(repo, name).exists():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	377 e = _(b"a shelved change named '%s' already exists") % name
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	378 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	379
64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	380 # ensure we are not creating a subdirectory or a hidden file
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	381 if b'/' in name or b'\\' in name:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	382 raise error.Abort(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	383 _(b'shelved change names can not contain slashes')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	384 )
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	385 if name.startswith(b'.'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	386 raise error.Abort(_(b"shelved change names can not start with '.'"))
30674 64a75655b988 shelve: choose a legal shelve name when no name is passed (issue5112) Pulkit Goyal <7895pulkit@gmail.com> parents: 30560 diff changeset	387
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	388 else:
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	389 for n in gennames():
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	390 if not Shelf(repo, n).exists():
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	391 name = n
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	392 break
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	393
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	394 return name
684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	395
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	396
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	397 def mutableancestors(ctx):
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	398 """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	399
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	400 Much faster than the revset ancestors(ctx) & draft()"""
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	401 seen = {nullrev}
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	402 visit = collections.deque()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	403 visit.append(ctx)
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	404 while visit:
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	405 ctx = visit.popleft()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	406 yield ctx.node()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	407 for parent in ctx.parents():
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	408 rev = parent.rev()
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	409 if rev not in seen:
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	410 seen.add(rev)
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	411 if parent.mutable():
84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	412 visit.append(parent)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	413
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	414
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	415 def getcommitfunc(extra, interactive, editor=False):
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	416 def commitfunc(ui, repo, message, match, opts):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	417 hasmq = util.safehasattr(repo, b'mq')
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	418 if hasmq:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	419 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	420
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	421 targetphase = phases.internal
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	422 if not phases.supportinternal(repo):
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	423 targetphase = phases.secret
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	424 overrides = {(b'phases', b'new-commit'): targetphase}
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	425 try:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	426 editor_ = False
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	427 if editor:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	428 editor_ = cmdutil.getcommiteditor(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	429 editform=b'shelve.shelve', **pycompat.strkwargs(opts)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	430 )
31471 d1ce2124ec83 shelve: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31344 diff changeset	431 with repo.ui.configoverride(overrides):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	432 return repo.commit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	433 message,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	434 shelveuser,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	435 opts.get(b'date'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	436 match,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	437 editor=editor_,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	438 extra=extra,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	439 )
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	440 finally:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	441 if hasmq:
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	442 repo.mq.checkapplied = saved
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	443
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	444 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	445 opts = pycompat.byteskwargs(opts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	446 match = scmutil.match(repo[b'.'], pats, {})
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	447 message = opts[b'message']
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	448 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	449
caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	450 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	451
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	452
30392 dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	453 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	454 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	455 if stat.deleted:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	456 ui.status(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43085 diff changeset	457 _(b"nothing changed (%d missing files, see 'hg status')\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	458 % len(stat.deleted)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	459 )
30392 dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	460 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	461 ui.status(_(b"nothing changed\n"))
30392 dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	462
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	463
42012 9b78bbb76111 shelve: refactor _shelvecreatedcommit's match object into calling site Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42011 diff changeset	464 def _shelvecreatedcommit(repo, node, name, match):
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	465 info = {b'node': hex(node)}
46274 a344ec05b99c shelve: move method for writing .shelve to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46273 diff changeset	466 Shelf(repo, name).writeinfo(info)
30393 455f7856db20 shelve: move actual created commit shelving to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30392 diff changeset	467 bases = list(mutableancestors(repo[node]))
46276 eb7b2929ae49 shelve: move method for writing bundle to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46275 diff changeset	468 Shelf(repo, name).writebundle(bases, node)
46278 58ca94869287 shelve: move function for opening .patch file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46277 diff changeset	469 with Shelf(repo, name).open_patch(b'wb') as fp:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	470 cmdutil.exportfile(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	471 repo, [node], fp, opts=mdiff.diffopts(git=True), match=match
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	472 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	473
30393 455f7856db20 shelve: move actual created commit shelving to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30392 diff changeset	474
30394 21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	475 def _includeunknownfiles(repo, pats, opts, extra):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	476 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	477 if s.unknown:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	478 extra[b'shelve_unknown'] = b'\0'.join(s.unknown)
30394 21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	479 repo[None].add(s.unknown)
21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	480
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	481
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	482 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	483 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	484 tr.close()
52dfa1eb0ad4 shelve: no longer strip internal commit when using internal phase Boris Feld <boris.feld@octobus.net> parents: 39617 diff changeset	485 else:
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	486 _aborttransaction(repo, tr)
30395 b573d7ca31c4 shelve: move shelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30394 diff changeset	487
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	488
39369 d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	489 def createcmd(ui, repo, pats, opts):
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	490 """subcommand that creates a new shelve"""
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	491 with repo.wlock():
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	492 cmdutil.checkunfinished(repo)
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	493 return _docreatecmd(ui, repo, pats, opts)
d52fa7ddd1ac shelve: move createcmd next to _docreatecmd Boris Feld <boris.feld@octobus.net> parents: 38908 diff changeset	494
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	495
30390 84e8cbdbdee4 shelve: move mutableancestors to not be a closure Kostia Balytskyi <ikostia@fb.com> parents: 30389 diff changeset	496 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	497 wctx = repo[None]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	498 parents = wctx.parents()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	499 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	500 origbranch = wctx.branch()
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	501
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	502 if parent.node() != nullid:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	503 desc = b"changes to: %s" % parent.description().split(b'\n', 1)[0]
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	504 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	505 desc = b'(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	506
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	507 if not opts.get(b'message'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	508 opts[b'message'] = desc
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	509
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	510 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	511 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	512 lock = repo.lock()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	513
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19943 diff changeset	514 # 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	515 # pull races. ensure we don't print the abort message to stderr.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	516 tr = repo.transaction(b'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	517
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	518 interactive = opts.get(b'interactive', False)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	519 includeunknown = opts.get(b'unknown', False) and not opts.get(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	520 b'addremove', False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	521 )
27908 d73a5ab18015 shelve: permit shelves to contain unknown files Simon Farnsworth <simonfar@fb.com> parents: 27888 diff changeset	522
30389 684068d24658 shelve: move shelve name generation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30388 diff changeset	523 name = getshelvename(repo, parent, opts)
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	524 activebookmark = _backupactivebookmark(repo)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	525 extra = {b'internal': b'shelve'}
27908 d73a5ab18015 shelve: permit shelves to contain unknown files Simon Farnsworth <simonfar@fb.com> parents: 27888 diff changeset	526 if includeunknown:
30394 21a75b63c10e shelve: move unknown files handling to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30393 diff changeset	527 _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	528
28572 43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	529 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	530 # 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	531 # at bundled commit
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	532 repo.dirstate.setbranch(repo[b'.'].branch())
28572 43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	533
30391 caba61934721 shelve: move commitfunc creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30390 diff changeset	534 commitfunc = getcommitfunc(extra, interactive, editor=True)
24478 95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	535 if not interactive:
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	536 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
95cbc77c0cad shelve: add interactive mode Laurent Charignon <lcharignon@fb.com> parents: 24477 diff changeset	537 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	538 node = cmdutil.dorecord(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	539 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	540 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	541 commitfunc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	542 None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	543 False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	544 cmdutil.recordfilter,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	545 *pats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	546 **pycompat.strkwargs(opts)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	547 )
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	548 if not node:
30392 dedf0915ca5b shelve: move 'nothing changed' messaging to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30391 diff changeset	549 _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	550 return 1
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	551
42012 9b78bbb76111 shelve: refactor _shelvecreatedcommit's match object into calling site Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42011 diff changeset	552 # 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	553 # 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	554 # 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	555 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	556 _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	557
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	558 ui.status(_(b'shelved as %s\n') % name)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	559 if opts[b'keep']:
42013 50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	560 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	561 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	562 else:
50d5e64ec561 shelve: do not update when keeping changes, just move the dirstate Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42012 diff changeset	563 hg.update(repo, parent.node())
45875 073bb7563931 shelve: clear merge state after partial shelve Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	564 ms = mergestatemod.mergestate.read(repo)
073bb7563931 shelve: clear merge state after partial shelve Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	565 if not ms.unresolvedcount():
073bb7563931 shelve: clear merge state after partial shelve Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	566 ms.reset()
073bb7563931 shelve: clear merge state after partial shelve Martin von Zweigbergk <martinvonz@google.com> parents: 45580 diff changeset	567
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	568 if origbranch != repo[b'.'].branch() and not _isbareshelve(pats, opts):
28571 3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	569 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	570
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	571 _finishshelve(repo, tr)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	572 finally:
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	573 _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	574 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	575
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	576
28571 3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	577 def _isbareshelve(pats, opts):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	578 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	579 not pats
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	580 and not opts.get(b'interactive', False)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	581 and not opts.get(b'include', False)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	582 and not opts.get(b'exclude', False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	583 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	584
28571 3f0e25e89e28 shelve: preserve newly created branch on non-bare shelve in wctx (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28401 diff changeset	585
28572 43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	586 def _iswctxonnewbranch(repo):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	587 return repo[None].branch() != repo[b'.'].branch()
28572 43c204ddf333 shelve: make non bare shelve not saving branch information in bundle liscju <piotr.listkiewicz@gmail.com> parents: 28571 diff changeset	588
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	589
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	590 def cleanupcmd(ui, repo):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	591 """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	592
27835 c448d7e00bf9 with: use context manager for wlock in shelve cleanupcmd Bryan O'Sullivan <bryano@fb.com> parents: 27834 diff changeset	593 with repo.wlock():
46283 8db5fa212ab0 shelve: use listshelves() in cleanup function Martin von Zweigbergk <martinvonz@google.com> parents: 46282 diff changeset	594 for _mtime, name in listshelves(repo):
46285 e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	595 Shelf(repo, name).movetobackup()
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	596 cleanupoldbackups(repo)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	597
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	598
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	599 def deletecmd(ui, repo, pats):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	600 """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	601 if not pats:
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	602 raise error.InputError(_(b'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	603 with repo.wlock():
43435 cb23d9e3e21f shelve: fix a missing variable in the exception handler for delete Matt Harbison <matt_harbison@yahoo.com> parents: 43117 diff changeset	604 for name in pats:
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	605 if not Shelf(repo, name).exists():
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	606 raise error.InputError(
a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	607 _(b"shelved change '%s' not found") % name
a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	608 )
46285 e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	609 Shelf(repo, name).movetobackup()
27836 1c2408c28aff with: use context manager for wlock in shelve deletecmd Bryan O'Sullivan <bryano@fb.com> parents: 27835 diff changeset	610 cleanupoldbackups(repo)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	611
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	612
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	613 def listshelves(repo):
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	614 """return all shelves in repo as list of (time, name)"""
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	615 try:
28862 39130afcce60 shelve: refactor directory name into constant Oleg Afanasyev <olegaf@fb.com> parents: 28666 diff changeset	616 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	617 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	618 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	619 raise
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	620 return []
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	621 info = []
22199 b3e51675f98e cleanup: avoid _ for local unused tmp variables - that is reserved for i18n Mads Kiilerich <madski@unity3d.com> parents: 22184 diff changeset	622 for (name, _type) in names:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	623 pfx, sfx = name.rsplit(b'.', 1)
30560 1775975dd439 shelve: move patch extension to a string constant Kostia Balytskyi <ikostia@fb.com> parents: 30551 diff changeset	624 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	625 continue
46280 7e300d297547 shelve: move method for getting stat (mtime) to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46279 diff changeset	626 mtime = Shelf(repo, pfx).mtime()
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	627 info.append((mtime, pfx))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	628 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	629
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	630
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	631 def listcmd(ui, repo, pats, opts):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	632 """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	633 pats = set(pats)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	634 width = 80
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	635 if not ui.plain():
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	636 width = ui.termwidth()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	637 namelabel = b'shelve.newest'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	638 ui.pager(b'shelve')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	639 for mtime, name in listshelves(repo):
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	640 if pats and name not in pats:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	641 continue
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	642 ui.write(name, label=namelabel)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	643 namelabel = b'shelve.name'
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	644 if ui.quiet:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	645 ui.write(b'\n')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	646 continue
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	647 ui.write(b' ' * (16 - len(name)))
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	648 used = 16
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36526 diff changeset	649 date = dateutil.makedate(mtime)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	650 age = b'(%s)' % templatefilters.age(date, abbrev=True)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	651 ui.write(age, label=b'shelve.age')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	652 ui.write(b' ' * (12 - len(age)))
19855 a3b285882724 shelve: new output format for shelve listings David Soria Parra <dsp@experimentalworks.net> parents: 19854 diff changeset	653 used += 12
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	654 with Shelf(repo, name).open_patch() as fp:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	655 while True:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	656 line = fp.readline()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	657 if not line:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	658 break
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	659 if not line.startswith(b'#'):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	660 desc = line.rstrip()
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	661 if ui.formatted():
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	662 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	663 ui.write(desc)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	664 break
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	665 ui.write(b'\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	666 if not (opts[b'patch'] or opts[b'stat']):
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	667 continue
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	668 difflines = fp.readlines()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	669 if opts[b'patch']:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	670 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	671 ui.write(chunk, label=label)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	672 if opts[b'stat']:
30417 e1677cc29da6 patch: remove unused git parameter from patch.diffstat() Henning Schild <henning@hennsch.de> parents: 30395 diff changeset	673 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	674 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	675
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	676
38715 905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	677 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	678 """subcommand that displays shelves"""
806a830e6612 shelve: allow multiple shelves with --patch and --stat Pulkit Goyal <7895pulkit@gmail.com> parents: 30674 diff changeset	679 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	680 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	681 if not shelves:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	682 raise error.Abort(_(b"there are no shelves to show"))
38715 905b66681004 shelve: pick the most recent shelve if none specified for --patch/--stat Danny Hooper <hooper@google.com> parents: 38714 diff changeset	683 mtime, name = shelves[0]
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	684 pats = [name]
25104 d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	685
30823 806a830e6612 shelve: allow multiple shelves with --patch and --stat Pulkit Goyal <7895pulkit@gmail.com> parents: 30674 diff changeset	686 for shelfname in pats:
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	687 if not Shelf(repo, shelfname).exists():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	688 raise error.Abort(_(b"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	689
d6453f6fbdba shelve: allow --patch and --stat without --list for a single shelf Tony Tung <tonytung@fb.com> parents: 25103 diff changeset	690 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	691
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	692
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	693 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	694 """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	695 if state.parents != repo.dirstate.parents():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	696 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43085 diff changeset	697 _(b'working directory parents do not match unshelve state')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	698 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	699
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	700
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	701 def _loadshelvedstate(ui, repo, opts):
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	702 try:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	703 state = shelvedstate.load(repo)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	704 if opts.get(b'keep') is None:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	705 opts[b'keep'] = state.keep
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	706 except IOError as err:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	707 if err.errno != errno.ENOENT:
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	708 raise
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	709 cmdutil.wrongtooltocontinue(repo, _(b'unshelve'))
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	710 except error.CorruptedState as err:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	711 ui.debug(pycompat.bytestr(err) + b'\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	712 if opts.get(b'continue'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	713 msg = _(b'corrupted shelved state file')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	714 hint = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	715 b'please run hg unshelve --abort to abort unshelve '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	716 b'operation'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	717 )
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	718 raise error.Abort(msg, hint=hint)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	719 elif opts.get(b'abort'):
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	720 shelvedstate.clear(repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	721 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	722 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	723 b'could not read shelved state file, your '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	724 b'working copy may be in an unexpected state\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	725 b'please update to some commit\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	726 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	727 )
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	728 return state
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	729
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	730
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	731 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	732 """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	733 with repo.lock():
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	734 try:
27841 83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	735 checkparents(repo, state)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	736
44317 f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	737 merge.clean_update(state.pendingctx)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	738 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	739 bookmarks.activate(repo, state.activebookmark)
27841 83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	740 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	741 if not phases.supportinternal(repo):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	742 repair.strip(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	743 ui, repo, state.nodestoremove, backup=False, topic=b'shelve'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	744 )
27841 83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	745 finally:
83995fdde225 with: use context manager in unshelveabort Bryan O'Sullivan <bryano@fb.com> parents: 27838 diff changeset	746 shelvedstate.clear(repo)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	747 ui.warn(_(b"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	748
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	749
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	750 def hgabortunshelve(ui, repo):
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	751 """logic to abort unshelve using 'hg abort"""
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	752 with repo.wlock():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	753 state = _loadshelvedstate(ui, repo, {b'abort': True})
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	754 return unshelveabort(ui, repo, state)
3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	755
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	756
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	757 def mergefiles(ui, repo, wctx, shelvectx):
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	758 """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	759 dirstate."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	760 with ui.configoverride({(b'ui', b'quiet'): True}):
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	761 hg.update(repo, wctx.node())
22184 fb8065de47b0 unshelve: silence internal revert Matt Mackall <mpm@selenic.com> parents: 22057 diff changeset	762 ui.pushbuffer(True)
45395 8c466bcb0879 revert: remove dangerous `parents` argument from `cmdutil.revert()` Martin von Zweigbergk <martinvonz@google.com> parents: 45151 diff changeset	763 cmdutil.revert(ui, repo, shelvectx)
22184 fb8065de47b0 unshelve: silence internal revert Matt Mackall <mpm@selenic.com> parents: 22057 diff changeset	764 ui.popbuffer()
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	765
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	766
28573 6a42564081cb shelve: adds restoring newly created branch (issue5048) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28572 diff changeset	767 def restorebranch(ui, repo, branchtorestore):
6a42564081cb shelve: adds restoring newly created branch (issue5048) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 28572 diff changeset	768 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	769 repo.dirstate.setbranch(branchtorestore)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	770 ui.status(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	771 _(b'marked working directory as branch %s\n') % branchtorestore
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	772 )
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
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	775 def unshelvecleanup(ui, repo, name, opts):
19911 1c58e368fbfd shelve: some docstring cleanups Augie Fackler <raf@durin42.com> parents: 19909 diff changeset	776 """remove related files after an unshelve"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	777 if not opts.get(b'keep'):
46285 e79f8ae0901b shelve: move method for creating backup to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46284 diff changeset	778 Shelf(repo, name).movetobackup()
25713 2ca116614cfc shelve: only keep the latest N shelve backups Colin Chan <colinchan@fb.com> parents: 25712 diff changeset	779 cleanupoldbackups(repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	780
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	781
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	782 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	783 """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	784 # 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	785 # 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	786 interactive = state.interactive
ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	787 basename = state.name
27838 60b850b7e4ef with: use context manager for lock in continue Bryan O'Sullivan <bryano@fb.com> parents: 27837 diff changeset	788 with repo.lock():
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	789 checkparents(repo, state)
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44602 diff changeset	790 ms = mergestatemod.mergestate.read(repo)
33313 ea03b3223611 shelve: don't reimplement mergestate.unresolved() Martin von Zweigbergk <martinvonz@google.com> parents: 33055 diff changeset	791 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	792 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	793 _(b"unresolved conflicts, can't continue"),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	794 hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	795 )
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	796
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	797 shelvectx = repo[state.parents[1]]
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	798 pendingctx = state.pendingctx
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	799
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	800 with repo.dirstate.parentchange():
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	801 repo.setparents(state.pendingctx.node(), nullid)
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	802 repo.dirstate.write(repo.currenttransaction())
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	803
39536 5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	804 targetphase = phases.internal
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	805 if not phases.supportinternal(repo):
5d69e2412ec8 shelve: use the internal phase when possible Boris Feld <boris.feld@octobus.net> parents: 39414 diff changeset	806 targetphase = phases.secret
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	807 overrides = {(b'phases', b'new-commit'): targetphase}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	808 with repo.ui.configoverride(overrides, b'unshelve'):
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	809 with repo.dirstate.parentchange():
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	810 repo.setparents(state.parents[0], nullid)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	811 newnode, ispartialunshelve = _createunshelvectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	812 ui, repo, shelvectx, basename, interactive, opts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	813 )
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	814
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	815 if newnode is None:
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	816 shelvectx = state.pendingctx
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	817 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	818 b'note: unshelved changes already existed '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	819 b'in the working copy\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	820 )
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	821 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	822 else:
38467 f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	823 # only strip the shelvectx if we produced one
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	824 state.nodestoremove.append(newnode)
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	825 shelvectx = repo[newnode]
f4776f8b98e0 shelve: directly handle `--continue` Boris Feld <boris.feld@octobus.net> parents: 38466 diff changeset	826
45580 5c8230ca37f2 merge: replace calls to hg.updaterepo() by merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 45395 diff changeset	827 merge.update(pendingctx)
20149 578b888c820e unshelve: don't commit unknown files during unshelve (issue4113) Durham Goode <durham@fb.com> parents: 20103 diff changeset	828 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	829 restorebranch(ui, repo, state.branchtorestore)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	830
42724 4814d993fe21 unshelve: handle stripping changesets on interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42695 diff changeset	831 if not phases.supportinternal(repo):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	832 repair.strip(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	833 ui, repo, state.nodestoremove, backup=False, topic=b'shelve'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	834 )
42725 073cfff9aaef unshelve: delete shelvedstate after a successful unshelve --continue Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42724 diff changeset	835 shelvedstate.clear(repo)
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	836 if not ispartialunshelve:
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	837 unshelvecleanup(ui, repo, state.name, opts)
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	838 _restoreactivebookmark(repo, state.activebookmark)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	839 ui.status(_(b"unshelve of '%s' complete\n") % state.name)
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	840
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	841
42614 117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	842 def hgcontinueunshelve(ui, repo):
117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	843 """logic to resume unshelve using 'hg continue'"""
117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	844 with repo.wlock():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	845 state = _loadshelvedstate(ui, repo, {b'continue': True})
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	846 return unshelvecontinue(ui, repo, state, {b'keep': state.keep})
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	847
42614 117437f3f541 continue: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42599 diff changeset	848
30462 2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	849 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	850 """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	851 # 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	852 # 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	853 s = repo.status()
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	854 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	855 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	856 return tmpwctx, addedbefore
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	857 ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	858 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	859 b"temporarily committing pending changes "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	860 b"(restore with 'hg unshelve --abort')\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	861 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	862 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	863 extra = {b'internal': b'shelve'}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	864 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	865 tempopts = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	866 tempopts[b'message'] = b"pending changes temporary commit"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	867 tempopts[b'date'] = opts.get(b'date')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	868 with ui.configoverride({(b'ui', b'quiet'): True}):
31762 473f2fcc7629 shelve: move ui.quiet manipulations to configoverride Kostia Balytskyi <ikostia@fb.com> parents: 31669 diff changeset	869 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	870 tmpwctx = repo[node]
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	871 return tmpwctx, addedbefore
2e736f01a710 shelve: move temporary commit creation to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30417 diff changeset	872
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	873
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	874 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	875 """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	876 repo = repo.unfiltered()
39414 da84cca65036 shelve: fix crash on unshelve without .shelve metadata file Yuya Nishihara <yuya@tcha.org> parents: 39403 diff changeset	877 node = None
46286 3b08f56c8a11 shelve: teach new shelf class to check if .shelve file exists Martin von Zweigbergk <martinvonz@google.com> parents: 46285 diff changeset	878 if Shelf(repo, basename).hasinfo():
46275 157305bf859f shelve: move method for reading .shelve file to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46274 diff changeset	879 node = Shelf(repo, basename).readinfo()[b'node']
39401 c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	880 if node is None or node not in repo:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	881 with ui.configoverride({(b'ui', b'quiet'): True}):
46277 ed2f2150d57c shelve: move method for reading .hg to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46276 diff changeset	882 shelvectx = Shelf(repo, basename).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	883 # 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	884 # 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	885 if node is None:
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	886 info = {b'node': hex(shelvectx.node())}
46274 a344ec05b99c shelve: move method for writing .shelve to new shelf class Martin von Zweigbergk <martinvonz@google.com> parents: 46273 diff changeset	887 Shelf(repo, basename).writeinfo(info)
39401 c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	888 else:
c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	889 shelvectx = repo[node]
c67c94c0e7ae shelve: look for shelved node in the repository before unbundling Boris Feld <boris.feld@octobus.net> parents: 39400 diff changeset	890
30463 672026aece64 shelve: move commit restoration logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30462 diff changeset	891 return repo, shelvectx
672026aece64 shelve: move commit restoration logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30462 diff changeset	892
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	893
42688 c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	894 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	895 """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	896 was partially unshelved.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	897
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	898 If interactive is:
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	899
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	900 * 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	901 * 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	902 Update the shelve with remaining changes.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	903
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	904 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	905 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	906 interactively or non-interactively.
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	907
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	908 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	909 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	910 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	911
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	912 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	913 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	914 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	915 opts[b'message'] = shelvectx.description()
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	916 opts[b'interactive-unshelve'] = True
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	917 pats = []
42688 c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	918 if not interactive:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	919 newnode = repo.commit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	920 text=shelvectx.description(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	921 extra=shelvectx.extra(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	922 user=shelvectx.user(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	923 date=shelvectx.date(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	924 )
42688 c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	925 return newnode, False
c9114885c14b unshelve: unify logic around creating an unshelve changeset Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42616 diff changeset	926
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	927 commitfunc = getcommitfunc(shelvectx.extra(), interactive=True, editor=True)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	928 newnode = cmdutil.dorecord(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	929 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	930 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	931 commitfunc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	932 None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	933 False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	934 cmdutil.recordfilter,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	935 *pats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	936 **pycompat.strkwargs(opts)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	937 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	938 snode = repo.commit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	939 text=shelvectx.description(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	940 extra=shelvectx.extra(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	941 user=shelvectx.user(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	942 )
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	943 if snode:
42690 d5cdce3d9164 unshelve: create a matcher only if required on creating unshelve ctx Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42689 diff changeset	944 m = scmutil.matchfiles(repo, repo[snode].files())
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	945 _shelvecreatedcommit(repo, snode, basename, m)
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	946
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	947 return newnode, bool(snode)
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	948
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	949
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	950 def _rebaserestoredcommit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	951 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	952 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	953 opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	954 tr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	955 oldtiprev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	956 basename,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	957 pctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	958 tmpwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	959 shelvectx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	960 branchtorestore,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	961 activebookmark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	962 ):
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	963 """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	964 # 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	965 # we'll be merging with, rebase it to be on top.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	966 interactive = opts.get(b'interactive')
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	967 if tmpwctx.node() == shelvectx.p1().node() and not interactive:
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	968 # 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	969 # unshelve certain changes only.
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	970 return shelvectx, False
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	971
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	972 overrides = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	973 (b'ui', b'forcemerge'): opts.get(b'tool', b''),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	974 (b'phases', b'new-commit'): phases.secret,
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	975 }
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	976 with repo.ui.configoverride(overrides, b'unshelve'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	977 ui.status(_(b'rebasing shelved changes\n'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	978 stats = merge.graft(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	979 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	980 shelvectx,
44186 69b091cdc506 shelve: fix ordering of merge labels Kyle Lippincott <spectral@google.com> parents: 43986 diff changeset	981 labels=[b'working-copy', b'shelve'],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	982 keepconflictparent=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	983 )
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	984 if stats.unresolvedcount:
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	985 tr.close()
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	986
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	987 nodestoremove = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	988 repo.changelog.node(rev)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	989 for rev in pycompat.xrange(oldtiprev, len(repo))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	990 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	991 shelvedstate.save(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	992 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	993 basename,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	994 pctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	995 tmpwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	996 nodestoremove,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	997 branchtorestore,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	998 opts.get(b'keep'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	999 activebookmark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1000 interactive,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1001 )
45151 e429e7c801b2 error: normalize "unresolved conflicts" error messages with a custom class Daniel Ploch <dploch@google.com> parents: 45144 diff changeset	1002 raise error.ConflictResolutionRequired(b'unshelve')
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1003
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1004 with repo.dirstate.parentchange():
46114 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45957 diff changeset	1005 repo.setparents(tmpwctx.node(), nullid)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1006 newnode, ispartialunshelve = _createunshelvectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1007 ui, repo, shelvectx, basename, interactive, opts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1008 )
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1009
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1010 if newnode is None:
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1011 shelvectx = tmpwctx
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1012 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1013 b'note: unshelved changes already existed '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1014 b'in the working copy\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1015 )
38618 c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1016 ui.status(msg)
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1017 else:
c829749e7639 shelve: directly handle the initial parent alignment Boris Feld <boris.feld@octobus.net> parents: 38512 diff changeset	1018 shelvectx = repo[newnode]
45580 5c8230ca37f2 merge: replace calls to hg.updaterepo() by merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 45395 diff changeset	1019 merge.update(tmpwctx)
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1020
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	1021 return shelvectx, ispartialunshelve
30464 10684a298973 shelve: move rebasing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30463 diff changeset	1022
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1023
30465 b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1024 def _forgetunknownfiles(repo, shelvectx, addedbefore):
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1025 # 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	1026 # unshelve started, but are now added.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1027 shelveunknown = shelvectx.extra().get(b'shelve_unknown')
30465 b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1028 if not shelveunknown:
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1029 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1030 shelveunknown = frozenset(shelveunknown.split(b'\0'))
30465 b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1031 addedafter = frozenset(repo.status().added)
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1032 toforget = (addedafter & shelveunknown) - addedbefore
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1033 repo[None].forget(toforget)
b924375cce3a shelve: move file-forgetting logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30464 diff changeset	1034
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1035
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	1036 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	1037 _restoreactivebookmark(repo, activebookmark)
30466 893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1038 # 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	1039 # 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	1040 # 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	1041 # 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	1042 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	1043 _aborttransaction(repo, tr)
30466 893be22cdb38 shelve: move unshelve-finishing logic to a separate function Kostia Balytskyi <ikostia@fb.com> parents: 30465 diff changeset	1044
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1045
30846 dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1046 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	1047 """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	1048 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	1049 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	1050 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	1051 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	1052 if intersection:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1053 m = _(b"shelved change touches missing files")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1054 hint = _(b"run hg status to see which files are missing")
30846 dfc6663f97ca shelve: make unshelve not crash when there are missing files (issue4176) Kostia Balytskyi <ikostia@fb.com> parents: 30823 diff changeset	1055 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	1056
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1057
44602 47c1226463a1 shelve: split up dounshelve() in unshelvecmd() and _dounshelve() Martin von Zweigbergk <martinvonz@google.com> parents: 44458 diff changeset	1058 def unshelvecmd(ui, repo, shelved, *opts):
35046 aad6b9fdfc75 py3: handle keyword arguments in hgext/shelve.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34496 diff changeset	1059 opts = pycompat.byteskwargs(opts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1060 abortf = opts.get(b'abort')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1061 continuef = opts.get(b'continue')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1062 interactive = opts.get(b'interactive')
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1063 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	1064 cmdutil.checkunfinished(repo)
31041 4189d790e8a4 shelve: add -n/--name option to unshelve (issue5475) liscju <piotr.listkiewicz@gmail.com> parents: 30846 diff changeset	1065 shelved = list(shelved)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1066 if opts.get(b"name"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1067 shelved.append(opts[b"name"])
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1068
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1069 if interactive and opts.get(b'keep'):
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1070 raise error.InputError(
a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1071 _(b'--keep on --interactive is not yet supported')
a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1072 )
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	1073 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	1074 if abortf and continuef:
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1075 raise error.InputError(_(b'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	1076 if shelved:
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1077 raise error.InputError(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1078 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1079 b'cannot combine abort/continue with '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1080 b'naming a shelved change'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1081 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1082 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1083 if abortf and opts.get(b'tool', False):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1084 ui.warn(_(b'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	1085
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	1086 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	1087 if abortf:
42599 3fb0493812c0 abort: added support for unshelve Taapas Agrawal <taapas2897@gmail.com> parents: 42598 diff changeset	1088 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	1089 elif continuef and interactive:
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1090 raise error.InputError(
a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1091 _(b'cannot use both continue and interactive')
a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1092 )
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1093 elif continuef:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1094 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	1095 elif len(shelved) > 1:
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1096 raise error.InputError(_(b'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	1097 elif not shelved:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1098 shelved = listshelves(repo)
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1099 if not shelved:
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1100 raise error.StateError(_(b'no shelved changes to apply!'))
46281 a34607b6d320 shelve: make listshelves() return shelf names instead of filenames Martin von Zweigbergk <martinvonz@google.com> parents: 46280 diff changeset	1101 basename = shelved[0][1]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1102 ui.status(_(b"unshelving change '%s'\n") % basename)
42691 ee86ad6f50fe unshelve: store information about interactive mode in shelvedstate Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42690 diff changeset	1103 else:
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1104 basename = shelved[0]
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1105
46273 efc71bb71682 shelve: introduce class representing a shelf Martin von Zweigbergk <martinvonz@google.com> parents: 46272 diff changeset	1106 if not Shelf(repo, basename).exists():
46272 a68d3386138c shelve: raise more specific errors Martin von Zweigbergk <martinvonz@google.com> parents: 46271 diff changeset	1107 raise error.InputError(_(b"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	1108
44602 47c1226463a1 shelve: split up dounshelve() in unshelvecmd() and _dounshelve() Martin von Zweigbergk <martinvonz@google.com> parents: 44458 diff changeset	1109 return _dounshelve(ui, repo, basename, opts)
47c1226463a1 shelve: split up dounshelve() in unshelvecmd() and _dounshelve() Martin von Zweigbergk <martinvonz@google.com> parents: 44458 diff changeset	1110
47c1226463a1 shelve: split up dounshelve() in unshelvecmd() and _dounshelve() Martin von Zweigbergk <martinvonz@google.com> parents: 44458 diff changeset	1111
47c1226463a1 shelve: split up dounshelve() in unshelvecmd() and _dounshelve() Martin von Zweigbergk <martinvonz@google.com> parents: 44458 diff changeset	1112 def _dounshelve(ui, repo, basename, opts):
39400 6a71324cb68b shelve: handle shelved node on unfiltered repository Boris Feld <boris.feld@octobus.net> parents: 39399 diff changeset	1113 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	1114 lock = tr = None
19854 49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1115 try:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1116 lock = repo.lock()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1117 tr = repo.transaction(b'unshelve', 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	1118 oldtiprev = len(repo)
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1119
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1120 pctx = repo[b'.']
20958 df33c9014430 shelve: repo['.'] is not a wctx but a pctx Mads Kiilerich <madski@unity3d.com> parents: 20942 diff changeset	1121 tmpwctx = pctx
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1122 # 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	1123 # ...-> pctx -> tmpwctx -> shelvectx
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1124 # 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	1125 # 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	1126 # to the original pctx.
19961 1d7a36ff2615 shelve: use rebase instead of merge (issue4068) Durham Goode <durham@fb.com> parents: 19951 diff changeset	1127
31669 1cbeefa59343 shelve: add logic to preserve active bookmarks Kostia Balytskyi <ikostia@fb.com> parents: 31561 diff changeset	1128 activebookmark = _backupactivebookmark(repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1129 tmpwctx, addedbefore = _commitworkingcopychanges(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1130 ui, repo, opts, tmpwctx
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1131 )
41017 a06dc62f1c82 shelve: pass transaction around to clarify where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 40872 diff changeset	1132 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	1133 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1134 branchtorestore = b''
38011 7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1135 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	1136 branchtorestore = shelvectx.branch()
7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1137
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1138 shelvectx, ispartialunshelve = _rebaserestoredcommit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1139 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1140 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1141 opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1142 tr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1143 oldtiprev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1144 basename,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1145 pctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1146 tmpwctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1147 shelvectx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1148 branchtorestore,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1149 activebookmark,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42777 diff changeset	1150 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1151 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1152 with ui.configoverride(overrides, b'unshelve'):
38011 7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1153 mergefiles(ui, repo, pctx, shelvectx)
7932be8b0559 shelve: reduce scope of merge tool config override Martin von Zweigbergk <martinvonz@google.com> parents: 37603 diff changeset	1154 restorebranch(ui, repo, branchtorestore)
42726 6957f7b93e03 unshelve: clear shelvedstate and _finishunshelve() on partial unshelve Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42725 diff changeset	1155 shelvedstate.clear(repo)
6957f7b93e03 unshelve: clear shelvedstate and _finishunshelve() on partial unshelve Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42725 diff changeset	1156 _finishunshelve(repo, oldtiprev, tr, activebookmark)
42750 d684449eef67 unshelve: forget unknown files after a partial unshelve Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42726 diff changeset	1157 _forgetunknownfiles(repo, shelvectx, addedbefore)
42616 5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	1158 if not ispartialunshelve:
5162753c4c14 unshelve: add interactive mode Navaneeth Suresh <navaneeths1998@gmail.com> parents: 42614 diff changeset	1159 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	1160 finally:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1161 if tr:
49d4919d21c2 shelve: add a shelve extension to save/restore working changes David Soria Parra <dsp@experimentalworks.net> parents: diff changeset	1162 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	1163 lockmod.release(lock)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/shelve.py @ 46286:3b08f56c8a11