Mercurial > public > mercurial-scm > hg

comparison mercurial/shelve.py @ 49523:52dd7a43ad5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: re-wrap now that the line fits
author Jason R. Coombs <jaraco@jaraco.com>
date Wed, 19 Oct 2022 16:16:47 -0400
parents f599a946181d
children a3356ab610fc
comparison
equal deleted inserted replaced
49522:f599a946181d 49523:52dd7a43ad5c
1182 # where tmpwctx is an optional commit with the user's pending changes 1182 # where tmpwctx is an optional commit with the user's pending changes
1183 # and shelvectx is the unshelved changes. Then we merge it all down 1183 # and shelvectx is the unshelved changes. Then we merge it all down
1184 # to the original pctx. 1184 # to the original pctx.
1185 1185
1186 activebookmark = _backupactivebookmark(repo) 1186 activebookmark = _backupactivebookmark(repo)
1187 tmpwctx, addedbefore = _commitworkingcopychanges( 1187 tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts, pctx)
1188 ui, repo, opts, pctx
1189 )
1190 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename) 1188 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
1191 _checkunshelveuntrackedproblems(ui, repo, shelvectx) 1189 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
1192 branchtorestore = b'' 1190 branchtorestore = b''
1193 if shelvectx.branch() != shelvectx.p1().branch(): 1191 if shelvectx.branch() != shelvectx.p1().branch():
1194 branchtorestore = shelvectx.branch() 1192 branchtorestore = shelvectx.branch()