This is an archive of the discontinued Mercurial Phabricator instance.

debugstrip: add debugstrip to core
Needs RevisionPublic

Authored by navaneeth.suresh on Oct 5 2019, 3:41 PM.

Download Raw Diff

Details

Reviewers

durin42
baymax

Group Reviewers

hg-reviewers

Summary

Until now, strip was bootstrapped as an extension. This patch adds
debugstrip on core. For the users who are still used to strip
extension, we will preserve that name.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

navaneeth.suresh created this revision.Oct 5 2019, 3:41 PM

Herald added a reviewer: durin42. · View Herald TranscriptOct 5 2019, 3:41 PM

Herald added a reviewer: durin42. · View Herald Transcript

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added subscribers: mercurial-devel, mjpieters. · View Herald Transcript

durin42 requested changes to this revision.Oct 5 2019, 3:55 PM

durin42 added inline comments.

mercurial/commands.py
5646 ↗	(On Diff #16856)	debugstrip please (and put it in debugcommands) and Gregory points out we need a strip extension that preserves the old `strip` name for users that are used to that

This revision now requires changes to proceed.Oct 5 2019, 3:55 PM

navaneeth.suresh added inline comments.Oct 5 2019, 4:10 PM

mercurial/commands.py
5646 ↗	(On Diff #16856)	i see. do i need to replace `strip` by `debugstrip` on every occurrence in tests? otherwise, i would have to revert the changes in the tests and keep the extension as it is.

durin42 added inline comments.Oct 5 2019, 5:02 PM

mercurial/commands.py
5646 ↗	(On Diff #16856)	One or two is fine, you can leave the majority on the legacy extension flavor. We want some using each so we don't have to add a new test to test one of them.

navaneeth.suresh retitled this revision from strip: move strip extension to core to strip: move strip extension to core as debugstrip.Oct 6 2019, 1:48 PM

navaneeth.suresh edited the summary of this revision. (Show Details)

navaneeth.suresh updated this revision to Diff 16914.

@durin42 Done,

marmoute added a subscriber: marmoute.Oct 7 2019, 9:06 PM

marmoute added inline comments.

hgext/strip.py
1–47	Why do we need that much code to remain into `hgext/strip.py`. What I would expect to see is a very small file that only register debugstrip as `strip`.
24–34	What is going on here? IT seems like the same code with a different formatting.

pulkit added a subscriber: pulkit.Oct 9 2019, 9:55 AM

pulkit added inline comments.

hgext/strip.py
3	the documentation should be left as it is.

navaneeth.suresh retitled this revision from strip: move strip extension to core as debugstrip to debugstrip: add debugstrip to core.Oct 12 2019, 5:59 PM

navaneeth.suresh updated this revision to Diff 17120.

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:31 PM

valentin.gatienbaron mentioned this in D9285: strip: move into core.Nov 8 2020, 7:16 PM

Revision Contents
Changeset List

			Path	Packages
M			hgext/mq.py (16 lines)
P			hgext/strip.py (121 lines) Copied to mercurial/strip.py
M			mercurial/debugcommands.py (145 lines)
P			mercurial/strip.py (162 lines) Copied from hgext/strip.py
M			tests/remotefilelog-library.sh (1 line)
M			tests/test-backout.t (4 lines)
M			tests/test-blackbox.t (6 lines)
M			tests/test-bookmarks-pushpull.t (4 lines)
M			tests/test-bookmarks-strip.t (2 lines)
M			tests/test-bookmarks.t (2 lines)
M			tests/test-branches.t (2 lines)
M			tests/test-bundle-phases.t (17 lines)
M			tests/test-commandserver.t (4 lines)
M			tests/test-completion.t (2 lines)
M			tests/test-convert-filemap.t (2 lines)
M			tests/test-convert-svn-sink.t (2 lines)
M			tests/test-copy-move-merge.t (2 lines)
M			tests/test-debugcommands.t (2 lines)
P			tests/test-debugstrip.t (113 lines) Copied from tests/test-strip.t
M			tests/test-exchange-obsmarkers-case-D1.t (2 lines)
M			tests/test-exchange-obsmarkers-case-D2.t (2 lines)
M			tests/test-exchange-obsmarkers-case-D3.t (2 lines)
M			tests/test-extension.t (17 lines)
M			tests/test-flagprocessor.t (2 lines)
M			tests/test-generaldelta.t (4 lines)
M			tests/test-graft.t (8 lines)
M			tests/test-help.t (1 line)
M			tests/test-hgweb-bundle.t (6 lines)
M			tests/test-histedit-arguments.t (4 lines)
M			tests/test-histedit-edit.t (5 lines)
M			tests/test-histedit-obsolete.t (2 lines)
M			tests/test-hook.t (2 lines)
M			tests/test-import-bypass.t (4 lines)
M			tests/test-import-merge.t (12 lines)
M			tests/test-import.t (4 lines)
M			tests/test-keyword.t (4 lines)
M			tests/test-lfs.t (2 lines)
M			tests/test-mq-qpush-exact.t (2 lines)
M			tests/test-mq.t (10 lines)
M			tests/test-narrow-strip.t (12 lines)
M			tests/test-obsolete-changeset-exchange.t (4 lines)
M			tests/test-obsolete.t (8 lines)
M			tests/test-phase-archived.t (4 lines)
M			tests/test-phases-exchange.t (2 lines)
M			tests/test-phases.t (2 lines)
M			tests/test-pull-update.t (2 lines)
M			tests/test-push-http.t (4 lines)
M			tests/test-push.t (4 lines)
M			tests/test-rebase-abort.t (2 lines)
M			tests/test-rebase-cache.t (8 lines)
M			tests/test-rebase-collapse.t (4 lines)
M			tests/test-rebase-inmemory.t (3 lines)
M			tests/test-remotefilelog-bgprefetch.t (4 lines)
M			tests/test-remotefilelog-bundles.t (8 lines)
M			tests/test-remotefilelog-linknodes.t (2 lines)
M			tests/test-remotefilelog-local.t (6 lines)
M			tests/test-remotefilelog-prefetch.t (8 lines)
M			tests/test-remotefilelog-push-pull.t (6 lines)
M			tests/test-remotefilelog-repack-fast.t (4 lines)
M			tests/test-remotefilelog-repack.t (4 lines)
M			tests/test-remotefilelog-sparse.t (2 lines)
M			tests/test-repair-strip.t (2 lines)
M			tests/test-shelve.t (2 lines)
M			tests/test-shelve2.t (2 lines)
M			tests/test-single-head.t (2 lines)
M			tests/test-sparse-clear.t (1 line)
M			tests/test-sparse-clone.t (1 line)
M			tests/test-sparse-fsmonitor.t (1 line)
M			tests/test-sparse-import.t (1 line)
M			tests/test-sparse-merges.t (2 lines)
M			tests/test-sparse-profiles.t (3 lines)
M			tests/test-sparse-verbose-json.t (1 line)
M			tests/test-sparse.t (3 lines)
M			tests/test-ssh-proto-unbundle.t (4 lines)
P			tests/test-strip.t (2 lines) Copied to tests/test-debugstrip.t
M			tests/test-subrepo-missing.t (2 lines)
M			tests/test-subrepo.t (6 lines)
M			tests/test-tags.t (10 lines)
M			tests/test-template-map.t (2 lines)
M			tests/test-transplant.t (4 lines)
M			tests/test-treemanifest.t (6 lines)
M			tests/testlib/exchange-obsmarker-util.sh (4 lines)
M			tests/testlib/push-checkheads-util.sh (4 lines)

Commit	Parents	Author	Summary	Date
93601d504208	a614f26d4897	Navaneeth Suresh		Oct 5 2019, 6:06 AM

Diff 16914

hgext/mq.py

	logcmdutil,			logcmdutil,
	patch as patchmod,			patch as patchmod,
	phases,			phases,
	pycompat,			pycompat,
	registrar,			registrar,
	revsetlang,			revsetlang,
	scmutil,			scmutil,
	smartset,			smartset,
				strip as stripmod,
	subrepoutil,			subrepoutil,
	util,			util,
	vfs as vfsmod,			vfs as vfsmod,
	)			)
	from mercurial.utils import (			from mercurial.utils import (
	dateutil,			dateutil,
	stringutil,			stringutil,
	)			)
	)			)
	configitem('mq', 'plain',			configitem('mq', 'plain',
	default=False,			default=False,
	)			)
	configitem('mq', 'secret',			configitem('mq', 'secret',
	default=False,			default=False,
	)			)

	# force load strip extension formerly included in mq and import some utility			strip = stripmod.strip
	try:
	stripext = extensions.find('strip')
	except KeyError:
	# note: load is lazy so we could avoid the try-except,
	# but I (marmoute) prefer this explicit code.
	class dummyui(object):
	def debug(self, msg):
	pass
	def log(self, event, msgfmt, msgargs, *opts):
	pass
	stripext = extensions.load(dummyui(), 'strip', '')

	strip = stripext.strip

	def checksubstate(repo, baserev=None):			def checksubstate(repo, baserev=None):
	'''return list of subrepos at a different revision than substate.			'''return list of subrepos at a different revision than substate.
	Abort if any subrepos have uncommitted changes.'''			Abort if any subrepos have uncommitted changes.'''
	inclsubs = []			inclsubs = []
	wctx = repo[None]			wctx = repo[None]
	if baserev:			if baserev:
	bctx = repo[baserev]			bctx = repo[baserev]

hgext/strip.py

This file was copied to mercurial/strip.py.

	"""strip changesets and their descendants from history			"""strip changesets and their descendants from history

	This extension allows you to strip changesets and all their descendants from the			strip extension has been renamed to debugstrip and moved to core. However,
				pulkitUnsubmitted Not Done the documentation should be left as it is. pulkit: the documentation should be left as it is.
	repository. See the command help for details.			this extension is to preserve the old `strip` name forusers that are used
				to that.
	"""			"""
	from __future__ import absolute_import

				from __future__ import absolute_import
	from mercurial.i18n import _			from mercurial.i18n import _
				from mercurial.node import nullid
	from mercurial import (			from mercurial import (
	bookmarks as bookmarksmod,
	cmdutil,
	error,			error,
	hg,			merge as mergemod,
	lock as lockmod,
	merge,
	node as nodemod,
	pycompat,			pycompat,
	registrar,			registrar,
	repair,
	scmutil,			scmutil,
	util,			strip as stripmod,
	)			)
	nullid = nodemod.nullid
	release = lockmod.release

	cmdtable = {}			cmdtable = {}
	command = registrar.command(cmdtable)			command = registrar.command(cmdtable)
	# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
	# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
	# be specifying the version(s) of Mercurial they are tested with, or
	# leave the attribute unspecified.
	testedwith = 'ships-with-hg-core'

	def checklocalchanges(repo, force=False):
	s = repo.status()
	if not force:
	cmdutil.checkunfinished(repo)
	cmdutil.bailifchanged(repo)
	else:
	cmdutil.checkunfinished(repo, skipmerge=True)
	return s

	def _findupdatetarget(repo, nodes):
	unode, p2 = repo.changelog.parents(nodes[0])
	currentbranch = repo[None].branch()

	if (util.safehasattr(repo, 'mq') and p2 != nullid
	and p2 in [x.node for x in repo.mq.applied]):
	unode = p2
	elif currentbranch != repo[unode].branch():
	pwdir = 'parents(wdir())'
	revset = 'max(((parents(%ln::%r) + %r) - %ln::%r) and branch(%s))'
	branchtarget = repo.revs(revset, nodes, pwdir, pwdir, nodes, pwdir,
	currentbranch)
	if branchtarget:
	cl = repo.changelog
	unode = cl.node(branchtarget.first())

	return unode

	def strip(ui, repo, revs, update=True, backup=True, force=None, bookmarks=None,
	soft=False):
	with repo.wlock(), repo.lock():

	if update:
	checklocalchanges(repo, force=force)
	urev = _findupdatetarget(repo, revs)
	hg.clean(repo, urev)
	repo.dirstate.write(repo.currenttransaction())

	if soft:
	repair.softstrip(ui, repo, revs, backup)
	else:
	repair.strip(ui, repo, revs, backup)

	repomarks = repo._bookmarks
	if bookmarks:
	with repo.transaction('strip') as tr:
	if repo._activebookmark in bookmarks:
	bookmarksmod.deactivate(repo)
	repomarks.applychanges(repo, tr, [(b, None) for b in bookmarks])
	for bookmark in sorted(bookmarks):
	ui.write(_("bookmark '%s' deleted\n") % bookmark)

	@command("strip",			@command("strip",
	[			[
	('r', 'rev', [], _('strip specified revision (optional, '			('r', 'rev', [], _('strip specified revision (optional, can specify '
	'can specify revisions without this '			'revisions without this option)'), _('REV')),
	'option)'), _('REV')),			('f', 'force', None, _('force removal of changesets, discard uncommitted'
	('f', 'force', None, _('force removal of changesets, discard '			' changes (no backup)')),
	'uncommitted changes (no backup)')),
	('', 'no-backup', None, _('do not save backup bundle')),			('', 'no-backup', None, _('do not save backup bundle')),
	('', 'nobackup', None, _('do not save backup bundle '			('', 'nobackup', None, _('do not save backup bundle (DEPRECATED)')),
	'(DEPRECATED)')),
	('n', '', None, _('ignored (DEPRECATED)')),			('n', '', None, _('ignored (DEPRECATED)')),
	('k', 'keep', None, _("do not modify working directory during "			('k', 'keep', None, _("do not modify working directory during strip")),
	"strip")),			('B', 'bookmark', [], _("remove revs only reachable from given bookmark"),
	('B', 'bookmark', [], _("remove revs only reachable from given"			_('BOOKMARK')),
				marmouteUnsubmitted Not Done What is going on here? IT seems like the same code with a different formatting. marmoute: What is going on here? IT seems like the same code with a different formatting.
	" bookmark"), _('BOOKMARK')),
	('', 'soft', None,			('', 'soft', None,
	_("simply drop changesets from visible history (EXPERIMENTAL)")),			_("simply drop changesets from visible history (EXPERIMENTAL)")),
	],			],
	_('hg strip [-k] [-f] [-B bookmark] [-r] REV...'),			_('hg strip [-k] [-f] [-B bookmark] [-r] REV...'),
	helpcategory=command.CATEGORY_MAINTENANCE)			helpcategory=command.CATEGORY_MAINTENANCE)
	def stripcmd(ui, repo, revs, *opts):			def stripcmd(ui, repo, revs, *opts):
	"""strip changesets and all their descendants from the repository			"""strip changesets and all their descendants from the repository

	The strip command removes the specified changesets and all their			The strip command removes the specified changesets and all their
	descendants. If the working directory has uncommitted changes, the			descendants. If the working directory has uncommitted changes, the
	operation is aborted unless the --force flag is supplied, in which			operation is aborted unless the --force flag is supplied, in which
	case changes will be discarded.			case changes will be discarded.

				marmouteUnsubmitted Not Done Why do we need that much code to remain into `hgext/strip.py`. What I would expect to see is a very small file that only register debugstrip as `strip`. marmoute: Why do we need that much code to remain into `hgext/strip.py`. What I would expect to see is a…
	If a parent of the working directory is stripped, then the working			If a parent of the working directory is stripped, then the working
	directory will automatically be updated to the most recent			directory will automatically be updated to the most recent
	available ancestor of the stripped parent after the operation			available ancestor of the stripped parent after the operation
	completes.			completes.

	Any stripped changesets are stored in ``.hg/strip-backup`` as a			Any stripped changesets are stored in ``.hg/strip-backup`` as a
	bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can			bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can
	be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,			be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,
	# patch, only part of the queue is stripped			# patch, only part of the queue is stripped
	start = i			start = i
	break			break
	del q.applied[start:end]			del q.applied[start:end]
	q.savedirty()			q.savedirty()

	revs = sorted(rootnodes)			revs = sorted(rootnodes)
	if update and opts.get('keep'):			if update and opts.get('keep'):
	urev = _findupdatetarget(repo, revs)			urev = stripmod.findupdatetarget(repo, revs)
	uctx = repo[urev]			uctx = repo[urev]

	# only reset the dirstate for files that would actually change			# only reset the dirstate for files that would actually change
	# between the working context and uctx			# between the working context and uctx
	descendantrevs = repo.revs(b"%d::.", uctx.rev())			descendantrevs = repo.revs(b"%d::.", uctx.rev())
	changedfiles = []			changedfiles = []
	for rev in descendantrevs:			for rev in descendantrevs:
	# blindly reset the files, regardless of what actually changed			# blindly reset the files, regardless of what actually changed
	changedfiles.extend(repo[rev].files())			changedfiles.extend(repo[rev].files())

	# reset files that only changed in the dirstate too			# reset files that only changed in the dirstate too
	dirstate = repo.dirstate			dirstate = repo.dirstate
	dirchanges = [f for f in dirstate if dirstate[f] != 'n']			dirchanges = [f for f in dirstate if dirstate[f] != 'n']
	changedfiles.extend(dirchanges)			changedfiles.extend(dirchanges)

	repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)			repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
	repo.dirstate.write(repo.currenttransaction())			repo.dirstate.write(repo.currenttransaction())

	# clear resolve state			# clear resolve state
	merge.mergestate.clean(repo, repo['.'].node())			mergemod.mergestate.clean(repo, repo['.'].node())

	update = False			update = False


	strip(ui, repo, revs, backup=backup, update=update,			stripmod.strip(ui, repo, revs, backup=backup, update=update,
	force=opts.get('force'), bookmarks=bookmarks,			force=opts.get('force'), bookmarks=bookmarks,
	soft=opts['soft'])			soft=opts['soft'])

	return 0			return 0

mercurial/debugcommands.py

	revset,			revset,
	revsetlang,			revsetlang,
	scmutil,			scmutil,
	setdiscovery,			setdiscovery,
	simplemerge,			simplemerge,
	sshpeer,			sshpeer,
	sslutil,			sslutil,
	streamclone,			streamclone,
				strip as stripmod,
	templater,			templater,
	treediscovery,			treediscovery,
	upgrade,			upgrade,
	url as urlmod,			url as urlmod,
	util,			util,
	vfs as vfsmod,			vfs as vfsmod,
	wireprotoframing,			wireprotoframing,
	wireprotoserver,			wireprotoserver,
	ui.status(_('failed.\n'))			ui.status(_('failed.\n'))
	else:			else:
	ui.status(_('done.\n'))			ui.status(_('done.\n'))
	else:			else:
	ui.status(_('full certificate chain is available\n'))			ui.status(_('full certificate chain is available\n'))
	finally:			finally:
	s.close()			s.close()

				@command("debugstrip",
				[
				('r', 'rev', [], _('strip specified revision (optional, can specify '
				'revisions without this option)'), _('REV')),
				('f', 'force', None, _('force removal of changesets, discard uncommitted'
				' changes (no backup)')),
				('', 'no-backup', None, _('do not save backup bundle')),
				('', 'nobackup', None, _('do not save backup bundle (DEPRECATED)')),
				('n', '', None, _('ignored (DEPRECATED)')),
				('k', 'keep', None, _("do not modify working directory during strip")),
				('B', 'bookmark', [], _("remove revs only reachable from given bookmark"),
				_('BOOKMARK')),
				('', 'soft', None,
				_("simply drop changesets from visible history (EXPERIMENTAL)")),
				],
				_('hg strip [-k] [-f] [-B bookmark] [-r] REV...'),
				helpcategory=command.CATEGORY_MAINTENANCE)
				def debugstrip(ui, repo, revs, *opts):
				"""strip changesets and all their descendants from the repository

				The strip command removes the specified changesets and all their
				descendants. If the working directory has uncommitted changes, the
				operation is aborted unless the --force flag is supplied, in which
				case changes will be discarded.

				If a parent of the working directory is stripped, then the working
				directory will automatically be updated to the most recent
				available ancestor of the stripped parent after the operation
				completes.

				Any stripped changesets are stored in ``.hg/strip-backup`` as a
				bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can
				be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,
				where BUNDLE is the bundle file created by the strip. Note that
				the local revision numbers will in general be different after the
				restore.

				Use the --no-backup option to discard the backup bundle once the
				operation completes.

				Strip is not a history-rewriting operation and can be used on
				changesets in the public phase. But if the stripped changesets have
				been pushed to a remote repository you will likely pull them again.

				Return 0 on success.
				"""
				opts = pycompat.byteskwargs(opts)
				backup = True
				if opts.get('no_backup') or opts.get('nobackup'):
				backup = False

				cl = repo.changelog
				revs = list(revs) + opts.get('rev')
				revs = set(scmutil.revrange(repo, revs))

				with repo.wlock():
				bookmarks = set(opts.get('bookmark'))
				if bookmarks:
				repomarks = repo._bookmarks
				if not bookmarks.issubset(repomarks):
				raise error.Abort(_("bookmark '%s' not found") %
				','.join(sorted(bookmarks - set(repomarks.keys()))))

				# If the requested bookmark is not the only one pointing to a
				# a revision we have to only delete the bookmark and not strip
				# anything. revsets cannot detect that case.
				nodetobookmarks = {}
				for mark, node in repomarks.iteritems():
				nodetobookmarks.setdefault(node, []).append(mark)
				for marks in nodetobookmarks.values():
				if bookmarks.issuperset(marks):
				rsrevs = scmutil.bookmarkrevs(repo, marks[0])
				revs.update(set(rsrevs))
				if not revs:
				with repo.lock(), repo.transaction('bookmark') as tr:
				bmchanges = [(b, None) for b in bookmarks]
				repomarks.applychanges(repo, tr, bmchanges)
				for bookmark in sorted(bookmarks):
				ui.write(_("bookmark '%s' deleted\n") % bookmark)

				if not revs:
				raise error.Abort(_('empty revision set'))

				descendants = set(cl.descendants(revs))
				strippedrevs = revs.union(descendants)
				roots = revs.difference(descendants)

				# if one of the wdir parent is stripped we'll need
				# to update away to an earlier revision
				update = any(p != nullid and cl.rev(p) in strippedrevs
				for p in repo.dirstate.parents())

				rootnodes = set(cl.node(r) for r in roots)

				q = getattr(repo, 'mq', None)
				if q is not None and q.applied:
				# refresh queue state if we're about to strip
				# applied patches
				if cl.rev(repo.lookup('qtip')) in strippedrevs:
				q.applieddirty = True
				start = 0
				end = len(q.applied)
				for i, statusentry in enumerate(q.applied):
				if statusentry.node in rootnodes:
				# if one of the stripped roots is an applied
				# patch, only part of the queue is stripped
				start = i
				break
				del q.applied[start:end]
				q.savedirty()

				revs = sorted(rootnodes)
				if update and opts.get('keep'):
				urev = stripmod.findupdatetarget(repo, revs)
				uctx = repo[urev]

				# only reset the dirstate for files that would actually change
				# between the working context and uctx
				descendantrevs = repo.revs(b"%d::.", uctx.rev())
				changedfiles = []
				for rev in descendantrevs:
				# blindly reset the files, regardless of what actually changed
				changedfiles.extend(repo[rev].files())

				# reset files that only changed in the dirstate too
				dirstate = repo.dirstate
				dirchanges = [f for f in dirstate if dirstate[f] != 'n']
				changedfiles.extend(dirchanges)

				repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
				repo.dirstate.write(repo.currenttransaction())

				# clear resolve state
				mergemod.mergestate.clean(repo, repo['.'].node())

				update = False


				stripmod.strip(ui, repo, revs, backup=backup, update=update,
				force=opts.get('force'), bookmarks=bookmarks,
				soft=opts['soft'])

				return 0

	@command('debugsub',			@command('debugsub',
	[('r', 'rev', '',			[('r', 'rev', '',
	_('revision to check'), _('REV'))],			_('revision to check'), _('REV'))],
	_('[-r REV] [REV]'))			_('[-r REV] [REV]'))
	def debugsub(ui, repo, rev=None):			def debugsub(ui, repo, rev=None):
	ctx = scmutil.revsingle(repo, rev, None)			ctx = scmutil.revsingle(repo, rev, None)
	for k, v in sorted(ctx.substate.items()):			for k, v in sorted(ctx.substate.items()):
	ui.write(('path %s\n') % k)			ui.write(('path %s\n') % k)

mercurial/strip.py

This file was copied from hgext/strip.py.

	"""strip changesets and their descendants from history			"""strip changesets and their descendants from history

	This extension allows you to strip changesets and all their descendants from the			This extension allows you to strip changesets and all their descendants from the
	repository. See the command help for details.			repository. See the command help for details.
	"""			"""
	from __future__ import absolute_import			from __future__ import absolute_import

	from mercurial.i18n import _			from .i18n import _
	from mercurial import (			from . import (
	bookmarks as bookmarksmod,			bookmarks as bookmarksmod,
	cmdutil,			cmdutil,
	error,
	hg,			hg,
	lock as lockmod,			lock as lockmod,
	merge,
	node as nodemod,			node as nodemod,
	pycompat,
	registrar,
	repair,			repair,
	scmutil,
	util,			util,
	)			)
	nullid = nodemod.nullid			nullid = nodemod.nullid
	release = lockmod.release			release = lockmod.release

	cmdtable = {}
	command = registrar.command(cmdtable)
	# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for			# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
	# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should			# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
	# be specifying the version(s) of Mercurial they are tested with, or			# be specifying the version(s) of Mercurial they are tested with, or
	# leave the attribute unspecified.			# leave the attribute unspecified.
	testedwith = 'ships-with-hg-core'			testedwith = 'ships-with-hg-core'

	def checklocalchanges(repo, force=False):			def checklocalchanges(repo, force=False):
	s = repo.status()			s = repo.status()
	if not force:			if not force:
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	cmdutil.bailifchanged(repo)			cmdutil.bailifchanged(repo)
	else:			else:
	cmdutil.checkunfinished(repo, skipmerge=True)			cmdutil.checkunfinished(repo, skipmerge=True)
	return s			return s

	def _findupdatetarget(repo, nodes):			def findupdatetarget(repo, nodes):
	unode, p2 = repo.changelog.parents(nodes[0])			unode, p2 = repo.changelog.parents(nodes[0])
	currentbranch = repo[None].branch()			currentbranch = repo[None].branch()

	if (util.safehasattr(repo, 'mq') and p2 != nullid			if (util.safehasattr(repo, 'mq') and p2 != nullid
	and p2 in [x.node for x in repo.mq.applied]):			and p2 in [x.node for x in repo.mq.applied]):
	unode = p2			unode = p2
	elif currentbranch != repo[unode].branch():			elif currentbranch != repo[unode].branch():
	pwdir = 'parents(wdir())'			pwdir = 'parents(wdir())'
	revset = 'max(((parents(%ln::%r) + %r) - %ln::%r) and branch(%s))'			revset = 'max(((parents(%ln::%r) + %r) - %ln::%r) and branch(%s))'
	branchtarget = repo.revs(revset, nodes, pwdir, pwdir, nodes, pwdir,			branchtarget = repo.revs(revset, nodes, pwdir, pwdir, nodes, pwdir,
	currentbranch)			currentbranch)
	if branchtarget:			if branchtarget:
	cl = repo.changelog			cl = repo.changelog
	unode = cl.node(branchtarget.first())			unode = cl.node(branchtarget.first())

	return unode			return unode

	def strip(ui, repo, revs, update=True, backup=True, force=None, bookmarks=None,			def strip(ui, repo, revs, update=True, backup=True, force=None, bookmarks=None,
	soft=False):			soft=False):
	with repo.wlock(), repo.lock():			with repo.wlock(), repo.lock():

	if update:			if update:
	checklocalchanges(repo, force=force)			checklocalchanges(repo, force=force)
	urev = _findupdatetarget(repo, revs)			urev = findupdatetarget(repo, revs)
	hg.clean(repo, urev)			hg.clean(repo, urev)
	repo.dirstate.write(repo.currenttransaction())			repo.dirstate.write(repo.currenttransaction())

	if soft:			if soft:
	repair.softstrip(ui, repo, revs, backup)			repair.softstrip(ui, repo, revs, backup)
	else:			else:
	repair.strip(ui, repo, revs, backup)			repair.strip(ui, repo, revs, backup)

	repomarks = repo._bookmarks			repomarks = repo._bookmarks
	if bookmarks:			if bookmarks:
	with repo.transaction('strip') as tr:			with repo.transaction('strip') as tr:
	if repo._activebookmark in bookmarks:			if repo._activebookmark in bookmarks:
	bookmarksmod.deactivate(repo)			bookmarksmod.deactivate(repo)
	repomarks.applychanges(repo, tr, [(b, None) for b in bookmarks])			repomarks.applychanges(repo, tr, [(b, None) for b in bookmarks])
	for bookmark in sorted(bookmarks):			for bookmark in sorted(bookmarks):
	ui.write(_("bookmark '%s' deleted\n") % bookmark)			ui.write(_("bookmark '%s' deleted\n") % bookmark)

	@command("strip",
	[
	('r', 'rev', [], _('strip specified revision (optional, '
	'can specify revisions without this '
	'option)'), _('REV')),
	('f', 'force', None, _('force removal of changesets, discard '
	'uncommitted changes (no backup)')),
	('', 'no-backup', None, _('do not save backup bundle')),
	('', 'nobackup', None, _('do not save backup bundle '
	'(DEPRECATED)')),
	('n', '', None, _('ignored (DEPRECATED)')),
	('k', 'keep', None, _("do not modify working directory during "
	"strip")),
	('B', 'bookmark', [], _("remove revs only reachable from given"
	" bookmark"), _('BOOKMARK')),
	('', 'soft', None,
	_("simply drop changesets from visible history (EXPERIMENTAL)")),
	],
	_('hg strip [-k] [-f] [-B bookmark] [-r] REV...'),
	helpcategory=command.CATEGORY_MAINTENANCE)
	def stripcmd(ui, repo, revs, *opts):
	"""strip changesets and all their descendants from the repository

	The strip command removes the specified changesets and all their
	descendants. If the working directory has uncommitted changes, the
	operation is aborted unless the --force flag is supplied, in which
	case changes will be discarded.

	If a parent of the working directory is stripped, then the working
	directory will automatically be updated to the most recent
	available ancestor of the stripped parent after the operation
	completes.

	Any stripped changesets are stored in ``.hg/strip-backup`` as a
	bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can
	be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,
	where BUNDLE is the bundle file created by the strip. Note that
	the local revision numbers will in general be different after the
	restore.

	Use the --no-backup option to discard the backup bundle once the
	operation completes.

	Strip is not a history-rewriting operation and can be used on
	changesets in the public phase. But if the stripped changesets have
	been pushed to a remote repository you will likely pull them again.

	Return 0 on success.
	"""
	opts = pycompat.byteskwargs(opts)
	backup = True
	if opts.get('no_backup') or opts.get('nobackup'):
	backup = False

	cl = repo.changelog
	revs = list(revs) + opts.get('rev')
	revs = set(scmutil.revrange(repo, revs))

	with repo.wlock():
	bookmarks = set(opts.get('bookmark'))
	if bookmarks:
	repomarks = repo._bookmarks
	if not bookmarks.issubset(repomarks):
	raise error.Abort(_("bookmark '%s' not found") %
	','.join(sorted(bookmarks - set(repomarks.keys()))))

	# If the requested bookmark is not the only one pointing to a
	# a revision we have to only delete the bookmark and not strip
	# anything. revsets cannot detect that case.
	nodetobookmarks = {}
	for mark, node in repomarks.iteritems():
	nodetobookmarks.setdefault(node, []).append(mark)
	for marks in nodetobookmarks.values():
	if bookmarks.issuperset(marks):
	rsrevs = scmutil.bookmarkrevs(repo, marks[0])
	revs.update(set(rsrevs))
	if not revs:
	with repo.lock(), repo.transaction('bookmark') as tr:
	bmchanges = [(b, None) for b in bookmarks]
	repomarks.applychanges(repo, tr, bmchanges)
	for bookmark in sorted(bookmarks):
	ui.write(_("bookmark '%s' deleted\n") % bookmark)

	if not revs:
	raise error.Abort(_('empty revision set'))

	descendants = set(cl.descendants(revs))
	strippedrevs = revs.union(descendants)
	roots = revs.difference(descendants)

	# if one of the wdir parent is stripped we'll need
	# to update away to an earlier revision
	update = any(p != nullid and cl.rev(p) in strippedrevs
	for p in repo.dirstate.parents())

	rootnodes = set(cl.node(r) for r in roots)

	q = getattr(repo, 'mq', None)
	if q is not None and q.applied:
	# refresh queue state if we're about to strip
	# applied patches
	if cl.rev(repo.lookup('qtip')) in strippedrevs:
	q.applieddirty = True
	start = 0
	end = len(q.applied)
	for i, statusentry in enumerate(q.applied):
	if statusentry.node in rootnodes:
	# if one of the stripped roots is an applied
	# patch, only part of the queue is stripped
	start = i
	break
	del q.applied[start:end]
	q.savedirty()

	revs = sorted(rootnodes)
	if update and opts.get('keep'):
	urev = _findupdatetarget(repo, revs)
	uctx = repo[urev]

	# only reset the dirstate for files that would actually change
	# between the working context and uctx
	descendantrevs = repo.revs(b"%d::.", uctx.rev())
	changedfiles = []
	for rev in descendantrevs:
	# blindly reset the files, regardless of what actually changed
	changedfiles.extend(repo[rev].files())

	# reset files that only changed in the dirstate too
	dirstate = repo.dirstate
	dirchanges = [f for f in dirstate if dirstate[f] != 'n']
	changedfiles.extend(dirchanges)

	repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
	repo.dirstate.write(repo.currenttransaction())

	# clear resolve state
	merge.mergestate.clean(repo, repo['.'].node())

	update = False


	strip(ui, repo, revs, backup=backup, update=update,
	force=opts.get('force'), bookmarks=bookmarks,
	soft=opts['soft'])

	return 0

tests/remotefilelog-library.sh

	CACHEDIR=$PWD/hgcache			CACHEDIR=$PWD/hgcache
	cat >> $HGRCPATH <<EOF			cat >> $HGRCPATH <<EOF
	[remotefilelog]			[remotefilelog]
	cachepath=$CACHEDIR			cachepath=$CACHEDIR
	debug=True			debug=True
	[extensions]			[extensions]
	remotefilelog=			remotefilelog=
	rebase=			rebase=
	strip=
	[ui]			[ui]
	ssh=python "$TESTDIR/dummyssh"			ssh=python "$TESTDIR/dummyssh"
	[server]			[server]
	preferuncompressed=True			preferuncompressed=True
	[experimental]			[experimental]
	changegroup3=True			changegroup3=True
	[rebase]			[rebase]
	singletransaction=True			singletransaction=True

tests/test-backout.t

	(2) revert by REV1^1			(2) revert by REV1^1
	(3) commit backing out revision (REV3)			(3) commit backing out revision (REV3)
	(4) update to REV2 (REV3 => REV2)			(4) update to REV2 (REV3 => REV2)
	(5) merge with REV3 (REV2 => REV2, REV3)			(5) merge with REV3 (REV2 => REV2, REV3)

	== test visibility to external preupdate hook			== test visibility to external preupdate hook

	$ hg update -q -C 2			$ hg update -q -C 2
	$ hg --config extensions.strip= strip 3			$ hg debugstrip 3
	saved backup bundle to * (glob)			saved backup bundle to * (glob)

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [hooks]			> [hooks]
	> preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate			> preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate
	> EOF			> EOF

	("-m" is needed to avoid writing dirstate changes out at other than			("-m" is needed to avoid writing dirstate changes out at other than
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [hooks]			> [hooks]
	> preupdate.visibility =			> preupdate.visibility =
	> EOF			> EOF

	== test visibility to external update hook			== test visibility to external update hook

	$ hg update -q -C 2			$ hg update -q -C 2
	$ hg --config extensions.strip= strip 3			$ hg debugstrip 3
	saved backup bundle to * (glob)			saved backup bundle to * (glob)

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [hooks]			> [hooks]
	> update.visibility = sh $TESTTMP/checkvisibility.sh update			> update.visibility = sh $TESTTMP/checkvisibility.sh update
	> EOF			> EOF

	$ hg backout --merge -d '3 0' 1 --tool=true -m 'fixed comment'			$ hg backout --merge -d '3 0' 1 --tool=true -m 'fixed comment'

tests/test-blackbox.t

	$ mv .hg/blackbox.log- .hg/blackbox.log			$ mv .hg/blackbox.log- .hg/blackbox.log

	backup bundles get logged			backup bundles get logged

	$ touch d			$ touch d
	$ hg commit -Amd			$ hg commit -Amd
	adding d			adding d
	created new head			created new head
	$ hg strip tip			$ hg debugstrip tip
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob)
	$ hg blackbox -l 6			$ hg blackbox -l 6
	1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip			1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> debugstrip tip
	1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg			1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg
	1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache (base) in * seconds (glob)			1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache (base) in * seconds (glob)
	1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (base) with 1 labels and 2 nodes			1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (base) with 1 labels and 2 nodes
	1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob)			1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> debugstrip tip exited 0 after * seconds (glob)
	1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6			1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6

	extension and python hooks - use the eol extension for a pythonhook			extension and python hooks - use the eol extension for a pythonhook

	$ echo '[extensions]' >> .hg/hgrc			$ echo '[extensions]' >> .hg/hgrc
	$ echo 'eol=' >> .hg/hgrc			$ echo 'eol=' >> .hg/hgrc
	$ echo '[hooks]' >> .hg/hgrc			$ echo '[hooks]' >> .hg/hgrc
	$ echo 'update = echo hooked' >> .hg/hgrc			$ echo 'update = echo hooked' >> .hg/hgrc

tests/test-bookmarks-pushpull.t

	searching for changed bookmarks			searching for changed bookmarks
	no changed bookmarks found			no changed bookmarks found
	[1]			[1]

	$ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1			$ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1
	$ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1			$ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1
	$ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1			$ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1
	$ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED			$ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED
	$ hg -R repo1 -q --config extensions.mq= strip 4			$ hg -R repo1 -q --config extensions.mq= debugstrip 4
	$ hg -R repo1 log -G --template '{node\|short} ({bookmarks})'			$ hg -R repo1 log -G --template '{node\|short} ({bookmarks})'
	o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED)			o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED)
	\|			\|
	\| o fa942426a6fd (ADV_ON_REPO1)			\| o fa942426a6fd (ADV_ON_REPO1)
	\|/			\|/
	\| o 66f7d451a68b (ADD_ON_REPO1 DIVERGED)			\| o 66f7d451a68b (ADD_ON_REPO1 DIVERGED)
	\|/			\|/
	o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME)			o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME)


	$ hg clone -U source repo2			$ hg clone -U source repo2
	$ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2			$ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2
	$ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2			$ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2
	$ hg -R repo2 bookmarks -f -r 2 DIVERGED			$ hg -R repo2 bookmarks -f -r 2 DIVERGED
	$ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2			$ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2
	$ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED			$ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED
	$ hg -R repo2 -q --config extensions.mq= strip 3			$ hg -R repo2 -q --config extensions.mq= debugstrip 3
	$ hg -R repo2 log -G --template '{node\|short} ({bookmarks})'			$ hg -R repo2 log -G --template '{node\|short} ({bookmarks})'
	o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED)			o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED)
	\|			\|
	\| o fa942426a6fd (DIVERGED)			\| o fa942426a6fd (DIVERGED)
	\|/			\|/
	\| o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2)			\| o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2)
	\|/			\|/
	o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME)			o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME)

tests/test-bookmarks-strip.t

	bookmarks updated?			bookmarks updated?

	$ hg book			$ hg book
	test 1:25e1ee7a0081			test 1:25e1ee7a0081
	test2 1:25e1ee7a0081			test2 1:25e1ee7a0081

	strip to revision 1			strip to revision 1

	$ hg strip 1			$ hg debugstrip 1
	saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)

	list bookmarks			list bookmarks

	$ hg book			$ hg book
	test 0:5c9ad3787638			test 0:5c9ad3787638
	test2 0:5c9ad3787638			test2 0:5c9ad3787638

tests/test-bookmarks.t

	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: 0			summary: 0

	$ hg book should-end-on-two			$ hg book should-end-on-two
	$ hg co --clean 4			$ hg co --clean 4
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	(leaving bookmark should-end-on-two)			(leaving bookmark should-end-on-two)
	$ hg book four			$ hg book four
	$ hg --config extensions.mq= strip 3			$ hg --config extensions.mq= debugstrip 3
	saved backup bundle to * (glob)			saved backup bundle to * (glob)
	should-end-on-two should end up pointing to revision 2, as that's the			should-end-on-two should end up pointing to revision 2, as that's the
	tipmost surviving ancestor of the stripped revision.			tipmost surviving ancestor of the stripped revision.
	$ hg log --graph			$ hg log --graph
	@ changeset: 3:9ba5f110a0b3			@ changeset: 3:9ba5f110a0b3
	\| branch: test			\| branch: test
	\| bookmark: four			\| bookmark: four
	\| tag: tip			\| tag: tip

tests/test-branches.t

	0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 \|...D...._@a.....\|			0040: ee bb 94 44 00 00 00 02 5f 40 61 bb 00 00 00 02 \|...D...._@a.....\|
	0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 \|..........cE....\|			0050: bf be 84 1b 00 00 00 02 d3 f1 63 45 80 00 00 02 \|..........cE....\|
	0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 \|.........;U.....\|			0060: e3 d4 9c 05 80 00 00 02 e2 3b 55 05 00 00 00 02 \|.........;U.....\|
	0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 \|...V.....Dv7....\|			0070: f8 94 c2 56 80 00 00 03 f3 44 76 37 00 00 00 05 \|...V.....Dv7....\|
	0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 \|.........4;.....\|			0080: a5 8c a5 d3 00 00 00 05 df 34 3b 0d 00 00 00 05 \|.........4;.....\|
	0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 \|.........!......\|			0090: c9 14 c9 9f 00 00 00 06 cd 21 a8 0b 80 00 00 05 \|.........!......\|
	cache is updated/truncated when stripping - it is thus very hard to get in a			cache is updated/truncated when stripping - it is thus very hard to get in a
	situation where the cache is out of sync and the hash check detects it			situation where the cache is out of sync and the hash check detects it
	$ hg --config extensions.strip= strip -r tip --nob			$ hg debugstrip -r tip --nob
	$ f --size .hg/cache/rbc-revs*			$ f --size .hg/cache/rbc-revs*
	.hg/cache/rbc-revs-v1: size=152			.hg/cache/rbc-revs-v1: size=152

	cache is rebuilt when corruption is detected			cache is rebuilt when corruption is detected
	$ echo > .hg/cache/rbc-names-v1			$ echo > .hg/cache/rbc-names-v1
	$ hg log -r '5:&branch(.)' -T '{rev} ' --debug			$ hg log -r '5:&branch(.)' -T '{rev} ' --debug
	referenced branch names not found - rebuilding revision branch cache from scratch			referenced branch names not found - rebuilding revision branch cache from scratch
	8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40			8 9 10 11 12 13 truncating cache/rbc-revs-v1 to 40

tests/test-bundle-phases.t

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [experimental]			> [experimental]
	> bundle-phases=yes			> bundle-phases=yes
	> [extensions]			> [extensions]
	> strip=
	> drawdag=$TESTDIR/drawdag.py			> drawdag=$TESTDIR/drawdag.py
	> EOF			> EOF

	Set up repo with linear history			Set up repo with linear history
	$ hg init linear			$ hg init linear
	$ cd linear			$ cd linear
	$ hg debugdrawdag <<'EOF'			$ hg debugdrawdag <<'EOF'
	> E			> E
	Stream params: {Compression: BZ}			Stream params: {Compression: BZ}
	changegroup -- {nbchanges: 3, targetphase: 2, version: 02} (mandatory: True)			changegroup -- {nbchanges: 3, targetphase: 2, version: 02} (mandatory: True)
	26805aba1e600a82e93661149f2313866a221a7b			26805aba1e600a82e93661149f2313866a221a7b
	f585351a92f85104bff7c284233c338b10eb1df7			f585351a92f85104bff7c284233c338b10eb1df7
	9bc730a19041f9ec7cb33c626e811aa233efb18c			9bc730a19041f9ec7cb33c626e811aa233efb18c
	cache:rev-branch-cache -- {} (mandatory: False)			cache:rev-branch-cache -- {} (mandatory: False)
	phase-heads -- {} (mandatory: True)			phase-heads -- {} (mandatory: True)
	26805aba1e600a82e93661149f2313866a221a7b draft			26805aba1e600a82e93661149f2313866a221a7b draft
	$ hg strip --no-backup C			$ hg debugstrip --no-backup C
	$ hg unbundle -q bundle			$ hg unbundle -q bundle
	$ rm bundle			$ rm bundle
	$ hg log -G -T '{desc} {phase}\n'			$ hg log -G -T '{desc} {phase}\n'
	o E secret			o E secret
	\|			\|
	o D secret			o D secret
	\|			\|
	o C draft			o C draft
	\|			\|
	o B draft			o B draft
	\|			\|
	o A public			o A public

	Root revision's phase is preserved			Root revision's phase is preserved
	$ hg bundle -a bundle			$ hg bundle -a bundle
	5 changesets found			5 changesets found
	$ hg strip --no-backup A			$ hg debugstrip --no-backup A
	$ hg unbundle -q bundle			$ hg unbundle -q bundle
	$ rm bundle			$ rm bundle
	$ hg log -G -T '{desc} {phase}\n'			$ hg log -G -T '{desc} {phase}\n'
	o E secret			o E secret
	\|			\|
	o D secret			o D secret
	\|			\|
	o C draft			o C draft
	\|			\|
	o B draft			o B draft
	\|			\|
	o A public			o A public

	Completely public history can be restored			Completely public history can be restored
	$ hg phase --public E			$ hg phase --public E
	$ hg bundle -a bundle			$ hg bundle -a bundle
	5 changesets found			5 changesets found
	$ hg strip --no-backup A			$ hg debugstrip --no-backup A
	$ hg unbundle -q bundle			$ hg unbundle -q bundle
	$ rm bundle			$ rm bundle
	$ hg log -G -T '{desc} {phase}\n'			$ hg log -G -T '{desc} {phase}\n'
	o E public			o E public
	\|			\|
	o D public			o D public
	\|			\|
	o C public			o C public
	\|			\|
	o B public			o B public
	\|			\|
	o A public			o A public

	Direct transition from public to secret can be restored			Direct transition from public to secret can be restored
	$ hg phase --secret --force D			$ hg phase --secret --force D
	$ hg bundle -a bundle			$ hg bundle -a bundle
	5 changesets found			5 changesets found
	$ hg strip --no-backup A			$ hg debugstrip --no-backup A
	$ hg unbundle -q bundle			$ hg unbundle -q bundle
	$ rm bundle			$ rm bundle
	$ hg log -G -T '{desc} {phase}\n'			$ hg log -G -T '{desc} {phase}\n'
	o E secret			o E secret
	\|			\|
	o D secret			o D secret
	\|			\|
	o C public			o C public
	\|			\|
	o B public			o B public
	\|			\|
	o A public			o A public

	Revisions within bundle preserve their phase even if parent changes its phase			Revisions within bundle preserve their phase even if parent changes its phase
	$ hg phase --draft --force B			$ hg phase --draft --force B
	$ hg bundle --base B -r E bundle			$ hg bundle --base B -r E bundle
	3 changesets found			3 changesets found
	$ hg strip --no-backup C			$ hg debugstrip --no-backup C
	$ hg phase --public B			$ hg phase --public B
	$ hg unbundle -q bundle			$ hg unbundle -q bundle
	$ rm bundle			$ rm bundle
	$ hg log -G -T '{desc} {phase}\n'			$ hg log -G -T '{desc} {phase}\n'
	o E secret			o E secret
	\|			\|
	o D secret			o D secret
	\|			\|
	o C draft			o C draft
	\|			\|
	o B public			o B public
	\|			\|
	o A public			o A public

	Phase of ancestors of stripped node get advanced to accommodate child			Phase of ancestors of stripped node get advanced to accommodate child
	$ hg bundle --base B -r E bundle			$ hg bundle --base B -r E bundle
	3 changesets found			3 changesets found
	$ hg strip --no-backup C			$ hg debugstrip --no-backup C
	$ hg phase --force --secret B			$ hg phase --force --secret B
	$ hg unbundle -q bundle			$ hg unbundle -q bundle
	$ rm bundle			$ rm bundle
	$ hg log -G -T '{desc} {phase}\n'			$ hg log -G -T '{desc} {phase}\n'
	o E secret			o E secret
	\|			\|
	o D secret			o D secret
	\|			\|
	\|			\|
	o C draft			o C draft
	\|			\|
	o B draft			o B draft
	\|			\|
	o A public			o A public

	Unbundling change in the middle of a stack does not affect later changes			Unbundling change in the middle of a stack does not affect later changes
	$ hg strip --no-backup E			$ hg debugstrip --no-backup E
	$ hg phase --secret --force D			$ hg phase --secret --force D
	$ hg log -G -T '{desc} {phase}\n'			$ hg log -G -T '{desc} {phase}\n'
	o D secret			o D secret
	\|			\|
	o C draft			o C draft
	\|			\|
	o B draft			o B draft
	\|			\|
	112478962961147124edd43549aedd1a335e44bf			112478962961147124edd43549aedd1a335e44bf
	dc0947a82db884575bb76ea10ac97b08536bfa03			dc0947a82db884575bb76ea10ac97b08536bfa03
	4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4			4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
	03ca77807e919db8807c3749086dc36fb478cac0			03ca77807e919db8807c3749086dc36fb478cac0
	cache:rev-branch-cache -- {} (mandatory: False)			cache:rev-branch-cache -- {} (mandatory: False)
	phase-heads -- {} (mandatory: True)			phase-heads -- {} (mandatory: True)
	dc0947a82db884575bb76ea10ac97b08536bfa03 public			dc0947a82db884575bb76ea10ac97b08536bfa03 public
	03ca77807e919db8807c3749086dc36fb478cac0 draft			03ca77807e919db8807c3749086dc36fb478cac0 draft
	$ hg strip --no-backup A			$ hg debugstrip --no-backup A
	$ hg unbundle -q bundle			$ hg unbundle -q bundle
	$ rm bundle			$ rm bundle
	$ hg log -G -T '{node\|short} {desc} {phase}\n'			$ hg log -G -T '{node\|short} {desc} {phase}\n'
	o 03ca77807e91 E draft			o 03ca77807e91 E draft
	\|			\|
	\| o 4e4f9194f9f1 D secret			\| o 4e4f9194f9f1 D secret
	\|/\|			\|/\|
	o \| dc0947a82db8 C public			o \| dc0947a82db8 C public

tests/test-commandserver.t

	>>> import os			>>> import os
	>>> from hgclient import bprint, check, readchannel, runcommand			>>> from hgclient import bprint, check, readchannel, runcommand
	>>> @check			>>> @check
	... def phasesetscacheafterstrip(server):			... def phasesetscacheafterstrip(server):
	... readchannel(server)			... readchannel(server)
	... # load _phasecache._phaserevs and _phasesets			... # load _phasecache._phaserevs and _phasesets
	... runcommand(server, [b'log', b'-qr', b'draft()'])			... runcommand(server, [b'log', b'-qr', b'draft()'])
	... # strip cached revisions by another process			... # strip cached revisions by another process
	... os.system('hg --config extensions.strip= strip -q 5')			... os.system('hg debugstrip -q 5')
	... # shouldn't abort by "unknown revision '6'"			... # shouldn't abort by "unknown revision '6'"
	... runcommand(server, [b'log', b'-qr', b'draft()'])			... runcommand(server, [b'log', b'-qr', b'draft()'])
	... bprint(b'')			... bprint(b'')
	*** runcommand log -qr draft()			*** runcommand log -qr draft()
	4:7966c8e3734d			4:7966c8e3734d
	5:41f6602d1c4f			5:41f6602d1c4f
	6:10501e202c35			6:10501e202c35
	*** runcommand log -qr draft()			*** runcommand log -qr draft()
	... runcommand(server, [b'log', b'-Gq'])			... runcommand(server, [b'log', b'-Gq'])
	...			...
	... # make it public; draft marker moves to 4:7966c8e3734d			... # make it public; draft marker moves to 4:7966c8e3734d
	... runcommand(server, [b'phase', b'-p', b'.'])			... runcommand(server, [b'phase', b'-p', b'.'])
	... # load _phasecache.phaseroots			... # load _phasecache.phaseroots
	... runcommand(server, [b'phase', b'.'], outfilter=sep)			... runcommand(server, [b'phase', b'.'], outfilter=sep)
	...			...
	... # strip 1::4 outside server			... # strip 1::4 outside server
	... os.system('hg -q --config extensions.mq= strip 1')			... os.system('hg -q --config extensions.mq= debugstrip 1')
	...			...
	... # shouldn't raise "7966c8e3734d: no node!"			... # shouldn't raise "7966c8e3734d: no node!"
	... runcommand(server, [b'branches'])			... runcommand(server, [b'branches'])
	*** runcommand update -C 0			*** runcommand update -C 0
	1 files updated, 0 files merged, 2 files removed, 0 files unresolved			1 files updated, 0 files merged, 2 files removed, 0 files unresolved
	(leaving bookmark bm3)			(leaving bookmark bm3)
	*** runcommand commit -Am. a			*** runcommand commit -Am. a
	created new head			created new head

tests/test-completion.t

	debugrename			debugrename
	debugrevlog			debugrevlog
	debugrevlogindex			debugrevlogindex
	debugrevspec			debugrevspec
	debugserve			debugserve
	debugsetparents			debugsetparents
	debugsidedata			debugsidedata
	debugssl			debugssl
				debugstrip
	debugsub			debugsub
	debugsuccessorssets			debugsuccessorssets
	debugtemplate			debugtemplate
	debuguigetpass			debuguigetpass
	debuguiprompt			debuguiprompt
	debugupdatecaches			debugupdatecaches
	debugupgraderepo			debugupgraderepo
	debugwalk			debugwalk
	debugrename: rev			debugrename: rev
	debugrevlog: changelog, manifest, dir, dump			debugrevlog: changelog, manifest, dir, dump
	debugrevlogindex: changelog, manifest, dir, format			debugrevlogindex: changelog, manifest, dir, format
	debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized			debugrevspec: optimize, show-revs, show-set, show-stage, no-optimized, verify-optimized
	debugserve: sshstdio, logiofd, logiofile			debugserve: sshstdio, logiofd, logiofile
	debugsetparents:			debugsetparents:
	debugsidedata: changelog, manifest, dir			debugsidedata: changelog, manifest, dir
	debugssl:			debugssl:
				debugstrip: rev, force, no-backup, nobackup, , keep, bookmark, soft
	debugsub: rev			debugsub: rev
	debugsuccessorssets: closest			debugsuccessorssets: closest
	debugtemplate: rev, define			debugtemplate: rev, define
	debuguigetpass: prompt			debuguigetpass: prompt
	debuguiprompt: prompt			debuguiprompt: prompt
	debugupdatecaches:			debugupdatecaches:
	debugupgraderepo: optimize, run, backup, changelog, manifest			debugupgraderepo: optimize, run, backup, changelog, manifest
	debugwalk: include, exclude			debugwalk: include, exclude

tests/test-convert-filemap.t


	$ glog -R namedbranch-hg			$ glog -R namedbranch-hg
	o 1:cda818e7219b@default "changea" files: a			o 1:cda818e7219b@default "changea" files: a
	\|			\|
	o 0:c334dc3be0da@default "add" files: a			o 0:c334dc3be0da@default "add" files: a


	$ cd namedbranch			$ cd namedbranch
	$ hg --config extensions.mq= strip tip			$ hg --config extensions.mq= debugstrip tip
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg			saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg
	$ hg up foo			$ hg up foo
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge default			$ hg merge default
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m merge			$ hg ci -m merge

tests/test-convert-svn-sink.t

	msg: move symlink			msg: move symlink
	D /link			D /link
	A /newlink (from /link@7)			A /newlink (from /link@7)

	Make sure our changes don't affect the rest of the test cases			Make sure our changes don't affect the rest of the test cases

	$ hg --cwd a up 5			$ hg --cwd a up 5
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg --cwd a --config extensions.strip= strip -r 6			$ hg --cwd a debugstrip -r 6
	saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-ed505e42-backup.hg			saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-ed505e42-backup.hg

	#endif			#endif

	Convert with --full adds and removes files that didn't change			Convert with --full adds and removes files that didn't change

	$ touch a/f			$ touch a/f
	$ hg -R a ci -Aqmf			$ hg -R a ci -Aqmf

tests/test-copy-move-merge.t


	$ cat b			$ cat b
	0			0
	1			1
	2			2

	- next verify copy metadata is lost when disabled			- next verify copy metadata is lost when disabled

	$ hg strip -r . --config extensions.strip=			$ hg debugstrip -r .
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg			saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg
	$ hg up -qC 2			$ hg up -qC 2
	$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF			$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF
	> c			> c
	> EOF			> EOF
	rebasing 2:add3f11052fa "other" (tip)			rebasing 2:add3f11052fa "other" (tip)
	file 'a' was deleted in local [dest] but was modified in other [source].			file 'a' was deleted in local [dest] but was modified in other [source].

tests/test-debugcommands.t

	4 1			4 1
	5 1			5 1
	6 1			6 1
	7 1			7 1
	8 1			8 1
	9 1			9 1
	10 2			10 2
	11 1			11 1
	$ hg --config extensions.strip= strip --no-backup -r 1			$ hg debugstrip --no-backup -r 1
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Test max chain len			Test max chain len
	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [format]			> [format]
	> maxchainlen=4			> maxchainlen=4
	> EOF			> EOF

tests/test-debugstrip.t

This file was copied from tests/test-strip.t.

	$ echo "[extensions]" >> $HGRCPATH			$ echo "[extensions]" >> $HGRCPATH
	$ echo "strip=" >> $HGRCPATH
	$ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH			$ echo "drawdag=$TESTDIR/drawdag.py" >> $HGRCPATH

	$ restore() {			$ restore() {
	> hg unbundle -q .hg/strip-backup/*			> hg unbundle -q .hg/strip-backup/*
	> rm .hg/strip-backup/*			> rm .hg/strip-backup/*
	> }			> }
	$ teststrip() {			$ teststrip() {
	> hg up -C $1			> hg up -C $1
	> echo % before update $1, strip $2			> echo % before update $1, debugstrip $2
	> hg log -G -T '{rev}:{node}'			> hg log -G -T '{rev}:{node}'
	> hg --traceback strip $2			> hg --traceback debugstrip $2
	> echo % after update $1, strip $2			> echo % after update $1, debugstrip $2
	> hg log -G -T '{rev}:{node}'			> hg log -G -T '{rev}:{node}'
	> restore			> restore
	> }			> }

	$ hg init test			$ hg init test
	$ cd test			$ cd test

	$ echo foo > bar			$ echo foo > bar
	changeset: 0:9ab35a2d17cb			changeset: 0:9ab35a2d17cb
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a


	$ teststrip 4 4			$ teststrip 4 4
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	% before update 4, strip 4			% before update 4, debugstrip 4
	@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\|			\|
	o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64			o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	\| o 2:264128213d290d868c54642d13aeaa3675551a78			\| o 2:264128213d290d868c54642d13aeaa3675551a78
	\|/			\|/
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	% after update 4, strip 4			% after update 4, debugstrip 4
	@ 3:65bd5f99a4a376cdea23a1153f07856b0d881d64			@ 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	\| o 2:264128213d290d868c54642d13aeaa3675551a78			\| o 2:264128213d290d868c54642d13aeaa3675551a78
	\|/			\|/
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	$ teststrip 4 3			$ teststrip 4 3
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	% before update 4, strip 3			% before update 4, debugstrip 3
	@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\|			\|
	o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64			o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	\| o 2:264128213d290d868c54642d13aeaa3675551a78			\| o 2:264128213d290d868c54642d13aeaa3675551a78
	\|/			\|/
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	% after update 4, strip 3			% after update 4, debugstrip 3
	o 2:264128213d290d868c54642d13aeaa3675551a78			o 2:264128213d290d868c54642d13aeaa3675551a78
	\|			\|
	@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a			@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	$ teststrip 1 4			$ teststrip 1 4
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	% before update 1, strip 4			% before update 1, debugstrip 4
	o 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			o 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\|			\|
	o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64			o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	\| o 2:264128213d290d868c54642d13aeaa3675551a78			\| o 2:264128213d290d868c54642d13aeaa3675551a78
	\|/			\|/
	@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a			@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	% after update 1, strip 4			% after update 1, debugstrip 4
	o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64			o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	\| o 2:264128213d290d868c54642d13aeaa3675551a78			\| o 2:264128213d290d868c54642d13aeaa3675551a78
	\|/			\|/
	@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a			@ 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	$ teststrip 4 2			$ teststrip 4 2
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	% before update 4, strip 2			% before update 4, debugstrip 2
	@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			@ 4:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\|			\|
	o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64			o 3:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	\| o 2:264128213d290d868c54642d13aeaa3675551a78			\| o 2:264128213d290d868c54642d13aeaa3675551a78
	\|/			\|/
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	% after update 4, strip 2			% after update 4, debugstrip 2
	@ 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			@ 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\|			\|
	o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64			o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	$ teststrip 4 1			$ teststrip 4 1
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	% before update 4, strip 1			% before update 4, debugstrip 1
	@ 4:264128213d290d868c54642d13aeaa3675551a78			@ 4:264128213d290d868c54642d13aeaa3675551a78
	\|			\|
	\| o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			\| o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\| \|			\| \|
	\| o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64			\| o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|/			\|/
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	% after update 4, strip 1			% after update 4, debugstrip 1
	@ 0:9ab35a2d17cb64271241ea881efcc19dd953215b			@ 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	$ teststrip null 4			$ teststrip null 4
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	% before update null, strip 4			% before update null, debugstrip 4
	o 4:264128213d290d868c54642d13aeaa3675551a78			o 4:264128213d290d868c54642d13aeaa3675551a78
	\|			\|
	\| o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			\| o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\| \|			\| \|
	\| o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64			\| o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|/			\|/
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	% after update null, strip 4			% after update null, debugstrip 4
	o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce			o 3:443431ffac4f5b5a19b0b6c298a21b7ba736bcce
	\|			\|
	o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64			o 2:65bd5f99a4a376cdea23a1153f07856b0d881d64
	\|			\|
	o 1:ef3a871183d7199c541cc140218298bbfcc6c28a			o 1:ef3a871183d7199c541cc140218298bbfcc6c28a
	\|			\|
	o 0:9ab35a2d17cb64271241ea881efcc19dd953215b			o 0:9ab35a2d17cb64271241ea881efcc19dd953215b

	changeset: 4:264128213d29			changeset: 4:264128213d29
	tag: tip			tag: tip
	parent: 1:ef3a871183d7			parent: 1:ef3a871183d7
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: c			summary: c


	$ hg --traceback strip 4			$ hg --traceback debugstrip 4
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg			saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg
	$ hg parents			$ hg parents
	changeset: 1:ef3a871183d7			changeset: 1:ef3a871183d7
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: b			summary: b

	changeset: 4:264128213d29			changeset: 4:264128213d29
	tag: tip			tag: tip
	parent: 1:ef3a871183d7			parent: 1:ef3a871183d7
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: c			summary: c

	##strip not allowed with merge in progress			##strip not allowed with merge in progress
	$ hg strip 4			$ hg debugstrip 4
	abort: outstanding uncommitted merge			abort: outstanding uncommitted merge
	(use 'hg commit' or 'hg merge --abort')			(use 'hg commit' or 'hg merge --abort')
	[255]			[255]
	##strip allowed --force with merge in progress			##strip allowed --force with merge in progress
	$ hg strip 4 --force			$ hg debugstrip 4 --force
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)

	after strip of merge parent			after strip of merge parent

	$ hg parents			$ hg parents
	changeset: 1:ef3a871183d7			changeset: 1:ef3a871183d7
	user: test			user: test
	o changeset: 0:9ab35a2d17cb			o changeset: 0:9ab35a2d17cb
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a


	2 is parent of 3, only one strip should happen			2 is parent of 3, only one strip should happen

	$ hg strip "roots(2)" 3			$ hg debugstrip "roots(2)" 3
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	$ hg log -G			$ hg log -G
	@ changeset: 2:264128213d29			@ changeset: 2:264128213d29
	\| tag: tip			\| tag: tip
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: c			\| summary: c
	\|			\|
	\|			\|
	o changeset: 0:9ab35a2d17cb			o changeset: 0:9ab35a2d17cb
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a

	Failed hook while applying "saveheads" bundle.			Failed hook while applying "saveheads" bundle.

	$ hg strip 2 --config hooks.pretxnchangegroup.bad=false			$ hg debugstrip 2 --config hooks.pretxnchangegroup.bad=false
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	transaction abort!			transaction abort!
	rollback completed			rollback completed
	strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob)			strip failed, backup bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob)
	strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob)			strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob)
	(fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob)			(fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob)
	abort: pretxnchangegroup.bad hook exited with status 1			abort: pretxnchangegroup.bad hook exited with status 1
	o changeset: 0:9ab35a2d17cb			o changeset: 0:9ab35a2d17cb
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a


	2 different branches: 2 strips			2 different branches: 2 strips

	$ hg strip 2 4			$ hg debugstrip 2 4
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	$ hg log -G			$ hg log -G
	o changeset: 2:65bd5f99a4a3			o changeset: 2:65bd5f99a4a3
	\| tag: tip			\| tag: tip
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: d			\| summary: d
	\|			\|
	@ changeset: 1:ef3a871183d7			@ changeset: 1:ef3a871183d7
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: b			\| summary: b
	\|			\|
	o changeset: 0:9ab35a2d17cb			o changeset: 0:9ab35a2d17cb
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a

	$ restore			$ restore

	2 different branches and a common ancestor: 1 strip			2 different branches and a common ancestor: 1 strip

	$ hg strip 1 "2\|4"			$ hg debugstrip 1 "2\|4"
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	$ restore			$ restore

	verify fncache is kept up-to-date			verify fncache is kept up-to-date

	$ touch a			$ touch a
	$ hg ci -qAm a			$ hg ci -qAm a
	#if repofncache			#if repofncache
	$ cat .hg/store/fncache \| sort			$ cat .hg/store/fncache \| sort
	data/a.i			data/a.i
	data/bar.i			data/bar.i
	#endif			#endif

	$ hg strip tip			$ hg debugstrip tip
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	#if repofncache			#if repofncache
	$ cat .hg/store/fncache			$ cat .hg/store/fncache
	data/bar.i			data/bar.i
	#endif			#endif

	stripping an empty revset			stripping an empty revset

	$ hg strip "1 and not 1"			$ hg debugstrip "1 and not 1"
	abort: empty revision set			abort: empty revision set
	[255]			[255]

	remove branchy history for qimport tests			remove branchy history for qimport tests

	$ hg strip 3			$ hg debugstrip 3
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)


	strip of applied mq should cleanup status file			strip of applied mq should cleanup status file

	$ echo "mq=" >> $HGRCPATH			$ echo "mq=" >> $HGRCPATH
	$ hg up -C 3			$ hg up -C 3
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo fooagain >> bar			$ echo fooagain >> bar
	$ hg ci -mf			$ hg ci -mf
	$ hg qimport -r tip:2			$ hg qimport -r tip:2

	applied patches before strip			applied patches before strip

	$ hg qapplied			$ hg qapplied
	d			d
	e			e
	f			f

	stripping revision in queue			stripping revision in queue

	$ hg strip 3			$ hg debugstrip 3
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)

	applied patches after stripping rev in queue			applied patches after stripping rev in queue

	$ hg qapplied			$ hg qapplied
	d			d

	stripping ancestor of queue			stripping ancestor of queue

	$ hg strip 1			$ hg debugstrip 1
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)

	applied patches after stripping ancestor of queue			applied patches after stripping ancestor of queue

	$ hg qapplied			$ hg qapplied

	Verify strip protects against stripping wc parent when there are uncommitted mods			Verify strip protects against stripping wc parent when there are uncommitted mods
	b			b
	branch: default			branch: default
	commit: 1 modified, 1 unknown, 1 unresolved			commit: 1 modified, 1 unknown, 1 unresolved
	update: (current)			update: (current)
	phases: 2 draft			phases: 2 draft
	mq: 3 unapplied			mq: 3 unapplied

	$ echo c > b			$ echo c > b
	$ hg strip tip			$ hg debugstrip tip
	abort: uncommitted changes			abort: uncommitted changes
	[255]			[255]
	$ hg strip tip --keep			$ hg debugstrip tip --keep
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	$ hg log --graph			$ hg log --graph
	@ changeset: 0:9ab35a2d17cb			@ changeset: 0:9ab35a2d17cb
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a

	$ touch c			$ touch c

	... with a clean working dir			... with a clean working dir

	$ hg add c			$ hg add c
	$ hg rm bar			$ hg rm bar
	$ hg commit -mc			$ hg commit -mc
	$ hg status			$ hg status
	$ hg strip --keep tip			$ hg debugstrip --keep tip
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	$ hg status			$ hg status
	! bar			! bar
	? c			? c

	... with a dirty working dir			... with a dirty working dir

	$ hg add c			$ hg add c
	$ hg rm bar			$ hg rm bar
	$ hg commit -mc			$ hg commit -mc
	$ hg status			$ hg status
	$ echo b > b			$ echo b > b
	$ echo d > d			$ echo d > d
	$ hg strip --keep tip			$ hg debugstrip --keep tip
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
	$ hg status			$ hg status
	M b			M b
	! bar			! bar
	? c			? c
	? d			? d

	... after updating the dirstate			... after updating the dirstate
	$ hg add c			$ hg add c
	$ hg commit -mc			$ hg commit -mc
	$ hg rm c			$ hg rm c
	$ hg commit -mc			$ hg commit -mc
	$ hg strip --keep '.^' -q			$ hg debugstrip --keep '.^' -q
	$ cd ..			$ cd ..

	stripping many nodes on a complex graph (issue3299)			stripping many nodes on a complex graph (issue3299)

	$ hg init issue3299			$ hg init issue3299
	$ cd issue3299			$ cd issue3299
	$ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a'			$ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a'
	$ hg strip 'not ancestors(x)'			$ hg debugstrip 'not ancestors(x)'
	saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob)

	test hg strip -B bookmark			test hg debugstrip -B bookmark

	$ cd ..			$ cd ..
	$ hg init bookmarks			$ hg init bookmarks
	$ cd bookmarks			$ cd bookmarks
	$ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f'			$ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b<m+2:d<2.:e<m+1:f'
	$ hg bookmark -r 'a' 'todelete'			$ hg bookmark -r 'a' 'todelete'
	$ hg bookmark -r 'b' 'B'			$ hg bookmark -r 'b' 'B'
	$ hg bookmark -r 'b' 'nostrip'			$ hg bookmark -r 'b' 'nostrip'
	$ hg bookmark -r 'c' 'delete'			$ hg bookmark -r 'c' 'delete'
	$ hg bookmark -r 'd' 'multipledelete1'			$ hg bookmark -r 'd' 'multipledelete1'
	$ hg bookmark -r 'e' 'multipledelete2'			$ hg bookmark -r 'e' 'multipledelete2'
	$ hg bookmark -r 'f' 'singlenode1'			$ hg bookmark -r 'f' 'singlenode1'
	$ hg bookmark -r 'f' 'singlenode2'			$ hg bookmark -r 'f' 'singlenode2'
	$ hg up -C todelete			$ hg up -C todelete
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(activating bookmark todelete)			(activating bookmark todelete)
	$ hg strip -B nostrip			$ hg debugstrip -B nostrip
	bookmark 'nostrip' deleted			bookmark 'nostrip' deleted
	abort: empty revision set			abort: empty revision set
	[255]			[255]
	$ hg strip -B todelete			$ hg debugstrip -B todelete
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
	bookmark 'todelete' deleted			bookmark 'todelete' deleted
	$ hg id -ir dcbb326fdec2			$ hg id -ir dcbb326fdec2
	abort: unknown revision 'dcbb326fdec2'!			abort: unknown revision 'dcbb326fdec2'!
	[255]			[255]
	$ hg id -ir d62d843c9a01			$ hg id -ir d62d843c9a01
	d62d843c9a01			d62d843c9a01
	$ hg bookmarks			$ hg bookmarks
	B 9:ff43616e5d0f			B 9:ff43616e5d0f
	delete 6:2702dd0c91e7			delete 6:2702dd0c91e7
	multipledelete1 11:e46a4836065c			multipledelete1 11:e46a4836065c
	multipledelete2 12:b4594d867745			multipledelete2 12:b4594d867745
	singlenode1 13:43227190fef8			singlenode1 13:43227190fef8
	singlenode2 13:43227190fef8			singlenode2 13:43227190fef8
	$ hg strip -B multipledelete1 -B multipledelete2			$ hg debugstrip -B multipledelete1 -B multipledelete2
	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg			saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg
	bookmark 'multipledelete1' deleted			bookmark 'multipledelete1' deleted
	bookmark 'multipledelete2' deleted			bookmark 'multipledelete2' deleted
	$ hg id -ir e46a4836065c			$ hg id -ir e46a4836065c
	abort: unknown revision 'e46a4836065c'!			abort: unknown revision 'e46a4836065c'!
	[255]			[255]
	$ hg id -ir b4594d867745			$ hg id -ir b4594d867745
	abort: unknown revision 'b4594d867745'!			abort: unknown revision 'b4594d867745'!
	[255]			[255]
	$ hg strip -B singlenode1 -B singlenode2			$ hg debugstrip -B singlenode1 -B singlenode2
	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg			saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg
	bookmark 'singlenode1' deleted			bookmark 'singlenode1' deleted
	bookmark 'singlenode2' deleted			bookmark 'singlenode2' deleted
	$ hg id -ir 43227190fef8			$ hg id -ir 43227190fef8
	abort: unknown revision '43227190fef8'!			abort: unknown revision '43227190fef8'!
	[255]			[255]
	$ hg strip -B unknownbookmark			$ hg debugstrip -B unknownbookmark
	abort: bookmark 'unknownbookmark' not found			abort: bookmark 'unknownbookmark' not found
	[255]			[255]
	$ hg strip -B unknownbookmark1 -B unknownbookmark2			$ hg debugstrip -B unknownbookmark1 -B unknownbookmark2
	abort: bookmark 'unknownbookmark1,unknownbookmark2' not found			abort: bookmark 'unknownbookmark1,unknownbookmark2' not found
	[255]			[255]
	$ hg strip -B delete -B unknownbookmark			$ hg debugstrip -B delete -B unknownbookmark
	abort: bookmark 'unknownbookmark' not found			abort: bookmark 'unknownbookmark' not found
	[255]			[255]
	$ hg strip -B delete			$ hg debugstrip -B delete
	saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
	bookmark 'delete' deleted			bookmark 'delete' deleted
	$ hg id -ir 6:2702dd0c91e7			$ hg id -ir 6:2702dd0c91e7
	abort: unknown revision '2702dd0c91e7'!			abort: unknown revision '2702dd0c91e7'!
	[255]			[255]
	$ hg update B			$ hg update B
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(activating bookmark B)			(activating bookmark B)
	$ echo a > a			$ echo a > a
	$ hg add a			$ hg add a
	$ hg strip -B B			$ hg debugstrip -B B
	abort: uncommitted changes			abort: uncommitted changes
	[255]			[255]
	$ hg bookmarks			$ hg bookmarks
	* B 6:ff43616e5d0f			* B 6:ff43616e5d0f

	Make sure no one adds back a -b option:			Make sure no one adds back a -b option:

	$ hg strip -b tip			$ hg debugstrip -b tip
	hg strip: option -b not recognized			hg debugstrip: option -b not recognized
	hg strip [-k] [-f] [-B bookmark] [-r] REV...			hg strip [-k] [-f] [-B bookmark] [-r] REV...

	strip changesets and all their descendants from the repository			strip changesets and all their descendants from the repository

	(use 'hg help -e strip' to show help for the strip extension)

	options ([+] can be repeated):			options ([+] can be repeated):

	-r --rev REV [+] strip specified revision (optional, can specify			-r --rev REV [+] strip specified revision (optional, can specify
	revisions without this option)			revisions without this option)
	-f --force force removal of changesets, discard uncommitted			-f --force force removal of changesets, discard uncommitted
	changes (no backup)			changes (no backup)
	--no-backup do not save backup bundle			--no-backup do not save backup bundle
	-k --keep do not modify working directory during strip			-k --keep do not modify working directory during strip
	-B --bookmark BOOKMARK [+] remove revs only reachable from given bookmark			-B --bookmark BOOKMARK [+] remove revs only reachable from given bookmark
	--mq operate on patch repository			--mq operate on patch repository

	(use 'hg strip -h' to show more help)			(use 'hg debugstrip -h' to show more help)
	[255]			[255]

	$ cd ..			$ cd ..

	Verify bundles don't get overwritten:			Verify bundles don't get overwritten:

	$ hg init doublebundle			$ hg init doublebundle
	$ cd doublebundle			$ cd doublebundle
	$ touch a			$ touch a
	$ hg commit -Aqm a			$ hg commit -Aqm a
	$ touch b			$ touch b
	$ hg commit -Aqm b			$ hg commit -Aqm b
	$ hg strip -r 0			$ hg debugstrip -r 0
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg			saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg
	$ ls .hg/strip-backup			$ ls .hg/strip-backup
	3903775176ed-e68910bd-backup.hg			3903775176ed-e68910bd-backup.hg
	#if repobundlerepo			#if repobundlerepo
	$ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg			$ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
	$ hg strip -r 0			$ hg debugstrip -r 0
	saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg			saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg
	$ ls .hg/strip-backup			$ ls .hg/strip-backup
	3903775176ed-54390173-backup.hg			3903775176ed-54390173-backup.hg
	3903775176ed-e68910bd-backup.hg			3903775176ed-e68910bd-backup.hg
	#endif			#endif
	$ cd ..			$ cd ..

	Test that we only bundle the stripped changesets (issue4736)			Test that we only bundle the stripped changesets (issue4736)
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: mergeCD			summary: mergeCD

	#endif			#endif

	check strip behavior			check strip behavior

	$ hg --config extensions.strip= strip 'desc(commitD)' --debug			$ hg debugstrip 'desc(commitD)' --debug
	resolving manifests			resolving manifests
	branchmerge: False, force: True, partial: False			branchmerge: False, force: True, partial: False
	ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71			ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71
	c: other deleted -> r			c: other deleted -> r
	removing c			removing c
	d: other deleted -> r			d: other deleted -> r
	removing d			removing d
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo k > k			$ echo k > k
	$ hg add k			$ hg add k
	$ hg commit -m commitK			$ hg commit -m commitK
	$ echo l > l			$ echo l > l
	$ hg add l			$ hg add l
	$ hg commit -m commitL			$ hg commit -m commitL
	$ hg book -r tip blah			$ hg book -r tip blah
	$ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py			$ hg debugstrip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg			saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg
	$ hg up -C 1			$ hg up -C 1
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved

	Error during post-close callback of the strip transaction			Error during post-close callback of the strip transaction
	(They should be gracefully handled and reported)			(They should be gracefully handled and reported)

	$ cat > ../crashstrip.py << EOF			$ cat > ../crashstrip.py << EOF
	> from mercurial import error			> from mercurial import error
	> def reposetup(ui, repo):			> def reposetup(ui, repo):
	> class crashstriprepo(repo.__class__):			> class crashstriprepo(repo.__class__):
	> def transaction(self, desc, args, *kwargs):			> def transaction(self, desc, args, *kwargs):
	> tr = super(crashstriprepo, self).transaction(desc, args, *kwargs)			> tr = super(crashstriprepo, self).transaction(desc, args, *kwargs)
	> if desc == b'strip':			> if desc == b'strip':
	> def crash(tra): raise error.Abort(b'boom')			> def crash(tra): raise error.Abort(b'boom')
	> tr.addpostclose(b'crash', crash)			> tr.addpostclose(b'crash', crash)
	> return tr			> return tr
	> repo.__class__ = crashstriprepo			> repo.__class__ = crashstriprepo
	> EOF			> EOF
	$ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py			$ hg debugstrip tip --config extensions.crash=$TESTTMP/crashstrip.py
	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg			saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg
	strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg'			strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg'
	abort: boom			abort: boom
	[255]			[255]

	test stripping a working directory parent doesn't switch named branches			test stripping a working directory parent doesn't switch named branches

	$ hg log -G			$ hg log -G
	\| summary: commitB			\| summary: commitB
	\|			\|
	o changeset: 0:105141ef12d0			o changeset: 0:105141ef12d0
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: commitA			summary: commitA


	$ hg strip --force -r 35358f982181			$ hg debugstrip --force -r 35358f982181
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg			saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg
	$ hg log -G			$ hg log -G
	@ changeset: 3:f62c6c09b707			@ changeset: 3:f62c6c09b707
	\| branch: new-branch			\| branch: new-branch
	\| tag: tip			\| tag: tip
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: commitB			\| summary: commitB
	\|			\|
	o changeset: 0:105141ef12d0			o changeset: 0:105141ef12d0
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: commitA			summary: commitA


	$ hg strip -r 35358f982181			$ hg debugstrip -r 35358f982181
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg			saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
	$ hg log -G			$ hg log -G
	@ changeset: 3:f62c6c09b707			@ changeset: 3:f62c6c09b707
	\| branch: new-branch			\| branch: new-branch
	\| tag: tip			\| tag: tip
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	$ hg unbundle -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg			$ hg unbundle -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 2 changesets with 1 changes to 1 files			added 2 changesets with 1 changes to 1 files
	new changesets 35358f982181:4cf5e92caec2 (2 drafts)			new changesets 35358f982181:4cf5e92caec2 (2 drafts)
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	$ hg strip -k -r 35358f982181			$ hg debugstrip -k -r 35358f982181
	saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg			saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
	$ hg log -G			$ hg log -G
	@ changeset: 3:f62c6c09b707			@ changeset: 3:f62c6c09b707
	\| branch: new-branch			\| branch: new-branch
	\| tag: tip			\| tag: tip
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: foo			\| summary: foo
	> [experimental]			> [experimental]
	> evolution=true			> evolution=true
	> EOF			> EOF
	$ echo a > a			$ echo a > a
	$ hg ci -Aqm a			$ hg ci -Aqm a
	$ hg ci --amend -m a2			$ hg ci --amend -m a2
	$ hg debugobsolete			$ hg debugobsolete
	cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}			cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
	$ hg strip .			$ hg debugstrip .
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg			saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg
	$ hg unbundle -q .hg/strip-backup/*			$ hg unbundle -q .hg/strip-backup/*
	$ hg debugobsolete			$ hg debugobsolete
	cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}			cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
	$ cd ..			$ cd ..

tests/test-exchange-obsmarkers-case-D1.t

	created new head			created new head
	$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`			$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
	1 new obsolescence markers			1 new obsolescence markers
	obsoleted 1 changesets			obsoleted 1 changesets
	1 new orphan changesets			1 new orphan changesets
	$ hg prune -d '0 0' 'desc(B)'			$ hg prune -d '0 0' 'desc(B)'
	1 new obsolescence markers			1 new obsolescence markers
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg strip --hidden -q 'desc(A0)'			$ hg debugstrip --hidden -q 'desc(A0)'
	$ hg log -G --hidden			$ hg log -G --hidden
	@ e5ea8f9c7314 (draft): A1			@ e5ea8f9c7314 (draft): A1
	\|			\|
	o a9bdc8b26820 (public): O			o a9bdc8b26820 (public): O

	$ inspect_obsmarkers			$ inspect_obsmarkers
	obsstore content			obsstore content
	================			================

tests/test-exchange-obsmarkers-case-D2.t

	$ mkcommit A1			$ mkcommit A1
	created new head			created new head
	$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`			$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
	1 new obsolescence markers			1 new obsolescence markers
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg prune --date '0 0' .			$ hg prune --date '0 0' .
	1 new obsolescence markers			1 new obsolescence markers
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg strip --hidden -q 'desc(A1)'			$ hg debugstrip --hidden -q 'desc(A1)'
	$ hg log -G --hidden			$ hg log -G --hidden
	x 28b51eb45704 (draft): A0			x 28b51eb45704 (draft): A0
	\|			\|
	@ a9bdc8b26820 (public): O			@ a9bdc8b26820 (public): O

	$ inspect_obsmarkers			$ inspect_obsmarkers
	obsstore content			obsstore content
	================			================

tests/test-exchange-obsmarkers-case-D3.t

	created new head			created new head
	$ mkcommit A1			$ mkcommit A1
	$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`			$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
	1 new obsolescence markers			1 new obsolescence markers
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg prune -d '0 0' .			$ hg prune -d '0 0' .
	1 new obsolescence markers			1 new obsolescence markers
	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg strip --hidden -q 'desc(A1)'			$ hg debugstrip --hidden -q 'desc(A1)'
	$ hg log -G --hidden			$ hg log -G --hidden
	@ 35b183996678 (draft): B			@ 35b183996678 (draft): B
	\|			\|
	\| x 28b51eb45704 (draft): A0			\| x 28b51eb45704 (draft): A0
	\|/			\|/
	o a9bdc8b26820 (public): O			o a9bdc8b26820 (public): O

	$ inspect_obsmarkers			$ inspect_obsmarkers

tests/test-extension.t

	> EOF			> EOF

	Show extensions:			Show extensions:
	(note that mq force load strip, also checking it's not loaded twice)			(note that mq force load strip, also checking it's not loaded twice)

	#if no-extraextensions			#if no-extraextensions
	$ hg debugextensions			$ hg debugextensions
	mq			mq
	strip			strip (untested!)
	#endif			#endif

	For extensions, which name matches one of its commands, help			For extensions, which name matches one of its commands, help
	message should ask '-v -e' to get list of built-in aliases			message should ask '-v -e' to get list of built-in aliases
	along with extension help itself			along with extension help itself

	$ mkdir $TESTTMP/d			$ mkdir $TESTTMP/d
	$ cat > $TESTTMP/d/dodo.py <<EOF			$ cat > $TESTTMP/d/dodo.py <<EOF
	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.			warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

	Enabled extensions:			Enabled extensions:

	throw external 1.2.3			throw external 1.2.3
	$ echo 'getversion = lambda: b"1.twentythree"' >> throw.py			$ echo 'getversion = lambda: b"1.twentythree"' >> throw.py
	$ rm -f throw.pyc throw.pyo			$ rm -f throw.pyc throw.pyo
	$ rm -Rf __pycache__			$ rm -Rf __pycache__
	$ hg version -v --config extensions.throw=throw.py --config extensions.strip=			$ hg version -v --config extensions.throw=throw.py
	Mercurial Distributed SCM (version *) (glob)			Mercurial Distributed SCM (version *) (glob)
	(see https://mercurial-scm.org for more information)			(see https://mercurial-scm.org for more information)

	Copyright (C) 2005-* Matt Mackall and others (glob)			Copyright (C) 2005-* Matt Mackall and others (glob)
	This is free software; see the source for copying conditions. There is NO			This is free software; see the source for copying conditions. There is NO
	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.			warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

	Enabled extensions:			Enabled extensions:

	throw external 1.twentythree			throw external 1.twentythree
	strip internal

	$ hg version -q --config extensions.throw=throw.py			$ hg version -q --config extensions.throw=throw.py
	Mercurial Distributed SCM (version *) (glob)			Mercurial Distributed SCM (version *) (glob)

	Test template output:			Test template output:

	$ hg version --config extensions.strip= -T'{extensions}'			$ hg version -T'{extensions}'
	strip

	Test JSON output of version:			Test JSON output of version:

	$ hg version -Tjson			$ hg version -Tjson
	[			[
	{			{
	"extensions": [],			"extensions": [],
	"ver": "*" (glob)			"ver": "*" (glob)
	}			}
	]			]

	$ hg version --config extensions.throw=throw.py -Tjson			$ hg version --config extensions.throw=throw.py -Tjson
	[			[
	{			{
	"extensions": [{"bundled": false, "name": "throw", "ver": "1.twentythree"}],			"extensions": [{"bundled": false, "name": "throw", "ver": "1.twentythree"}],
	"ver": "3.2.2"			"ver": "3.2.2"
	}			}
	]			]

	$ hg version --config extensions.strip= -Tjson			$ hg version -Tjson
	[			[
	{			{
	"extensions": [{"bundled": true, "name": "strip", "ver": null}],			"extensions": [],
	"ver": "*" (glob)			"ver": "*" (glob)
	}			}
	]			]

	Test template output of version:			Test template output of version:

	$ hg version --config extensions.throw=throw.py --config extensions.strip= \			$ hg version --config extensions.throw=throw.py \
	> -T'{extensions % "{name} {pad(ver, 16)} ({if(bundled, "internal", "external")})\n"}'			> -T'{extensions % "{name} {pad(ver, 16)} ({if(bundled, "internal", "external")})\n"}'
	throw 1.twentythree (external)			throw 1.twentythree (external)
	strip (internal)

	Refuse to load extensions with minimum version requirements			Refuse to load extensions with minimum version requirements

	$ cat > minversion1.py << EOF			$ cat > minversion1.py << EOF
	> from mercurial import util			> from mercurial import util
	> util.version = lambda: b'3.5.2'			> util.version = lambda: b'3.5.2'
	> minimumhgversion = b'3.6'			> minimumhgversion = b'3.6'
	> EOF			> EOF

	#if no-extraextensions			#if no-extraextensions
	$ hg --cwd src debugextensions			$ hg --cwd src debugextensions
	reposetup() for $TESTTMP/reposetup-test/src			reposetup() for $TESTTMP/reposetup-test/src
	dodo (untested!)			dodo (untested!)
	dudu (untested!)			dudu (untested!)
	mq			mq
	reposetuptest (untested!)			reposetuptest (untested!)
	strip			strip (untested!)
	#endif			#endif

	$ hg clone -U src clone-dst1			$ hg clone -U src clone-dst1
	reposetup() for $TESTTMP/reposetup-test/src			reposetup() for $TESTTMP/reposetup-test/src
	$ hg init push-dst1			$ hg init push-dst1
	$ hg -q -R src push push-dst1			$ hg -q -R src push push-dst1
	reposetup() for $TESTTMP/reposetup-test/src			reposetup() for $TESTTMP/reposetup-test/src
	$ hg init pull-src1			$ hg init pull-src1

tests/test-flagprocessor.t


	$ hg update 2 -q			$ hg update 2 -q
	$ echo '[BASE64]a-bit-longer-branching' > base64			$ echo '[BASE64]a-bit-longer-branching' > base64
	$ hg commit -q -m branching			$ hg commit -q -m branching

	#if repobundlerepo			#if repobundlerepo
	$ hg bundle --base 1 bundle.hg			$ hg bundle --base 1 bundle.hg
	4 changesets found			4 changesets found
	$ hg --config extensions.strip= strip -r 2 --no-backup --force -q			$ hg debugstrip -r 2 --no-backup --force -q
	$ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64			$ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64
	5 branching			5 branching
	base64 \| 2 +-			base64 \| 2 +-
	1 files changed, 1 insertions(+), 1 deletions(-)			1 files changed, 1 insertions(+), 1 deletions(-)

	4 base64-4			4 base64-4
	base64 \| 2 +-			base64 \| 2 +-
	1 files changed, 1 insertions(+), 1 deletions(-)			1 files changed, 1 insertions(+), 1 deletions(-)

tests/test-generaldelta.t

	$ hg merge -q 0			$ hg merge -q 0
	$ hg commit -q -m merge			$ hg commit -q -m merge
	$ hg debugdeltachain -m			$ hg debugdeltachain -m
	rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio			rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
	0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000			0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000
	1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000			1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000
	2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413			2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413

	$ hg strip -q -r . --config extensions.strip=			$ hg debugstrip -q -r .

	- Verify aggressive merge uses p2 (commit 0) as delta parent			- Verify aggressive merge uses p2 (commit 0) as delta parent
	$ hg up -q -C 1			$ hg up -q -C 1
	$ hg merge -q 0			$ hg merge -q 0
	$ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes			$ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes
	$ hg debugdeltachain -m			$ hg debugdeltachain -m
	rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio			rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
	0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000			0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000
	1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000			1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000
	2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413			2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413

	Test that strip bundle use bundle2			Test that strip bundle use bundle2
	$ hg --config extensions.strip= strip .			$ hg debugstrip .
	0 files updated, 0 files merged, 5 files removed, 0 files unresolved			0 files updated, 0 files merged, 5 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg			saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
	$ hg debugbundle .hg/strip-backup/*			$ hg debugbundle .hg/strip-backup/*
	Stream params: {Compression: BZ}			Stream params: {Compression: BZ}
	changegroup -- {nbchanges: 1, version: 02} (mandatory: True)			changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
	1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9			1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9
	cache:rev-branch-cache -- {} (mandatory: False)			cache:rev-branch-cache -- {} (mandatory: False)
	phase-heads -- {} (mandatory: True)			phase-heads -- {} (mandatory: True)

tests/test-graft.t


	$ hg up -cqr 3			$ hg up -cqr 3
	$ hg graft -r 6 --base 5			$ hg graft -r 6 --base 5
	grafting 6:25a2b029d3ae "6" (tip)			grafting 6:25a2b029d3ae "6" (tip)
	merging e			merging e
	$ hg st --change .			$ hg st --change .
	M d			M d

	$ hg -q strip . --config extensions.strip=			$ hg -q debugstrip .

	Test --base for collapsing changesets 2 and 3, thus getting both b and c			Test --base for collapsing changesets 2 and 3, thus getting both b and c

	$ hg up -cqr 0			$ hg up -cqr 0
	$ hg graft -r 3 --base 1			$ hg graft -r 3 --base 1
	grafting 3:4c60f11aa304 "3"			grafting 3:4c60f11aa304 "3"
	merging a and b to b			merging a and b to b
	merging a and c to c			merging a and c to c
	$ hg st --change .			$ hg st --change .
	A b			A b
	A c			A c
	R a			R a

	$ hg -q strip . --config extensions.strip=			$ hg -q debugstrip .

	Specifying child as --base revision fails safely (perhaps slightly confusing, but consistent)			Specifying child as --base revision fails safely (perhaps slightly confusing, but consistent)

	$ hg graft -r 2 --base 3			$ hg graft -r 2 --base 3
	grafting 2:5c095ad7e90f "2"			grafting 2:5c095ad7e90f "2"
	note: possible conflict - c was deleted and renamed to:			note: possible conflict - c was deleted and renamed to:
	a			a
	note: graft of 2:5c095ad7e90f created no changes to commit			note: graft of 2:5c095ad7e90f created no changes to commit

	Abort the graft and try committing:			Abort the graft and try committing:

	$ hg up -C .			$ hg up -C .
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo c >> e			$ echo c >> e
	$ hg ci -mtest			$ hg ci -mtest

	$ hg strip . --config extensions.strip=			$ hg debugstrip .
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

	Graft again:			Graft again:

	$ hg graft 1 5 4 3 'merge()' 2			$ hg graft 1 5 4 3 'merge()' 2
	skipping ungraftable merge revision 6			skipping ungraftable merge revision 6
	skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)			skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
	$ cat a			$ cat a
	abc			abc

	Continue testing same origin policy, using revision numbers from test above			Continue testing same origin policy, using revision numbers from test above
	but do some destructive editing of the repo:			but do some destructive editing of the repo:

	$ hg up -qC 7			$ hg up -qC 7
	$ hg tag -l -r 13 tmp			$ hg tag -l -r 13 tmp
	$ hg --config extensions.strip= strip 2			$ hg debugstrip 2
	saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg			saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg
	$ hg graft tmp			$ hg graft tmp
	skipping already grafted revision 8:7a4785234d87 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)			skipping already grafted revision 8:7a4785234d87 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
	[255]			[255]

	Empty graft			Empty graft

	$ hg up -qr 26			$ hg up -qr 26

tests/test-help.t

	dump the contents of a revlog index			dump the contents of a revlog index
	debugrevspec parse and apply a revision specification			debugrevspec parse and apply a revision specification
	debugserve run a server with advanced settings			debugserve run a server with advanced settings
	debugsetparents			debugsetparents
	manually set the parents of the current working directory			manually set the parents of the current working directory
	debugsidedata			debugsidedata
	dump the side data for a cl/manifest/file revision			dump the side data for a cl/manifest/file revision
	debugssl test a secure connection to a server			debugssl test a secure connection to a server
				debugstrip strip changesets and all their descendants from the repository
	debugsub (no help text available)			debugsub (no help text available)
	debugsuccessorssets			debugsuccessorssets
	show set of successors for revision			show set of successors for revision
	debugtemplate			debugtemplate
	parse and apply a template			parse and apply a template
	debuguigetpass			debuguigetpass
	show prompt to type password			show prompt to type password
	debuguiprompt			debuguiprompt

tests/test-hgweb-bundle.t

	#require serve repobundlerepo			#require serve repobundlerepo

	$ hg init server			$ hg init server
	$ cd server			$ cd server
	$ cat >> .hg/hgrc << EOF
	> [extensions]
	> strip=
	> EOF

	$ echo 1 > foo			$ echo 1 > foo
	$ hg commit -A -m 'first'			$ hg commit -A -m 'first'
	adding foo			adding foo
	$ echo 2 > bar			$ echo 2 > bar
	$ hg commit -A -m 'second'			$ hg commit -A -m 'second'
	adding bar			adding bar

	Produce a bundle to use			Produce a bundle to use

	$ hg strip -r 1			$ hg debugstrip -r 1
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg			saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg

	Serve from a bundle file			Serve from a bundle file

	$ hg serve -R .hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg -d -p $HGPORT --pid-file=hg.pid			$ hg serve -R .hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg -d -p $HGPORT --pid-file=hg.pid
	$ cat hg.pid >> $DAEMON_PIDS			$ cat hg.pid >> $DAEMON_PIDS

tests/test-histedit-arguments.t

	\|			\|
	\| o 3 c8e6 four			\| o 3 c8e6 four
	\|/			\|/
	o 2 eb57 three			o 2 eb57 three
	\|			\|
	~			~

	$ hg unbundle -q $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg			$ hg unbundle -q $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg
	$ hg strip -q -r f5ed --config extensions.strip=			$ hg debugstrip -q -r f5ed
	$ hg up -q 08d98a8350f3			$ hg up -q 08d98a8350f3

	Test that missing revisions are detected			Test that missing revisions are detected
	---------------------------------------			---------------------------------------

	$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF			$ HGEDITOR=cat hg histedit "tip^^" --commands - << EOF
	> pick eb57da33312f 2 three			> pick eb57da33312f 2 three
	> pick 08d98a8350f3 4 five			> pick 08d98a8350f3 4 five
	# b, base = checkout changeset and apply further changesets from there			# b, base = checkout changeset and apply further changesets from there
	# d, drop = remove commit from history			# d, drop = remove commit from history
	# f, fold = use commit, but combine it with the one above			# f, fold = use commit, but combine it with the one above
	# r, roll = like fold, but discard this commit's description and date			# r, roll = like fold, but discard this commit's description and date
	#			#

	Test --continue with --keep			Test --continue with --keep

	$ hg strip -q -r . --config extensions.strip=			$ hg debugstrip -q -r .
	$ hg histedit '.^' -q --keep --commands - << EOF			$ hg histedit '.^' -q --keep --commands - << EOF
	> edit eb57da33312f 2 three			> edit eb57da33312f 2 three
	> pick f3cfcca30c44 4 x			> pick f3cfcca30c44 4 x
	> EOF			> EOF
	Editing (eb57da33312f), you may commit or record as needed now.			Editing (eb57da33312f), you may commit or record as needed now.
	(hg histedit --continue to resume)			(hg histedit --continue to resume)
	[1]			[1]
	$ echo edit >> alpha			$ echo edit >> alpha

tests/test-histedit-edit.t

	$ . "$TESTDIR/histedit-helpers.sh"			$ . "$TESTDIR/histedit-helpers.sh"

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> histedit=			> histedit=
	> strip=
	> mockmakedate = $TESTDIR/mockmakedate.py			> mockmakedate = $TESTDIR/mockmakedate.py
	> EOF			> EOF

	$ initrepo ()			$ initrepo ()
	> {			> {
	> hg init r			> hg init r
	> cd r			> cd r
	> for x in a b c d e f g; do			> for x in a b c d e f g; do
	$ hg id -n			$ hg id -n
	3+			3+
	$ hg up 0			$ hg up 0
	abort: histedit in progress			abort: histedit in progress
	(use 'hg histedit --continue' or 'hg histedit --abort')			(use 'hg histedit --continue' or 'hg histedit --abort')
	[255]			[255]

	Try to delete necessary commit			Try to delete necessary commit
	$ hg strip -r 652413b			$ hg debugstrip -r 652413b
	abort: histedit in progress, can't strip 652413bf663e			abort: histedit in progress, can't strip 652413bf663e
	[255]			[255]

	commit, then edit the revision			commit, then edit the revision
	$ hg ci -m 'wat'			$ hg ci -m 'wat'
	created new head			created new head
	$ echo a > e			$ echo a > e

	> pick a5e1ba2f7afb foobaz			> pick a5e1ba2f7afb foobaz
	> pick b5f70786f9b0 g			> pick b5f70786f9b0 g
	> EOF			> EOF
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	Editing (1a60820cd1f6), you may commit or record as needed now.			Editing (1a60820cd1f6), you may commit or record as needed now.
	(hg histedit --continue to resume)			(hg histedit --continue to resume)

	$ mv .hg/histedit-state .hg/histedit-state.bak			$ mv .hg/histedit-state .hg/histedit-state.bak
	$ hg strip -q -r b5f70786f9b0			$ hg debugstrip -q -r b5f70786f9b0
	$ mv .hg/histedit-state.bak .hg/histedit-state			$ mv .hg/histedit-state.bak .hg/histedit-state
	$ hg histedit --abort			$ hg histedit --abort
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 3 files			added 1 changesets with 1 changes to 3 files
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg log -r .			$ hg log -r .

tests/test-histedit-obsolete.t

	(hg histedit --continue to resume)			(hg histedit --continue to resume)
	[1]			[1]
	$ hg st			$ hg st
	A b			A b
	A d			A d
	? plan			? plan
	$ hg commit --amend -X . -m XXXXXX			$ hg commit --amend -X . -m XXXXXX
	$ hg commit --amend -X . -m b2			$ hg commit --amend -X . -m b2
	$ hg --hidden --config extensions.strip= strip 'desc(XXXXXX)' --no-backup			$ hg --hidden debugstrip 'desc(XXXXXX)' --no-backup
	$ hg histedit --continue			$ hg histedit --continue
	$ hg log -G			$ hg log -G
	@ 8:273c1f3b8626 c			@ 8:273c1f3b8626 c
	\|			\|
	o 7:aba7da937030 b2			o 7:aba7da937030 b2
	\|			\|
	o 0:cb9a9f314b8b a			o 0:cb9a9f314b8b a

tests/test-hook.t


	$ hg init txnfailure			$ hg init txnfailure
	$ cd txnfailure			$ cd txnfailure
	$ touch a && hg commit -Aqm a			$ touch a && hg commit -Aqm a
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [hooks]			> [hooks]
	> pretxnclose.error = exit 1			> pretxnclose.error = exit 1
	> EOF			> EOF
	$ hg strip -r 0 --config extensions.strip=			$ hg debugstrip -r 0
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to * (glob)			saved backup bundle to * (glob)
	transaction abort!			transaction abort!
	rollback completed			rollback completed
	strip failed, backup bundle stored in * (glob)			strip failed, backup bundle stored in * (glob)
	abort: pretxnclose.error hook exited with status 1			abort: pretxnclose.error hook exited with status 1
	[255]			[255]
	$ hg recover			$ hg recover

tests/test-import-bypass.t

	rename from dir/dir2/b			rename from dir/dir2/b
	rename to dir/dir2/b2			rename to dir/dir2/b2
	diff --git a/dir/dir2/c b/dir/dir2/c			diff --git a/dir/dir2/c b/dir/dir2/c
	--- a/dir/dir2/c			--- a/dir/dir2/c
	+++ b/dir/dir2/c			+++ b/dir/dir2/c
	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	cc			cc
	+cc			+cc
	$ hg -q --config extensions.strip= strip .			$ hg -q debugstrip .

	Test unsupported combinations			Test unsupported combinations

	$ hg import --bypass --no-commit ../test.diff			$ hg import --bypass --no-commit ../test.diff
	abort: cannot use --no-commit with --bypass			abort: cannot use --no-commit with --bypass
	[255]			[255]
	$ hg import --bypass --similarity 50 ../test.diff			$ hg import --bypass --similarity 50 ../test.diff
	abort: cannot use --similarity with --bypass			abort: cannot use --similarity with --bypass
	$ cd repo-options			$ cd repo-options

	$ echo a >> a			$ echo a >> a
	$ hg commit -m ' '			$ hg commit -m ' '
	$ hg tip -T "{node}\n"			$ hg tip -T "{node}\n"
	1b77bc7d1db9f0e7f1716d515b630516ab386c89			1b77bc7d1db9f0e7f1716d515b630516ab386c89
	$ hg export -o ../empty-log.diff .			$ hg export -o ../empty-log.diff .
	$ hg update -q -C ".^1"			$ hg update -q -C ".^1"
	$ hg --config extensions.strip= strip -q tip			$ hg debugstrip -q tip
	$ HGEDITOR=cat hg import --exact --bypass ../empty-log.diff			$ HGEDITOR=cat hg import --exact --bypass ../empty-log.diff
	applying ../empty-log.diff			applying ../empty-log.diff
	$ hg tip -T "{node}\n"			$ hg tip -T "{node}\n"
	1b77bc7d1db9f0e7f1716d515b630516ab386c89			1b77bc7d1db9f0e7f1716d515b630516ab386c89

	$ cd ..			$ cd ..

	#if symlink execbit			#if symlink execbit

tests/test-import-merge.t

	> echo merge > \$1			> echo merge > \$1
	> EOF			> EOF
	$ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff			$ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff
	applying ../merge.nomsg.diff			applying ../merge.nomsg.diff
	HGEDITFORM=import.normal.merge			HGEDITFORM=import.normal.merge
	$ tipparents			$ tipparents
	1:540395c44225 changea			1:540395c44225 changea
	3:102a90ea7b4a addb			3:102a90ea7b4a addb
	$ hg strip --no-backup tip			$ hg debugstrip --no-backup tip
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved

	Test without --exact and diff.p1 != workingdir.p1			Test without --exact and diff.p1 != workingdir.p1

	$ hg up 2			$ hg up 2
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg import ../merge.diff			$ hg import ../merge.diff
	applying ../merge.diff			applying ../merge.diff
	warning: import the patch as a normal revision			warning: import the patch as a normal revision
	(use --exact to import the patch as a merge)			(use --exact to import the patch as a merge)
	$ tipparents			$ tipparents
	2:890ecaa90481 addc			2:890ecaa90481 addc
	$ hg strip --no-backup tip			$ hg debugstrip --no-backup tip
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved

	Test with --exact			Test with --exact

	$ hg import --exact ../merge.diff			$ hg import --exact ../merge.diff
	applying ../merge.diff			applying ../merge.diff
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ tipparents			$ tipparents
	1:540395c44225 changea			1:540395c44225 changea
	3:102a90ea7b4a addb			3:102a90ea7b4a addb
	$ hg strip --no-backup tip			$ hg debugstrip --no-backup tip
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved

	Test with --bypass and diff.p1 == workingdir.p1			Test with --bypass and diff.p1 == workingdir.p1

	$ hg up 1			$ hg up 1
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg import --bypass ../merge.diff			$ hg import --bypass ../merge.diff
	applying ../merge.diff			applying ../merge.diff
	$ tipparents			$ tipparents
	1:540395c44225 changea			1:540395c44225 changea
	3:102a90ea7b4a addb			3:102a90ea7b4a addb
	$ hg strip --no-backup tip			$ hg debugstrip --no-backup tip

	Test with --bypass and diff.p1 != workingdir.p1			Test with --bypass and diff.p1 != workingdir.p1

	$ hg up 2			$ hg up 2
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg import --bypass ../merge.diff			$ hg import --bypass ../merge.diff
	applying ../merge.diff			applying ../merge.diff
	warning: import the patch as a normal revision			warning: import the patch as a normal revision
	(use --exact to import the patch as a merge)			(use --exact to import the patch as a merge)
	$ tipparents			$ tipparents
	2:890ecaa90481 addc			2:890ecaa90481 addc
	$ hg strip --no-backup tip			$ hg debugstrip --no-backup tip

	Test with --bypass and --exact			Test with --bypass and --exact

	$ hg import --bypass --exact ../merge.diff			$ hg import --bypass --exact ../merge.diff
	applying ../merge.diff			applying ../merge.diff
	$ tipparents			$ tipparents
	1:540395c44225 changea			1:540395c44225 changea
	3:102a90ea7b4a addb			3:102a90ea7b4a addb
	$ hg strip --no-backup tip			$ hg debugstrip --no-backup tip

	$ cd ..			$ cd ..

	Test that --exact on a bad header doesn't corrupt the repo (issue3616)			Test that --exact on a bad header doesn't corrupt the repo (issue3616)

	$ hg init repo3			$ hg init repo3
	$ cd repo3			$ cd repo3
	$ echo a>a			$ echo a>a

tests/test-import.t

	even if commit message is empty			even if commit message is empty

	$ echo a >> b/a			$ echo a >> b/a
	$ hg --cwd b commit -m ' '			$ hg --cwd b commit -m ' '
	$ hg --cwd b tip -T "{node}\n"			$ hg --cwd b tip -T "{node}\n"
	d8804f3f5396d800812f579c8452796a5993bdb2			d8804f3f5396d800812f579c8452796a5993bdb2
	$ hg --cwd b export -o ../empty-log.diff .			$ hg --cwd b export -o ../empty-log.diff .
	$ hg --cwd b update -q -C ".^1"			$ hg --cwd b update -q -C ".^1"
	$ hg --cwd b --config extensions.strip= strip -q tip			$ hg --cwd b debugstrip -q tip
	$ HGEDITOR=cat hg --cwd b import --exact ../empty-log.diff			$ HGEDITOR=cat hg --cwd b import --exact ../empty-log.diff
	applying ../empty-log.diff			applying ../empty-log.diff
	$ hg --cwd b tip -T "{node}\n"			$ hg --cwd b tip -T "{node}\n"
	d8804f3f5396d800812f579c8452796a5993bdb2			d8804f3f5396d800812f579c8452796a5993bdb2

	$ rm -r b			$ rm -r b


	applying ../patch1			applying ../patch1
	applying ../patch2			applying ../patch2
	$ hg --cwd b update -q 1			$ hg --cwd b update -q 1
	$ hg --cwd b rollback -q			$ hg --cwd b rollback -q
	$ hg --cwd b parents --template 'parent: {rev}\n'			$ hg --cwd b parents --template 'parent: {rev}\n'
	parent: 1			parent: 1

	$ hg --cwd b update -q -C 0			$ hg --cwd b update -q -C 0
	$ hg --cwd b --config extensions.strip= strip -q 1			$ hg --cwd b debugstrip -q 1

	Test visibility of in-memory dirstate changes inside transaction to			Test visibility of in-memory dirstate changes inside transaction to
	external process			external process

	$ echo foo > a/foo			$ echo foo > a/foo
	$ hg --cwd a commit -A -m 'adding foo' foo			$ hg --cwd a commit -A -m 'adding foo' foo
	$ hg --cwd a export -o '../patch%R' 3			$ hg --cwd a export -o '../patch%R' 3

tests/test-keyword.t

	$ hg -q commit -m "modify metasep" i			$ hg -q commit -m "modify metasep" i
	$ hg status --rev 2:3			$ hg status --rev 2:3
	M i			M i
	$ touch empty			$ touch empty
	$ hg -q commit -A -m "another file"			$ hg -q commit -A -m "another file"
	$ hg status -A --rev 3:4 i			$ hg status -A --rev 3:4 i
	C i			C i

	$ hg -q strip --no-backup 2			$ hg -q debugstrip --no-backup 2

	Test hook execution			Test hook execution

	bundle			bundle

	$ hg bundle --base null ../kw.hg			$ hg bundle --base null ../kw.hg
	2 changesets found			2 changesets found
	$ cd ..			$ cd ..

	$ hg --debug commit --amend -d '15 1' -m 'amend without changes' \| grep keywords			$ hg --debug commit --amend -d '15 1' -m 'amend without changes' \| grep keywords
	overwriting a expanding keywords			overwriting a expanding keywords
	$ hg -q id			$ hg -q id
	67d8c481a6be			67d8c481a6be
	$ head -1 a			$ head -1 a
	expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $			expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $

	$ hg -q strip --no-backup tip			$ hg -q debugstrip --no-backup tip

	Test patch queue repo			Test patch queue repo

	$ hg init --mq			$ hg init --mq
	$ hg qimport -r tip -n mqtest.diff			$ hg qimport -r tip -n mqtest.diff
	$ hg commit --mq -m mqtest			$ hg commit --mq -m mqtest

	Keywords should not be expanded in patch			Keywords should not be expanded in patch

tests/test-lfs.t

	lfs: found a9c7d1cd6ce2b9bbdf46ed9a862845228717b921c089d0d42e3bcaed29eb612e in the local lfs store			lfs: found a9c7d1cd6ce2b9bbdf46ed9a862845228717b921c089d0d42e3bcaed29eb612e in the local lfs store
	lfs: found f693890c49c409ec33673b71e53f297681f76c1166daf33b2ad7ebf8b1d3237e in the local lfs store			lfs: found f693890c49c409ec33673b71e53f297681f76c1166daf33b2ad7ebf8b1d3237e in the local lfs store
	lfs: found fda198fea753eb66a252e9856915e1f5cddbe41723bd4b695ece2604ad3c9f75 in the local lfs store			lfs: found fda198fea753eb66a252e9856915e1f5cddbe41723bd4b695ece2604ad3c9f75 in the local lfs store
	4 changesets found			4 changesets found
	uncompressed size of bundle content:			uncompressed size of bundle content:
	* (changelog) (glob)			* (changelog) (glob)
	* (manifests) (glob)			* (manifests) (glob)
	* a (glob)			* a (glob)
	$ hg --config extensions.strip= strip -r 2 --no-backup --force -q			$ hg debugstrip -r 2 --no-backup --force -q
	$ hg -R bundle.hg log -p -T '{rev} {desc}\n' a			$ hg -R bundle.hg log -p -T '{rev} {desc}\n' a
	5 branching			5 branching
	diff --git a/a b/a			diff --git a/a b/a
	--- a/a			--- a/a
	+++ b/a			+++ b/a
	@@ -1,1 +1,1 @@			@@ -1,1 +1,1 @@
	-THIS-IS-LFS-two			-THIS-IS-LFS-two
	+THIS-IS-LFS-2-CHILD			+THIS-IS-LFS-2-CHILD

tests/test-mq-qpush-exact.t

	$ hg update 1 -q			$ hg update 1 -q

	make some patches with a parent: 1:d7fe2034f71b -> p0 -> p1			make some patches with a parent: 1:d7fe2034f71b -> p0 -> p1

	$ echo cp0 >> fp0			$ echo cp0 >> fp0
	$ hg add fp0			$ hg add fp0
	$ hg ci -m p0 -d "0 0"			$ hg ci -m p0 -d "0 0"
	$ hg export -r. > p0			$ hg export -r. > p0
	$ hg strip -qn .			$ hg debugstrip -qn .
	$ hg qimport p0			$ hg qimport p0
	adding p0 to series file			adding p0 to series file
	$ hg qpush			$ hg qpush
	applying p0			applying p0
	now at: p0			now at: p0

	$ echo cp1 >> fp1			$ echo cp1 >> fp1
	$ hg add fp1			$ hg add fp1

tests/test-mq.t

	qpush: test2.patch is already at the top			qpush: test2.patch is already at the top

	strip			strip

	$ cd ../../b			$ cd ../../b
	$ echo x>x			$ echo x>x
	$ hg ci -Ama			$ hg ci -Ama
	adding x			adding x
	$ hg strip tip			$ hg debugstrip tip
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
	$ hg unbundle .hg/strip-backup/*			$ hg unbundle .hg/strip-backup/*
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	new changesets 770eb8fce608 (1 drafts)			new changesets 770eb8fce608 (1 drafts)
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)


	strip with local changes, should complain			strip with local changes, should complain

	$ hg up			$ hg up
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo y>y			$ echo y>y
	$ hg add y			$ hg add y
	$ hg strip tip			$ hg debugstrip tip
	abort: uncommitted changes			abort: uncommitted changes
	[255]			[255]

	--force strip with local changes			--force strip with local changes

	$ hg strip -f tip			$ hg debugstrip -f tip
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg			saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg
	$ cd ..			$ cd ..


	cd b; hg qrefresh			cd b; hg qrefresh

	$ hg init refresh			$ hg init refresh
	Changesets managed by MQ.			Changesets managed by MQ.


	bad node in status			bad node in status

	$ hg qpop			$ hg qpop
	popping bar			popping bar
	now at: foo			now at: foo
	$ hg strip -qn tip			$ hg debugstrip -qn tip
	$ hg tip			$ hg tip
	changeset: 0:cb9a9f314b8b			changeset: 0:cb9a9f314b8b
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: a			summary: a

	$ hg branches			$ hg branches
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: change foo 1			summary: change foo 1

	changeset: 0:53245c60e682			changeset: 0:53245c60e682
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: add foo			summary: add foo

	$ hg strip 1			$ hg debugstrip 1
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/strip/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/strip/.hg/strip-backup/*-backup.hg (glob)
	$ checkundo strip			$ checkundo strip
	$ hg log			$ hg log
	changeset: 1:20cbbe65cff7			changeset: 1:20cbbe65cff7
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000

tests/test-narrow-strip.t

	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 2 changes to 1 files (+1 heads)			added 3 changesets with 2 changes to 1 files (+1 heads)
	new changesets : (glob)			new changesets : (glob)
	updating to branch default			updating to branch default
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ cd narrow			$ cd narrow
	$ cat >> $HGRCPATH <<EOF
	> [extensions]
	> strip=
	> EOF

	Can strip and recover changesets affecting only files within narrow spec			Can strip and recover changesets affecting only files within narrow spec

	$ hg co -r 'desc("modify inside")'			$ hg co -r 'desc("modify inside")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ rm -f .hg/strip-backup/*-backup.hg			$ rm -f .hg/strip-backup/*-backup.hg
	$ hg strip .			$ hg debugstrip .
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
	$ hg unbundle .hg/strip-backup/*-backup.hg			$ hg unbundle .hg/strip-backup/*-backup.hg
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files (+1 heads)			added 1 changesets with 1 changes to 1 files (+1 heads)
	new changesets * (glob)			new changesets * (glob)

	$ hg debugdata -m 1			$ hg debugdata -m 1
	inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) (flat !)			inside/f1\x004d6a634d5ba06331a60c29ee0db8412490a54fcd (esc) (flat !)
	outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)			outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)
	inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)			inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)
	outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)			outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)

	$ rm -f .hg/strip-backup/*-backup.hg			$ rm -f .hg/strip-backup/*-backup.hg
	$ hg strip .			$ hg debugstrip .
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
	$ hg unbundle .hg/strip-backup/*-backup.hg			$ hg unbundle .hg/strip-backup/*-backup.hg
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 0 changes to 0 files (+1 heads)			added 1 changesets with 0 changes to 0 files (+1 heads)
	new changesets * (glob)			new changesets * (glob)
	outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)			outside/f1\x0084ba604d54dee1f13310ce3d4ac2e8a36636691a (esc) (flat !)
	inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)			inside\x006a8bc41df94075d501f9740587a0c0e13c170dc5t (esc) (tree !)
	outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)			outside\x00255c2627ebdd3c7dcaa6945246f9b9f02bd45a09t (esc) (tree !)

	Also verify we can apply the bundle with 'hg pull':			Also verify we can apply the bundle with 'hg pull':
	$ hg co -r 'desc("modify inside")'			$ hg co -r 'desc("modify inside")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ rm .hg/strip-backup/*-backup.hg			$ rm .hg/strip-backup/*-backup.hg
	$ hg strip .			$ hg debugstrip .
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
	#if repobundlerepo			#if repobundlerepo
	$ hg pull .hg/strip-backup/*-backup.hg			$ hg pull .hg/strip-backup/*-backup.hg
	pulling from .hg/strip-backup/*-backup.hg (glob)			pulling from .hg/strip-backup/*-backup.hg (glob)
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files (+1 heads)			added 1 changesets with 1 changes to 1 files (+1 heads)
	new changesets * (glob)			new changesets * (glob)
	(run 'hg heads' to see heads, 'hg merge' to merge)			(run 'hg heads' to see heads, 'hg merge' to merge)

	$ rm .hg/strip-backup/*-backup.hg			$ rm .hg/strip-backup/*-backup.hg
	$ hg strip 0			$ hg debugstrip 0
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)

	$ hg incoming .hg/strip-backup/*-backup.hg			$ hg incoming .hg/strip-backup/*-backup.hg
	comparing with .hg/strip-backup/*-backup.hg (glob)			comparing with .hg/strip-backup/*-backup.hg (glob)
	changeset: 0:* (glob)			changeset: 0:* (glob)
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000

tests/test-obsolete-changeset-exchange.t


	Pull a changeset that will immediatly goes extinct (because you already have a			Pull a changeset that will immediatly goes extinct (because you already have a
	marker to obsolete him)			marker to obsolete him)
	(test resolution of issue3788)			(test resolution of issue3788)

	$ hg phase --draft --force f89bcc95eba5			$ hg phase --draft --force f89bcc95eba5
	$ hg phase -R ../other --draft --force f89bcc95eba5			$ hg phase -R ../other --draft --force f89bcc95eba5
	$ hg commit --amend -m "A''"			$ hg commit --amend -m "A''"
	$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5			$ hg --hidden --config extensions.mq= debugstrip --no-backup f89bcc95eba5
	$ hg pull ../other			$ hg pull ../other
	pulling from ../other			pulling from ../other
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 0 changes to 1 files (+1 heads)			added 1 changesets with 0 changes to 1 files (+1 heads)
	1 new phase-divergent changesets			1 new phase-divergent changesets
	new changesets f89bcc95eba5			new changesets f89bcc95eba5
	(run 'hg heads' to see heads, 'hg merge' to merge)			(run 'hg heads' to see heads, 'hg merge' to merge)

	check that bundle is not affected			check that bundle is not affected

	$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg			$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg
	1 changesets found			1 changesets found
	$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5			$ hg --hidden --config extensions.mq= debugstrip --no-backup f89bcc95eba5
	$ hg unbundle ../f89bcc95eba5.hg			$ hg unbundle ../f89bcc95eba5.hg
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 0 changes to 1 files (+1 heads)			added 1 changesets with 0 changes to 1 files (+1 heads)
	(1 other changesets obsolete on arrival)			(1 other changesets obsolete on arrival)
	(run 'hg heads' to see heads)			(run 'hg heads' to see heads)

tests/test-obsolete.t


	Test that removing a local tag does not cause some commands to fail			Test that removing a local tag does not cause some commands to fail

	$ hg tag -l -r tip tiptag			$ hg tag -l -r tip tiptag
	$ hg tags			$ hg tags
	tiptag 2:323a9c3ddd91			tiptag 2:323a9c3ddd91
	tip 2:323a9c3ddd91			tip 2:323a9c3ddd91
	visible 1:29f0c6921ddd			visible 1:29f0c6921ddd
	$ hg --config extensions.strip= strip -r tip --no-backup			$ hg debugstrip -r tip --no-backup
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg tags			$ hg tags
	visible 1:29f0c6921ddd			visible 1:29f0c6921ddd
	tip 1:29f0c6921ddd			tip 1:29f0c6921ddd

	Test bundle overlay onto hidden revision			Test bundle overlay onto hidden revision

	$ cd ..			$ cd ..
	\|			\|
	\| x 2:e008cf283490 (draft obsolete) [ ] 2 [rewritten using amend as 3:b0551702f918]			\| x 2:e008cf283490 (draft obsolete) [ ] 2 [rewritten using amend as 3:b0551702f918]
	\|/			\|/
	o 1:e016b03fd86f (draft) [ ] 1			o 1:e016b03fd86f (draft) [ ] 1
	\|			\|
	o 0:a78f55e5508c (draft) [ ] 0			o 0:a78f55e5508c (draft) [ ] 0


	$ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no			$ hg debugstrip --hidden -r 2 --config devel.strip-obsmarkers=no
	saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg			saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg
	$ hg debugobsolete			$ hg debugobsolete
	e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}			e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
	$ hg log -G			$ hg log -G
	@ 2:b0551702f918 (draft) [tip ] 2			@ 2:b0551702f918 (draft) [tip ] 2
	\|			\|
	o 1:e016b03fd86f (draft) [ ] 1			o 1:e016b03fd86f (draft) [ ] 1
	\|			\|
	\|			\|
	o 1:e016b03fd86f (draft) [ ] 1			o 1:e016b03fd86f (draft) [ ] 1
	\|			\|
	o 0:a78f55e5508c (draft) [ ] 0			o 0:a78f55e5508c (draft) [ ] 0


	Testing that strip remove markers:			Testing that strip remove markers:

	$ hg strip -r 1 --config extensions.strip=			$ hg debugstrip -r 1
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg			saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg
	$ hg debugobsolete			$ hg debugobsolete
	$ hg log -G			$ hg log -G
	@ 0:a78f55e5508c (draft) [tip ] 0			@ 0:a78f55e5508c (draft) [tip ] 0

	$ hg log -G --hidden			$ hg log -G --hidden
	@ 0:a78f55e5508c (draft) [tip ] 0			@ 0:a78f55e5508c (draft) [tip ] 0

	Test adding changeset after obsmarkers affecting it			Test adding changeset after obsmarkers affecting it
	(eg: during pull, or unbundle)			(eg: during pull, or unbundle)

	$ mkcommit e			$ mkcommit e
	$ hg bundle -r . --base .~1 ../bundle-2.hg			$ hg bundle -r . --base .~1 ../bundle-2.hg
	1 changesets found			1 changesets found
	$ getid .			$ getid .
	$ hg --config extensions.strip= strip -r .			$ hg debugstrip -r .
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg			saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg
	$ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b			$ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b
	1 new obsolescence markers			1 new obsolescence markers
	$ hg unbundle ../bundle-2.hg			$ hg unbundle ../bundle-2.hg
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes

tests/test-phase-archived.t

	=========================================================			=========================================================
	Test features and behaviors related to the archived phase			Test features and behaviors related to the archived phase
	=========================================================			=========================================================

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [format]			> [format]
	> internal-phase=yes			> internal-phase=yes
	> [extensions]
	> strip=
	> [experimental]			> [experimental]
	> EOF			> EOF

	$ hg init repo			$ hg init repo
	$ cd repo			$ cd repo
	$ echo root > a			$ echo root > a
	$ hg add a			$ hg add a
	$ hg ci -m 'root'			$ hg ci -m 'root'
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: unbundletesting			\| summary: unbundletesting
	\|			\|
	o changeset: 0:c1863a3840c6			o changeset: 0:c1863a3840c6
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: root			summary: root

	$ hg strip --soft --rev '.'			$ hg debugstrip --soft --rev '.'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/repo/.hg/strip-backup/883aadbbf309-efc55adc-backup.hg			saved backup bundle to $TESTTMP/repo/.hg/strip-backup/883aadbbf309-efc55adc-backup.hg
	$ hg log -G			$ hg log -G
	@ changeset: 0:c1863a3840c6			@ changeset: 0:c1863a3840c6
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: root			summary: root

tests/test-phases-exchange.t

	o 0 public a-A - 054250a37db4			o 0 public a-A - 054250a37db4



	Bare push with next changeset and common changeset needing sync (issue3575)			Bare push with next changeset and common changeset needing sync (issue3575)

	(reset some stat on remote repo to avoid confusing other tests)			(reset some stat on remote repo to avoid confusing other tests)

	$ hg -R ../alpha --config extensions.strip= strip --no-backup 967b449fbc94			$ hg -R ../alpha debugstrip --no-backup 967b449fbc94
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg phase --force --draft b740e3e5c05d 967b449fbc94			$ hg phase --force --draft b740e3e5c05d 967b449fbc94
	test-debug-phase: move rev 8: 0 -> 1			test-debug-phase: move rev 8: 0 -> 1
	test-debug-phase: move rev 9: 0 -> 1			test-debug-phase: move rev 9: 0 -> 1
	$ hg push -fv ../alpha			$ hg push -fv ../alpha
	pushing to ../alpha			pushing to ../alpha
	searching for changes			searching for changes
	1 changesets found			1 changesets found

tests/test-phases.t

	$ cat ../push-dest/.hg/cache/branch2-visible			$ cat ../push-dest/.hg/cache/branch2-visible
	6d6770faffce199f1fddd1cf87f6f026138cf061 6			6d6770faffce199f1fddd1cf87f6f026138cf061 6
	b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default			b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
	2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default			2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default
	6d6770faffce199f1fddd1cf87f6f026138cf061 o default			6d6770faffce199f1fddd1cf87f6f026138cf061 o default


	Restore condition prior extra insertion.			Restore condition prior extra insertion.
	$ hg -q --config extensions.mq= strip .			$ hg -q --config extensions.mq= debugstrip .
	$ hg up -q 7			$ hg up -q 7
	$ cd ..			$ cd ..

	Test secret changeset are not pull			Test secret changeset are not pull

	$ hg init pull-dest			$ hg init pull-dest
	$ cd pull-dest			$ cd pull-dest
	$ hg pull ../initialrepo			$ hg pull ../initialrepo

tests/test-pull-update.t

	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files (+1 heads)			added 1 changesets with 1 changes to 1 files (+1 heads)
	new changesets 107cefe13e42			new changesets 107cefe13e42
	1 local changesets published			1 local changesets published
	abort: uncommitted changes			abort: uncommitted changes
	[255]			[255]
	$ hg --config extensions.strip= strip --no-backup tip			$ hg debugstrip --no-backup tip
	$ hg co -qC tip			$ hg co -qC tip

	Should not update to the other topological branch:			Should not update to the other topological branch:

	$ hg pull -u ../tt			$ hg pull -u ../tt
	pulling from ../tt			pulling from ../tt
	searching for changes			searching for changes
	adding changesets			adding changesets

tests/test-push-http.t

	remote: HG_TXNID=TXN:$ID$			remote: HG_TXNID=TXN:$ID$
	remote: HG_TXNNAME=serve			remote: HG_TXNNAME=serve
	remote: HG_URL=remote:http:$LOCALIP: (glob)			remote: HG_URL=remote:http:$LOCALIP: (glob)
	remote:			remote:
	remote: added 1 changesets with 1 changes to 1 files			remote: added 1 changesets with 1 changes to 1 files
	% serve errors			% serve errors
	#endif			#endif

	$ hg --config extensions.strip= strip -r 1:			$ hg debugstrip -r 1:
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/ba677d0156c1-eea704d7-backup.hg			saved backup bundle to $TESTTMP/test/.hg/strip-backup/ba677d0156c1-eea704d7-backup.hg

	Now do a variant of the above, except on a non-publishing repository			Now do a variant of the above, except on a non-publishing repository

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [phases]			> [phases]
	> publish = false			> publish = false
	> [hooks]			> [hooks]
	remote: HG_TXNID=TXN:$ID$			remote: HG_TXNID=TXN:$ID$
	remote: HG_TXNNAME=serve			remote: HG_TXNNAME=serve
	remote: HG_URL=remote:http:$LOCALIP: (glob)			remote: HG_URL=remote:http:$LOCALIP: (glob)
	remote:			remote:
	remote: added 1 changesets with 1 changes to 1 files			remote: added 1 changesets with 1 changes to 1 files
	% serve errors			% serve errors
	#endif			#endif

	$ hg --config extensions.strip= strip -r 1:			$ hg debugstrip -r 1:
	saved backup bundle to $TESTTMP/test/.hg/strip-backup/ba677d0156c1-eea704d7-backup.hg			saved backup bundle to $TESTTMP/test/.hg/strip-backup/ba677d0156c1-eea704d7-backup.hg

	#if bundle2			#if bundle2

	$ cat > .hg/hgrc <<EOF			$ cat > .hg/hgrc <<EOF
	> [web]			> [web]
	> push_ssl = false			> push_ssl = false
	> allow_push = *			> allow_push = *

tests/test-push.t

	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	lock: user , process (*s) (glob)			lock: user , process (*s) (glob)
	wlock: free			wlock: free
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files

	$ hg --cwd 1 --config extensions.strip= strip tip -q			$ hg --cwd 1 debugstrip tip -q
	$ hg --cwd 2 --config extensions.strip= strip tip -q			$ hg --cwd 2 debugstrip tip -q
	$ hg --cwd 3 push ../2 # bundle2+			$ hg --cwd 3 push ../2 # bundle2+
	pushing to ../2			pushing to ../2
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	lock: user , process (*s) (glob)			lock: user , process (*s) (glob)
	wlock: user , process (*s) (glob)			wlock: user , process (*s) (glob)

tests/test-rebase-abort.t

	rebasing 4:46f0b057b5c0 "L2" (tip)			rebasing 4:46f0b057b5c0 "L2" (tip)
	merging common			merging common
	warning: conflicts while merging common! (edit, then use 'hg resolve --mark')			warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see hg resolve, then hg rebase --continue)
	[1]			[1]

	$ mv .hg/rebasestate .hg/rebasestate.back			$ mv .hg/rebasestate .hg/rebasestate.back
	$ hg update --quiet --clean 2			$ hg update --quiet --clean 2
	$ hg --config extensions.mq= strip --quiet "destination()"			$ hg --config extensions.mq= debugstrip --quiet "destination()"
	$ mv .hg/rebasestate.back .hg/rebasestate			$ mv .hg/rebasestate.back .hg/rebasestate

	$ hg continue			$ hg continue
	abort: cannot continue inconsistent rebase			abort: cannot continue inconsistent rebase
	(use "hg rebase --abort" to clear broken state)			(use "hg rebase --abort" to clear broken state)
	[255]			[255]
	$ hg summary \| grep '^rebase: '			$ hg summary \| grep '^rebase: '
	rebase: (use "hg rebase --abort" to clear broken state)			rebase: (use "hg rebase --abort" to clear broken state)

tests/test-rebase-cache.t

	\|/			\|/
	o 0: 'A'			o 0: 'A'

	$ hg verify -q			$ hg verify -q

	Stripping multiple branches in one go bypasses the fast-case code to			Stripping multiple branches in one go bypasses the fast-case code to
	update the branch cache.			update the branch cache.

	$ hg strip 2			$ hg debugstrip 2
	0 files updated, 0 files merged, 4 files removed, 0 files unresolved			0 files updated, 0 files merged, 4 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg			saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg

	$ hg tglog			$ hg tglog
	o 3: 'C' branch2			o 3: 'C' branch2
	\|			\|
	o 2: 'branch2' branch2			o 2: 'branch2' branch2
	\|			\|
	\|			\|
	o 0: 'branch1' branch1			o 0: 'branch1' branch1


	$ hg theads			$ hg theads
	2: 'A' branch1			2: 'A' branch1
	1: 'branch2' branch2			1: 'branch2' branch2

	$ hg strip 2			$ hg debugstrip 2
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg			saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg

	$ hg theads			$ hg theads
	1: 'branch2' branch2			1: 'branch2' branch2
	0: 'branch1' branch1			0: 'branch1' branch1


	\|			\|
	o 2: 'C'			o 2: 'C'
	\|			\|
	o 1: 'B'			o 1: 'B'
	\|			\|
	o 0: 'A'			o 0: 'A'


	$ hg strip 3 4			$ hg debugstrip 3 4
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg			saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg

	$ hg theads			$ hg theads
	2: 'C'			2: 'C'

	$ hg strip 2 1			$ hg debugstrip 2 1
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg			saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg

	$ hg theads			$ hg theads
	0: 'A'			0: 'A'

	Make sure rebase does not break for phase/filter related reason			Make sure rebase does not break for phase/filter related reason
	----------------------------------------------------------------			----------------------------------------------------------------

tests/test-rebase-collapse.t

	7:64e264db77f061f16d9132b70c5a58e2461fb630 default			7:64e264db77f061f16d9132b70c5a58e2461fb630 default
	3:575c4b5ec114d64b681d33f8792853568bfb2b2c default			3:575c4b5ec114d64b681d33f8792853568bfb2b2c default

	$ cat $TESTTMP/branch-heads/.hg/cache/branch2-served			$ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
	64e264db77f061f16d9132b70c5a58e2461fb630 7			64e264db77f061f16d9132b70c5a58e2461fb630 7
	575c4b5ec114d64b681d33f8792853568bfb2b2c o default			575c4b5ec114d64b681d33f8792853568bfb2b2c o default
	64e264db77f061f16d9132b70c5a58e2461fb630 o default			64e264db77f061f16d9132b70c5a58e2461fb630 o default

	$ hg strip 4			$ hg debugstrip 4
	saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/4e4f9194f9f1-5ec4b5e6-backup.hg			saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/4e4f9194f9f1-5ec4b5e6-backup.hg

	$ cat $TESTTMP/branch-heads/.hg/cache/branch2-served			$ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
	11abe3fb10b8689b560681094b17fe161871d043 5			11abe3fb10b8689b560681094b17fe161871d043 5
	dc0947a82db884575bb76ea10ac97b08536bfa03 o default			dc0947a82db884575bb76ea10ac97b08536bfa03 o default
	575c4b5ec114d64b681d33f8792853568bfb2b2c o default			575c4b5ec114d64b681d33f8792853568bfb2b2c o default
	11abe3fb10b8689b560681094b17fe161871d043 o default			11abe3fb10b8689b560681094b17fe161871d043 o default

	> \|/			> \|/
	> A			> A
	> EOF			> EOF

	$ hg heads --template="{rev}:{node} {branch}: {desc}\n"			$ hg heads --template="{rev}:{node} {branch}: {desc}\n"
	2:dc0947a82db884575bb76ea10ac97b08536bfa03 default: C			2:dc0947a82db884575bb76ea10ac97b08536bfa03 default: C
	1:112478962961147124edd43549aedd1a335e44bf default: B			1:112478962961147124edd43549aedd1a335e44bf default: B

	$ hg strip C			$ hg debugstrip C
	saved backup bundle to $TESTTMP/f/.hg/strip-backup/dc0947a82db8-d21b92a4-backup.hg			saved backup bundle to $TESTTMP/f/.hg/strip-backup/dc0947a82db8-d21b92a4-backup.hg

	$ hg tglog			$ hg tglog
	o 1: 112478962961 'B'			o 1: 112478962961 'B'
	\|			\|
	o 0: 426bada5c675 'A'			o 0: 426bada5c675 'A'

tests/test-rebase-inmemory.t

	#require symlink execbit			#require symlink execbit
	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [phases]			> [phases]
	> publish=False			> publish=False
	> [extensions]			> [extensions]
	> amend=			> amend=
	> rebase=			> rebase=
	> debugdrawdag=$TESTDIR/drawdag.py			> debugdrawdag=$TESTDIR/drawdag.py
	> strip=
	> [rebase]			> [rebase]
	> experimental.inmemory=1			> experimental.inmemory=1
	> [diff]			> [diff]
	> git=1			> git=1
	> [alias]			> [alias]
	> tglog = log -G --template "{rev}: {node\|short} '{desc}'\n"			> tglog = log -G --template "{rev}: {node\|short} '{desc}'\n"
	> EOF			> EOF

	U e			U e

	==========================			==========================
	Test for --confirm option\|			Test for --confirm option\|
	==========================			==========================
	$ cd ..			$ cd ..
	$ hg clone repo3 repo4 -q			$ hg clone repo3 repo4 -q
	$ cd repo4			$ cd repo4
	$ hg strip 7 -q			$ hg debugstrip 7 -q
	$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"			$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
	@ 6:baf10c5166d4 test			@ 6:baf10c5166d4 test
	\| g			\| g
	\|			\|
	o 5:6343ca3eff20 test			o 5:6343ca3eff20 test
	\| f			\| f
	\|			\|
	\| o 4:e860deea161a test			\| o 4:e860deea161a test

tests/test-remotefilelog-bgprefetch.t


	# background prefetch on pull when configured			# background prefetch on pull when configured

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> pullprefetch=bookmark()			> pullprefetch=bookmark()
	> backgroundprefetch=True			> backgroundprefetch=True
	> EOF			> EOF
	$ hg strip tip			$ hg debugstrip tip
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/6b4b6f66ef8c-b4b8bdaf-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/6b4b6f66ef8c-b4b8bdaf-backup.hg (glob)

	$ clearcache			$ clearcache
	$ hg pull			$ hg pull
	pulling from ssh://user@dummy/master			pulling from ssh://user@dummy/master
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	$TESTTMP/hgcache/repos			$TESTTMP/hgcache/repos

	# background prefetch with repack on pull when configured			# background prefetch with repack on pull when configured

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> backgroundrepack=True			> backgroundrepack=True
	> EOF			> EOF
	$ hg strip tip			$ hg debugstrip tip
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/6b4b6f66ef8c-b4b8bdaf-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/6b4b6f66ef8c-b4b8bdaf-backup.hg (glob)

	$ clearcache			$ clearcache
	$ hg pull			$ hg pull
	pulling from ssh://user@dummy/master			pulling from ssh://user@dummy/master
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests

tests/test-remotefilelog-bundles.t

	$ cd ..			$ cd ..

	$ hgcloneshallow ssh://user@dummy/master shallow -q			$ hgcloneshallow ssh://user@dummy/master shallow -q
	1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)			1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
	$ cd shallow			$ cd shallow

	Unbundling a shallow bundle			Unbundling a shallow bundle

	$ hg strip -r 66ee28d0328c			$ hg debugstrip -r 66ee28d0328c
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)
	1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)			1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
	$ hg unbundle .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg			$ hg unbundle .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 2 changesets with 0 changes to 0 files			added 2 changesets with 0 changes to 0 files
	new changesets 66ee28d0328c:16db62c5946f			new changesets 66ee28d0328c:16db62c5946f
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)

	Unbundling a full bundle			Unbundling a full bundle

	$ hg -R ../master bundle -r 66ee28d0328c:: --base "66ee28d0328c^" ../fullbundle.hg			$ hg -R ../master bundle -r 66ee28d0328c:: --base "66ee28d0328c^" ../fullbundle.hg
	2 changesets found			2 changesets found
	$ hg strip -r 66ee28d0328c			$ hg debugstrip -r 66ee28d0328c
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)
	$ hg unbundle ../fullbundle.hg			$ hg unbundle ../fullbundle.hg
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 2 changesets with 2 changes to 1 files			added 2 changesets with 2 changes to 1 files
	new changesets 66ee28d0328c:16db62c5946f (2 drafts)			new changesets 66ee28d0328c:16db62c5946f (2 drafts)
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)

	Pulling from a shallow bundle			Pulling from a shallow bundle

	$ hg strip -r 66ee28d0328c			$ hg debugstrip -r 66ee28d0328c
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)
	$ hg pull -r 66ee28d0328c .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg			$ hg pull -r 66ee28d0328c .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg
	pulling from .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg			pulling from .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 0 changes to 0 files			added 1 changesets with 0 changes to 0 files
	new changesets 66ee28d0328c (1 drafts)			new changesets 66ee28d0328c (1 drafts)
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)

	Pulling from a full bundle			Pulling from a full bundle

	$ hg strip -r 66ee28d0328c			$ hg debugstrip -r 66ee28d0328c
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-b6ee89e7-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-b6ee89e7-backup.hg (glob)
	$ hg pull -r 66ee28d0328c ../fullbundle.hg			$ hg pull -r 66ee28d0328c ../fullbundle.hg
	pulling from ../fullbundle.hg			pulling from ../fullbundle.hg
	searching for changes			searching for changes
	abort: cannot pull from full bundles			abort: cannot pull from full bundles
	(use `hg unbundle` instead)			(use `hg unbundle` instead)
	[255]			[255]

tests/test-remotefilelog-linknodes.t

	0632994590a8			0632994590a8
	b292c1e3311f			b292c1e3311f

	$ cd ..			$ cd ..

	# system cache has invalid linknode, but .hg/store/data has valid			# system cache has invalid linknode, but .hg/store/data has valid

	$ cd shallow			$ cd shallow
	$ hg strip -r 1 -q			$ hg debugstrip -r 1 -q
	$ rm -rf .hg/store/data/*			$ rm -rf .hg/store/data/*
	$ echo x >> x			$ echo x >> x
	$ hg commit -Aqm xx_local			$ hg commit -Aqm xx_local
	$ hg log -f x --template '{rev}:{node\|short}\n'			$ hg log -f x --template '{rev}:{node\|short}\n'
	1:21847713771d			1:21847713771d
	0:b292c1e3311f			0:b292c1e3311f

	$ cd ..			$ cd ..

tests/test-remotefilelog-local.t

	$ echo xxxx > x			$ echo xxxx > x
	$ echo yyyy > y			$ echo yyyy > y
	$ hg commit -m x			$ hg commit -m x
	created new head			created new head
	2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)			2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)

	# restore state for future tests			# restore state for future tests

	$ hg -q strip .			$ hg -q debugstrip .
	$ hg -q up tip			$ hg -q up tip

	# rebase			# rebase

	$ clearcache			$ clearcache
	$ cd ../master			$ cd ../master
	$ echo w > w			$ echo w > w
	$ hg commit -qAm w			$ hg commit -qAm w
	rebasing 1:9abfe7bca547 "a"			rebasing 1:9abfe7bca547 "a"
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-rebase.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-rebase.hg (glob)
	3 files fetched over 2 fetches - (3 misses, 0.00% hit ratio) over *s (glob)			3 files fetched over 2 fetches - (3 misses, 0.00% hit ratio) over *s (glob)

	# strip			# strip

	$ clearcache			$ clearcache
	$ hg debugrebuilddirstate # fixes dirstate non-determinism			$ hg debugrebuilddirstate # fixes dirstate non-determinism
	$ hg strip -r .			$ hg debugstrip -r .
	2 files updated, 0 files merged, 1 files removed, 0 files unresolved			2 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg (glob)
	4 files fetched over 2 fetches - (4 misses, 0.00% hit ratio) over *s (glob)			4 files fetched over 2 fetches - (4 misses, 0.00% hit ratio) over *s (glob)

	# unbundle			# unbundle

	$ clearcache			$ clearcache
	$ ls			$ ls

	$ echo merge >> w			$ echo merge >> w
	$ hg commit -m w			$ hg commit -m w
	created new head			created new head
	$ hg merge 2			$ hg merge 2
	3 files updated, 0 files merged, 0 files removed, 0 files unresolved			3 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg commit -m merge			$ hg commit -m merge
	$ hg strip -q -r ".^"			$ hg debugstrip -q -r ".^"

	# commit without producing new node			# commit without producing new node

	$ cd $TESTTMP			$ cd $TESTTMP
	$ hgcloneshallow ssh://user@dummy/master shallow3 -q			$ hgcloneshallow ssh://user@dummy/master shallow3 -q
	$ cd shallow3			$ cd shallow3
	$ echo 1 > A			$ echo 1 > A
	$ hg commit -m foo -A A			$ hg commit -m foo -A A
	$ hg log -r . -T '{node}\n'			$ hg log -r . -T '{node}\n'
	383ce605500277f879b7460a16ba620eb6930b7f			383ce605500277f879b7460a16ba620eb6930b7f
	$ hg update -r '.^' -q			$ hg update -r '.^' -q
	$ echo 1 > A			$ echo 1 > A
	$ hg commit -m foo -A A			$ hg commit -m foo -A A
	$ hg log -r . -T '{node}\n'			$ hg log -r . -T '{node}\n'
	383ce605500277f879b7460a16ba620eb6930b7f			383ce605500277f879b7460a16ba620eb6930b7f

tests/test-remotefilelog-prefetch.t


	$ hg cat -r 1 y			$ hg cat -r 1 y
	y			y
	1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)			1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

	# prefetch on pull when configured			# prefetch on pull when configured

	$ printf "[remotefilelog]\npullprefetch=bookmark()\n" >> .hg/hgrc			$ printf "[remotefilelog]\npullprefetch=bookmark()\n" >> .hg/hgrc
	$ hg strip tip			$ hg debugstrip tip
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)

	$ clearcache			$ clearcache
	$ hg pull			$ hg pull
	pulling from ssh://user@dummy/master			pulling from ssh://user@dummy/master
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	updating bookmark foo			updating bookmark foo
	added 1 changesets with 0 changes to 0 files			added 1 changesets with 0 changes to 0 files
	new changesets 109c3a557a73			new changesets 109c3a557a73
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)
	prefetching file contents			prefetching file contents
	3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)			3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)

	$ hg up tip			$ hg up tip
	3 files updated, 0 files merged, 0 files removed, 0 files unresolved			3 files updated, 0 files merged, 0 files removed, 0 files unresolved

	# prefetch only fetches changes not in working copy			# prefetch only fetches changes not in working copy

	$ hg strip tip			$ hg debugstrip tip
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/109c3a557a73-3f43405e-backup.hg (glob)
	1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)			1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
	$ clearcache			$ clearcache

	$ hg pull			$ hg pull
	pulling from ssh://user@dummy/master			pulling from ssh://user@dummy/master
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	updating bookmark foo			updating bookmark foo
	added 1 changesets with 0 changes to 0 files			added 1 changesets with 0 changes to 0 files
	new changesets 109c3a557a73			new changesets 109c3a557a73
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)
	prefetching file contents			prefetching file contents
	2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)			2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)

	# Make some local commits that produce the same file versions as are on the			# Make some local commits that produce the same file versions as are on the
	# server. To simulate a situation where we have local commits that were somehow			# server. To simulate a situation where we have local commits that were somehow
	# pushed, and we will soon pull.			# pushed, and we will soon pull.

	$ hg prefetch -r 'all()'			$ hg prefetch -r 'all()'
	2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)			2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
	$ hg strip -q -r 0			$ hg debugstrip -q -r 0
	$ echo x > x			$ echo x > x
	$ echo z > z			$ echo z > z
	$ hg commit -qAm x			$ hg commit -qAm x
	$ echo x2 > x			$ echo x2 > x
	$ echo y > y			$ echo y > y
	$ hg commit -qAm y			$ hg commit -qAm y

	# prefetch server versions, even if local versions are available			# prefetch server versions, even if local versions are available

	$ clearcache			$ clearcache
	$ hg strip -q tip			$ hg debugstrip -q tip
	$ hg pull			$ hg pull
	pulling from ssh://user@dummy/master			pulling from ssh://user@dummy/master
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	updating bookmark foo			updating bookmark foo
	added 1 changesets with 0 changes to 0 files			added 1 changesets with 0 changes to 0 files

tests/test-remotefilelog-push-pull.t

	adding file changes			adding file changes
	added 3 changesets with 4 changes to 3 files			added 3 changesets with 4 changes to 3 files
	new changesets d34c38483be9:d7373980d475 (2 drafts)			new changesets d34c38483be9:d7373980d475 (2 drafts)
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)
	2 files fetched over 2 fetches - (2 misses, 0.00% hit ratio) over *s (glob)			2 files fetched over 2 fetches - (2 misses, 0.00% hit ratio) over *s (glob)

	# pull from shallow to shallow (ssh)			# pull from shallow to shallow (ssh)

	$ hg strip -r 1			$ hg debugstrip -r 1
	saved backup bundle to $TESTTMP/shallow2/.hg/strip-backup/d34c38483be9-89d325c9-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow2/.hg/strip-backup/d34c38483be9-89d325c9-backup.hg (glob)
	$ hg pull ssh://user@dummy/$TESTTMP/shallow --config remotefilelog.cachepath=${CACHEDIR}2			$ hg pull ssh://user@dummy/$TESTTMP/shallow --config remotefilelog.cachepath=${CACHEDIR}2
	pulling from ssh://user@dummy/$TESTTMP/shallow			pulling from ssh://user@dummy/$TESTTMP/shallow
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 4 changes to 3 files			added 3 changesets with 4 changes to 3 files
	new changesets d34c38483be9:d7373980d475 (2 drafts)			new changesets d34c38483be9:d7373980d475 (2 drafts)
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)
	1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)			1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

	$ hg up			$ hg up
	3 files updated, 0 files merged, 0 files removed, 0 files unresolved			3 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ cat z			$ cat z
	z			z

	$ hg -R ../shallow strip -qr 3			$ hg -R ../shallow debugstrip -qr 3
	$ hg strip -qr 3			$ hg debugstrip -qr 3
	$ cd ..			$ cd ..

	# push from shallow to shallow			# push from shallow to shallow

	$ cd shallow			$ cd shallow
	$ echo a > a			$ echo a > a
	$ hg commit -qAm a			$ hg commit -qAm a
	$ hg push ssh://user@dummy/$TESTTMP/shallow2			$ hg push ssh://user@dummy/$TESTTMP/shallow2

tests/test-remotefilelog-repack-fast.t

	d4a3ed9310e5 aee31534993a 000000000000 421535db10b6			d4a3ed9310e5 aee31534993a 000000000000 421535db10b6
	aee31534993a 1406e7411862 000000000000 a89d614e2364			aee31534993a 1406e7411862 000000000000 a89d614e2364
	1406e7411862 000000000000 000000000000 b292c1e3311f			1406e7411862 000000000000 000000000000 b292c1e3311f

	y			y
	Node P1 Node P2 Node Link Node Copy From			Node P1 Node P2 Node Link Node Copy From
	577959738234 1bb2e6237e03 000000000000 c7faf2fc439a x			577959738234 1bb2e6237e03 000000000000 c7faf2fc439a x
	21f46f2721e7 000000000000 000000000000 d6868642b790			21f46f2721e7 000000000000 000000000000 d6868642b790
	$ hg strip -r '.^'			$ hg debugstrip -r '.^'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)
	$ hg -R ../master strip -r '.^'			$ hg -R ../master debugstrip -r '.^'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/master/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)			saved backup bundle to $TESTTMP/master/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)

	$ rm -rf $TESTTMP/hgcache/master/packs			$ rm -rf $TESTTMP/hgcache/master/packs
	$ cp -R $TESTTMP/backuppacks $TESTTMP/hgcache/master/packs			$ cp -R $TESTTMP/backuppacks $TESTTMP/hgcache/master/packs

	# Test repacking datapack without history			# Test repacking datapack without history
	$ rm -rf $CACHEDIR/master/packs/hist			$ rm -rf $CACHEDIR/master/packs/hist

tests/test-remotefilelog-repack.t

	d4a3ed9310e5 aee31534993a 000000000000 421535db10b6			d4a3ed9310e5 aee31534993a 000000000000 421535db10b6
	aee31534993a 1406e7411862 000000000000 a89d614e2364			aee31534993a 1406e7411862 000000000000 a89d614e2364
	1406e7411862 000000000000 000000000000 b292c1e3311f			1406e7411862 000000000000 000000000000 b292c1e3311f

	y			y
	Node P1 Node P2 Node Link Node Copy From			Node P1 Node P2 Node Link Node Copy From
	577959738234 1bb2e6237e03 000000000000 c7faf2fc439a x			577959738234 1bb2e6237e03 000000000000 c7faf2fc439a x
	21f46f2721e7 000000000000 000000000000 d6868642b790			21f46f2721e7 000000000000 000000000000 d6868642b790
	$ hg strip -r '.^'			$ hg debugstrip -r '.^'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)
	$ hg -R ../master strip -r '.^'			$ hg -R ../master debugstrip -r '.^'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/master/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)			saved backup bundle to $TESTTMP/master/.hg/strip-backup/609547eda446-b26b56a8-backup.hg (glob)

	$ rm -rf $TESTTMP/hgcache/master/packs			$ rm -rf $TESTTMP/hgcache/master/packs
	$ cp -R $TESTTMP/backuppacks $TESTTMP/hgcache/master/packs			$ cp -R $TESTTMP/backuppacks $TESTTMP/hgcache/master/packs

	# Test repacking datapack without history			# Test repacking datapack without history
	$ rm -rf $CACHEDIR/master/packs/hist			$ rm -rf $CACHEDIR/master/packs/hist

tests/test-remotefilelog-sparse.t

	1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)			1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

	$ hg cat -r 0 z			$ hg cat -r 0 z
	z			z

	# prefetch sparse only on pull when configured			# prefetch sparse only on pull when configured

	$ printf "[remotefilelog]\npullprefetch=bookmark()\n" >> .hg/hgrc			$ printf "[remotefilelog]\npullprefetch=bookmark()\n" >> .hg/hgrc
	$ hg strip tip			$ hg debugstrip tip
	saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/876b1317060d-b2e91d8d-backup.hg (glob)			saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/876b1317060d-b2e91d8d-backup.hg (glob)

	$ hg debugsparse --delete z			$ hg debugsparse --delete z

	$ clearcache			$ clearcache
	$ hg pull			$ hg pull
	pulling from ssh://user@dummy/master			pulling from ssh://user@dummy/master
	searching for changes			searching for changes

tests/test-repair-strip.t

	$ echo "[extensions]" >> $HGRCPATH			$ echo "[extensions]" >> $HGRCPATH
	$ echo "mq=">> $HGRCPATH			$ echo "mq=">> $HGRCPATH

	$ teststrip() {			$ teststrip() {
	> hg -q up -C $1			> hg -q up -C $1
	> echo % before update $1, strip $2			> echo % before update $1, strip $2
	> hg parents			> hg parents
	> chmod -$3 $4			> chmod -$3 $4
	> hg strip $2 2>&1 \| sed 's/$bundle$./\1/' \| sed 's/Permission denied.\.hg\/store\/$.*$/Permission denied \.hg\/store\/\1/'			> hg debugstrip $2 2>&1 \| sed 's/$bundle$./\1/' \| sed 's/Permission denied.\.hg\/store\/$.*$/Permission denied \.hg\/store\/\1/'
	> echo % after update $1, strip $2			> echo % after update $1, strip $2
	> chmod +$3 $4			> chmod +$3 $4
	> hg verify			> hg verify
	> echo % journal contents			> echo % journal contents
	> if [ -f .hg/store/journal ]; then			> if [ -f .hg/store/journal ]; then
	> cat .hg/store/journal \| "$PYTHON" $TESTTMP/dumpjournal.py			> cat .hg/store/journal \| "$PYTHON" $TESTTMP/dumpjournal.py
	> else			> else
	> echo "(no journal)"			> echo "(no journal)"

tests/test-shelve.t

	$ hg commit -q -m "Branch commit 2"			$ hg commit -q -m "Branch commit 2"
	$ hg shelve			$ hg shelve
	nothing changed			nothing changed
	[1]			[1]

	cleaning the branches made for name checking tests			cleaning the branches made for name checking tests

	$ hg up default -q			$ hg up default -q
	$ hg strip e9177275307e+6a6d231f43d+882bae7c62c2 -q			$ hg debugstrip e9177275307e+6a6d231f43d+882bae7c62c2 -q

	create an mq patch - shelving should work fine with a patch applied			create an mq patch - shelving should work fine with a patch applied

	$ echo n > n			$ echo n > n
	$ hg add n			$ hg add n
	$ hg commit n -m second			$ hg commit n -m second
	$ hg qnew second.patch			$ hg qnew second.patch

tests/test-shelve2.t

	[1]			[1]
	$ hg abort			$ hg abort
	unshelve of 'default' aborted			unshelve of 'default' aborted

	Unshelve without .shelve metadata (can happen when upgrading a repository with old shelve)			Unshelve without .shelve metadata (can happen when upgrading a repository with old shelve)

	$ cat .hg/shelved/default.shelve			$ cat .hg/shelved/default.shelve
	node=82e0cb9893247d12667017593ce1e5655860f1ac			node=82e0cb9893247d12667017593ce1e5655860f1ac
	$ hg strip --hidden --rev 82e0cb989324 --no-backup			$ hg debugstrip --hidden --rev 82e0cb989324 --no-backup
	$ rm .hg/shelved/default.shelve			$ rm .hg/shelved/default.shelve
	$ hg unshelve			$ hg unshelve
	unshelving change 'default'			unshelving change 'default'
	temporarily committing pending changes (restore with 'hg unshelve --abort')			temporarily committing pending changes (restore with 'hg unshelve --abort')
	rebasing shelved changes			rebasing shelved changes
	merging a			merging a
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')			unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')

tests/test-single-head.t

	o changeset: 0:ea207398892e			o changeset: 0:ea207398892e
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT


	actual stripping			actual stripping

	$ hg strip --config extensions.strip= --rev 'desc("c_dH0")'			$ hg debugstrip --rev 'desc("c_dH0")'
	saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg			saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg

	Test that closing heads are ignored by default			Test that closing heads are ignored by default
	-----------------------------------------------			-----------------------------------------------

	$ hg up 'desc("c_aG0")'			$ hg up 'desc("c_aG0")'
	0 files updated, 0 files merged, 2 files removed, 0 files unresolved			0 files updated, 0 files merged, 2 files removed, 0 files unresolved
	$ mkcommit c_aJ0			$ mkcommit c_aJ0

tests/test-sparse-clear.t

	test sparse			test sparse

	$ hg init myrepo			$ hg init myrepo
	$ cd myrepo			$ cd myrepo
	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> sparse=			> sparse=
	> purge=			> purge=
	> strip=
	> rebase=			> rebase=
	> EOF			> EOF

	$ echo a > index.html			$ echo a > index.html
	$ echo x > data.py			$ echo x > data.py
	$ echo z > readme.txt			$ echo z > readme.txt
	$ cat > base.sparse <<EOF			$ cat > base.sparse <<EOF
	> [include]			> [include]

tests/test-sparse-clone.t

	test sparse			test sparse

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [ui]			> [ui]
	> ssh = "$PYTHON" "$RUNTESTDIR/dummyssh"			> ssh = "$PYTHON" "$RUNTESTDIR/dummyssh"
	> username = nobody <no.reply@fb.com>			> username = nobody <no.reply@fb.com>
	> [extensions]			> [extensions]
	> sparse=			> sparse=
	> purge=			> purge=
	> strip=
	> rebase=			> rebase=
	> EOF			> EOF

	$ hg init myrepo			$ hg init myrepo
	$ cd myrepo			$ cd myrepo
	$ echo a > index.html			$ echo a > index.html
	$ echo x > data.py			$ echo x > data.py
	$ echo z > readme.txt			$ echo z > readme.txt

tests/test-sparse-fsmonitor.t

	This test doesn't yet work due to the way fsmonitor is integrated with test runner			This test doesn't yet work due to the way fsmonitor is integrated with test runner

	$ exit 80			$ exit 80

	test sparse interaction with other extensions			test sparse interaction with other extensions

	$ hg init myrepo			$ hg init myrepo
	$ cd myrepo			$ cd myrepo
	$ cat > .hg/hgrc <<EOF			$ cat > .hg/hgrc <<EOF
	> [extensions]			> [extensions]
	> sparse=			> sparse=
	> strip=
	> EOF			> EOF

	Test fsmonitor integration (if available)			Test fsmonitor integration (if available)
	TODO: make fully isolated integration test a'la https://github.com/facebook/watchman/blob/master/tests/integration/WatchmanInstance.py			TODO: make fully isolated integration test a'la https://github.com/facebook/watchman/blob/master/tests/integration/WatchmanInstance.py
	(this one is using the systemwide watchman instance)			(this one is using the systemwide watchman instance)

	$ touch .watchmanconfig			$ touch .watchmanconfig
	$ echo "ignoredir1/" >> .hgignore			$ echo "ignoredir1/" >> .hgignore

tests/test-sparse-import.t

	test sparse			test sparse

	$ hg init myrepo			$ hg init myrepo
	$ cd myrepo			$ cd myrepo
	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> sparse=			> sparse=
	> purge=			> purge=
	> strip=
	> rebase=			> rebase=
	> EOF			> EOF

	$ echo a > index.html			$ echo a > index.html
	$ echo x > data.py			$ echo x > data.py
	$ echo z > readme.txt			$ echo z > readme.txt
	$ cat > base.sparse <<EOF			$ cat > base.sparse <<EOF
	> [include]			> [include]

tests/test-sparse-merges.t


	$ hg cat -r . bar			$ hg cat -r . bar
	bar			bar
	bar2			bar2

	Test merging things outside of the sparse checkout that are not in the working			Test merging things outside of the sparse checkout that are not in the working
	copy			copy

	$ hg strip -q -r . --config extensions.strip=			$ hg debugstrip -q -r .
	$ hg up -q feature			$ hg up -q feature
	$ touch branchonly			$ touch branchonly
	$ hg ci -Aqm 'add branchonly'			$ hg ci -Aqm 'add branchonly'

	$ hg up -q default			$ hg up -q default
	$ hg debugsparse -X branchonly			$ hg debugsparse -X branchonly
	$ hg merge feature			$ hg merge feature
	temporarily included 2 file(s) in the sparse checkout for merging			temporarily included 2 file(s) in the sparse checkout for merging

tests/test-sparse-profiles.t

	test sparse			test sparse

	$ hg init myrepo			$ hg init myrepo
	$ cd myrepo			$ cd myrepo
	$ cat > .hg/hgrc <<EOF			$ cat > .hg/hgrc <<EOF
	> [extensions]			> [extensions]
	> sparse=			> sparse=
	> purge=			> purge=
	> strip=
	> rebase=			> rebase=
	> EOF			> EOF

	Config file without [section] is rejected			Config file without [section] is rejected

	$ cat > bad.sparse <<EOF			$ cat > bad.sparse <<EOF
	> *.html			> *.html
	> EOF			> EOF

	$ hg cat -r . data.py			$ hg cat -r . data.py
	x			x
	foo			foo
	bar			bar

	Verify stripping refreshes dirstate			Verify stripping refreshes dirstate

	$ hg strip -q -r .			$ hg debugstrip -q -r .
	$ ls			$ ls
	backend.sparse			backend.sparse
	index.html			index.html
	webpage.sparse			webpage.sparse

	Verify rebase conflicts pulls in the conflicting changes			Verify rebase conflicts pulls in the conflicting changes

	$ hg up -q 1			$ hg up -q 1

tests/test-sparse-verbose-json.t

	test sparse with --verbose and -T json			test sparse with --verbose and -T json

	$ hg init myrepo			$ hg init myrepo
	$ cd myrepo			$ cd myrepo
	$ cat > .hg/hgrc <<EOF			$ cat > .hg/hgrc <<EOF
	> [extensions]			> [extensions]
	> sparse=			> sparse=
	> strip=
	> EOF			> EOF

	$ echo a > show			$ echo a > show
	$ echo x > hide			$ echo x > hide
	$ hg ci -Aqm 'initial'			$ hg ci -Aqm 'initial'

	$ echo b > show			$ echo b > show
	$ echo y > hide			$ echo y > hide

tests/test-sparse.t

	test sparse			test sparse

	$ hg init myrepo			$ hg init myrepo
	$ cd myrepo			$ cd myrepo
	$ cat > .hg/hgrc <<EOF			$ cat > .hg/hgrc <<EOF
	> [extensions]			> [extensions]
	> sparse=			> sparse=
	> strip=
	> EOF			> EOF

	$ echo a > show			$ echo a > show
	$ echo x > hide			$ echo x > hide
	$ hg ci -Aqm 'initial'			$ hg ci -Aqm 'initial'

	$ echo b > show			$ echo b > show
	$ echo y > hide			$ echo y > hide
	$ hg log -r . -T '{rev}\n' --stat			$ hg log -r . -T '{rev}\n' --stat
	1			1
	hide \| 2 +-			hide \| 2 +-
	hide2 \| 1 +			hide2 \| 1 +
	show \| 2 +-			show \| 2 +-
	show2 \| 1 +			show2 \| 1 +
	4 files changed, 4 insertions(+), 2 deletions(-)			4 files changed, 4 insertions(+), 2 deletions(-)

	$ hg strip -r . -k			$ hg debugstrip -r . -k
	saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/39278f7c08a9-ce59e002-backup.hg			saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/39278f7c08a9-ce59e002-backup.hg
	$ hg status			$ hg status
	M show			M show
	? show2			? show2

	Verify rebase succeeds if all changed files are in sparse checkout			Verify rebase succeeds if all changed files are in sparse checkout

	$ hg commit -Aqm "add show2"			$ hg commit -Aqm "add show2"

tests/test-ssh-proto-unbundle.t

	$ cat > hgrc-sshv2 << EOF			$ cat > hgrc-sshv2 << EOF
	> %include $HGRCPATH			> %include $HGRCPATH
	> [experimental]			> [experimental]
	> sshpeer.advertise-v2 = true			> sshpeer.advertise-v2 = true
	> sshserver.support-v2 = true			> sshserver.support-v2 = true
	> EOF			> EOF

	$ debugwireproto() {			$ debugwireproto() {
	> commands=`cat -`			> commands=`cat -`
	> echo 'testing ssh1'			> echo 'testing ssh1'
	> tip=`hg log -r tip -T '{node}'`			> tip=`hg log -r tip -T '{node}'`
	> echo "${commands}" \| hg --verbose debugwireproto --localssh --noreadstderr			> echo "${commands}" \| hg --verbose debugwireproto --localssh --noreadstderr
	> if [ -n "$1" ]; then			> if [ -n "$1" ]; then
	> hg --config extensions.strip= strip --no-backup -r "all() - ::${tip}"			> hg debugstrip --no-backup -r "all() - ::${tip}"
	> fi			> fi
	> echo ""			> echo ""
	> echo 'testing ssh2'			> echo 'testing ssh2'
	> echo "${commands}" \| HGRCPATH=$TESTTMP/hgrc-sshv2 hg --verbose debugwireproto --localssh --noreadstderr			> echo "${commands}" \| HGRCPATH=$TESTTMP/hgrc-sshv2 hg --verbose debugwireproto --localssh --noreadstderr
	> if [ -n "$1" ]; then			> if [ -n "$1" ]; then
	> hg --config extensions.strip= strip --no-backup -r "all() - ::${tip}"			> hg debugstrip --no-backup -r "all() - ::${tip}"
	> fi			> fi
	> }			> }

	Generate some bundle files			Generate some bundle files

	$ hg init repo			$ hg init repo
	$ cd repo			$ cd repo
	$ echo 0 > foo			$ echo 0 > foo

tests/test-strip.t

This file was copied to tests/test-debugstrip.t.

	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: mergeCD			summary: mergeCD

	#endif			#endif

	check strip behavior			check strip behavior

	$ hg --config extensions.strip= strip 'desc(commitD)' --debug			$ hg strip 'desc(commitD)' --debug
	resolving manifests			resolving manifests
	branchmerge: False, force: True, partial: False			branchmerge: False, force: True, partial: False
	ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71			ancestor: d8db9d137221+, local: d8db9d137221+, remote: eca11cf91c71
	c: other deleted -> r			c: other deleted -> r
	removing c			removing c
	d: other deleted -> r			d: other deleted -> r
	removing d			removing d
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)

tests/test-subrepo-missing.t

	$ echo bar > subrepo/a			$ echo bar > subrepo/a
	$ hg -R subrepo ci --amend -m "amend a (again)"			$ hg -R subrepo ci --amend -m "amend a (again)"
	$ hg --hidden cat subrepo/a			$ hg --hidden cat subrepo/a
	foo			foo

	verify will warn if locked-in subrepo revisions are hidden or missing			verify will warn if locked-in subrepo revisions are hidden or missing

	$ hg ci -m "amended subrepo (again)"			$ hg ci -m "amended subrepo (again)"
	$ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip' --config devel.strip-obsmarkers=no			$ hg --hidden debugstrip -R subrepo -qr 'tip' --config devel.strip-obsmarkers=no
	$ hg verify			$ hg verify
	checking changesets			checking changesets
	checking manifests			checking manifests
	crosschecking files in changesets and manifests			crosschecking files in changesets and manifests
	checking files			checking files
	checked 5 changesets with 5 changes to 2 files			checked 5 changesets with 5 changes to 2 files
	checking subrepo links			checking subrepo links
	subrepo 'subrepo' is hidden in revision a66de08943b6			subrepo 'subrepo' is hidden in revision a66de08943b6

tests/test-subrepo.t

	revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4			revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
	$ cat .hgsubstate			$ cat .hgsubstate
	e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s			e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s

	clean up to avoid having to fix up the tests below			clean up to avoid having to fix up the tests below

	$ hg co -C 10			$ hg co -C 10
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ cat >> $HGRCPATH <<EOF			$ hg debugstrip -r 11:15
	> [extensions]
	> strip=
	> EOF
	$ hg strip -r 11:15
	saved backup bundle to $TESTTMP/t/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/t/.hg/strip-backup/*-backup.hg (glob)

	clone			clone

	$ cd ..			$ cd ..
	$ hg clone t tc			$ hg clone t tc
	updating to branch default			updating to branch default
	cloning subrepo s from $TESTTMP/t/s			cloning subrepo s from $TESTTMP/t/s

tests/test-tags.t

	1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 3/4 cache hits/lookups in * seconds (glob)			1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 3/4 cache hits/lookups in * seconds (glob)
	1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags			1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags
	1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)			1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)
	1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> blackbox -l 6			1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> blackbox -l 6

	$ f --size .hg/cache/hgtagsfnodes1			$ f --size .hg/cache/hgtagsfnodes1
	.hg/cache/hgtagsfnodes1: size=168			.hg/cache/hgtagsfnodes1: size=168

	$ hg -q --config extensions.strip= strip -r 6 --no-backup			$ hg -q debugstrip -r 6 --no-backup
	#endif			#endif

	Stripping doesn't truncate the tags cache until new data is available			Stripping doesn't truncate the tags cache until new data is available

	$ rm -f .hg/cache/hgtagsfnodes1 .hg/cache/tags2-visible			$ rm -f .hg/cache/hgtagsfnodes1 .hg/cache/tags2-visible
	$ hg tags			$ hg tags
	tip 5:8dbfe60eff30			tip 5:8dbfe60eff30
	bar 1:78391a272241			bar 1:78391a272241

	$ f --size .hg/cache/hgtagsfnodes1			$ f --size .hg/cache/hgtagsfnodes1
	.hg/cache/hgtagsfnodes1: size=144			.hg/cache/hgtagsfnodes1: size=144

	$ hg -q --config extensions.strip= strip -r 5 --no-backup			$ hg -q debugstrip -r 5 --no-backup
	$ hg tags			$ hg tags
	tip 4:0c192d7d5e6b			tip 4:0c192d7d5e6b
	bar 1:78391a272241			bar 1:78391a272241

	$ hg blackbox -l 5			$ hg blackbox -l 5
	1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing 24 bytes to cache/hgtagsfnodes1			1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing 24 bytes to cache/hgtagsfnodes1
	1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> 2/4 cache hits/lookups in * seconds (glob)			1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> 2/4 cache hits/lookups in * seconds (glob)
	1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing .hg/cache/tags2-visible with 1 tags			1970/01/01 00:00:00 bob @0c192d7d5e6b78a714de54a2e9627952a877e25a (5000)> writing .hg/cache/tags2-visible with 1 tags
	1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing 24 bytes to cache/hgtagsfnodes1			1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing 24 bytes to cache/hgtagsfnodes1
	1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> 3/4 cache hits/lookups in * seconds (glob)			1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> 3/4 cache hits/lookups in * seconds (glob)
	1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing .hg/cache/tags2-visible with 1 tags			1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> writing .hg/cache/tags2-visible with 1 tags
	1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> tags exited 0 after * seconds (glob)			1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> tags exited 0 after * seconds (glob)
	1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> blackbox -l 6			1970/01/01 00:00:00 bob @035f65efb448350f4772141702a81ab1df48c465 (5000)> blackbox -l 6
	$ f --size .hg/cache/hgtagsfnodes1			$ f --size .hg/cache/hgtagsfnodes1
	.hg/cache/hgtagsfnodes1: size=144			.hg/cache/hgtagsfnodes1: size=144

	$ hg -q --config extensions.strip= strip -r 5 --no-backup			$ hg -q debugstrip -r 5 --no-backup

	Test tag removal:			Test tag removal:

	$ hg tag --remove bar # rev 5			$ hg tag --remove bar # rev 5
	$ hg tip -vp			$ hg tip -vp
	changeset: 5:5f6e8655b1c7			changeset: 5:5f6e8655b1c7
	tag: tip			tag: tip
	user: test			user: test
	abort: tag 'bar' already exists (use -f to force)			abort: tag 'bar' already exists (use -f to force)
	[255]			[255]
	$ hg tags			$ hg tags
	tip 6:735c3ca72986			tip 6:735c3ca72986
	bar 0:bbd179dfa0a7			bar 0:bbd179dfa0a7

	Strip 1: expose an old head:			Strip 1: expose an old head:

	$ hg --config extensions.mq= strip 5			$ hg --config extensions.mq= debugstrip 5
	saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
	$ hg tags # partly stale cache			$ hg tags # partly stale cache
	tip 5:735c3ca72986			tip 5:735c3ca72986
	bar 1:78391a272241			bar 1:78391a272241
	$ hg tags # up-to-date cache			$ hg tags # up-to-date cache
	tip 5:735c3ca72986			tip 5:735c3ca72986
	bar 1:78391a272241			bar 1:78391a272241

	Strip 2: destroy whole branch, no old head exposed			Strip 2: destroy whole branch, no old head exposed

	$ hg --config extensions.mq= strip 4			$ hg --config extensions.mq= debugstrip 4
	saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob)
	$ hg tags # partly stale			$ hg tags # partly stale
	tip 4:735c3ca72986			tip 4:735c3ca72986
	bar 0:bbd179dfa0a7			bar 0:bbd179dfa0a7
	$ rm -f .hg/cache/tags2-visible			$ rm -f .hg/cache/tags2-visible
	$ hg tags # cold cache			$ hg tags # cold cache
	tip 4:735c3ca72986			tip 4:735c3ca72986
	bar 0:bbd179dfa0a7			bar 0:bbd179dfa0a7

tests/test-template-map.t

	$ hg --color=debug --debug log -T phases > phases.out			$ hg --color=debug --debug log -T phases > phases.out
	$ cmp log.out phases.out \|\| diff -u log.out phases.out			$ cmp log.out phases.out \|\| diff -u log.out phases.out

	$ mv $HGRCPATH-bak $HGRCPATH			$ mv $HGRCPATH-bak $HGRCPATH

	Remove commit with empty commit message, so as to not pollute further			Remove commit with empty commit message, so as to not pollute further
	tests.			tests.

	$ hg --config extensions.strip= strip -q .			$ hg debugstrip -q .

	Revision with no copies (used to print a traceback):			Revision with no copies (used to print a traceback):

	$ hg tip -v --template '\n'			$ hg tip -v --template '\n'


	Compact style works:			Compact style works:

tests/test-transplant.t

	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 4 changesets with 4 changes to 4 files			added 4 changesets with 4 changes to 4 files
	new changesets 17ab29e464c6:a53251cdf717			new changesets 17ab29e464c6:a53251cdf717

	test "--merge" causing pull from source repository on local host			test "--merge" causing pull from source repository on local host

	$ hg --config extensions.mq= -q strip 2			$ hg --config extensions.mq= -q debugstrip 2
	$ hg transplant -s ../t --merge tip			$ hg transplant -s ../t --merge tip
	searching for changes			searching for changes
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	applying a53251cdf717			applying a53251cdf717
	4:a53251cdf717 merged at 4831f4dc831a			4:a53251cdf717 merged at 4831f4dc831a
	added 2 changesets with 2 changes to 2 files			added 2 changesets with 2 changes to 2 files

	test interactive transplant			test interactive transplant

	$ hg --config extensions.strip= -q strip 0			$ hg -q debugstrip 0
	$ hg -R ../t log -G --template "{rev}:{node\|short}"			$ hg -R ../t log -G --template "{rev}:{node\|short}"
	@ 4:a53251cdf717			@ 4:a53251cdf717
	\|			\|
	o 3:722f4667af76			o 3:722f4667af76
	\|			\|
	o 2:37a1297eb21b			o 2:37a1297eb21b
	\|			\|
	\| o 1:d11e3596cc1a			\| o 1:d11e3596cc1a

tests/test-treemanifest.t

	0 4 064927a0648a 000000000000 000000000000			0 4 064927a0648a 000000000000 000000000000
	1 5 25ecb8cb8618 000000000000 000000000000			1 5 25ecb8cb8618 000000000000 000000000000
	2 6 5b16163a30c6 25ecb8cb8618 000000000000			2 6 5b16163a30c6 25ecb8cb8618 000000000000

	Stripping and recovering changes should work			Stripping and recovering changes should work

	$ hg st --change tip			$ hg st --change tip
	M dir1/a			M dir1/a
	$ hg --config extensions.strip= strip tip			$ hg debugstrip tip
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg			saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
	$ hg debugindex --dir dir1			$ hg debugindex --dir dir1
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 4 064927a0648a 000000000000 000000000000			0 4 064927a0648a 000000000000 000000000000
	1 5 25ecb8cb8618 000000000000 000000000000			1 5 25ecb8cb8618 000000000000 000000000000

	#if repobundlerepo			#if repobundlerepo

	$ hg unbundle .hg/strip-backup/*			$ hg unbundle .hg/strip-backup/*
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	new changesets 51cfd7b1e13b (1 drafts)			new changesets 51cfd7b1e13b (1 drafts)
	(run 'hg update' to get a working copy)			(run 'hg update' to get a working copy)
	$ hg --config extensions.strip= strip tip			$ hg debugstrip tip
	saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)			saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
	$ hg unbundle -q .hg/strip-backup/*			$ hg unbundle -q .hg/strip-backup/*
	$ hg debugindex --dir dir1			$ hg debugindex --dir dir1
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 4 064927a0648a 000000000000 000000000000			0 4 064927a0648a 000000000000 000000000000
	1 5 25ecb8cb8618 000000000000 000000000000			1 5 25ecb8cb8618 000000000000 000000000000
	2 6 5b16163a30c6 25ecb8cb8618 000000000000			2 6 5b16163a30c6 25ecb8cb8618 000000000000
	$ hg st --change tip			$ hg st --change tip
	$ echo z >> z			$ echo z >> z
	$ hg commit -Aqm 'pre-empty commit'			$ hg commit -Aqm 'pre-empty commit'
	$ hg rm z			$ hg rm z
	$ hg commit --amend -m 'empty commit'			$ hg commit --amend -m 'empty commit'
	saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg			saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg
	$ hg log -r 'tip + tip^' -T '{manifest}\n'			$ hg log -r 'tip + tip^' -T '{manifest}\n'
	1:678d3574b88c			1:678d3574b88c
	1:678d3574b88c			1:678d3574b88c
	$ hg --config extensions.strip= strip -r . -q			$ hg debugstrip -r . -q

tests/testlib/exchange-obsmarker-util.sh

	publish=False			publish=False

	[experimental]			[experimental]
	# reduce output changes			# reduce output changes
	bundle2-output-capture=True			bundle2-output-capture=True
	# enable evolution			# enable evolution
	evolution=true			evolution=true

	[extensions]
	# we need to strip some changeset for some test cases
	hgext.strip=

	[devel]			[devel]
	strip-obsmarkers = no			strip-obsmarkers = no

	[alias]			[alias]
	# fix date used to create obsolete markers.			# fix date used to create obsolete markers.
	debugobsolete=debugobsolete -d '0 0'			debugobsolete=debugobsolete -d '0 0'
	# poor man substiture to the evolve 'hg prune'. using prune makes the test clearer and			# poor man substiture to the evolve 'hg prune'. using prune makes the test clearer and
	prune = !sh $TESTTMP/prune.sh \$1 "\$2" "\$3"			prune = !sh $TESTTMP/prune.sh \$1 "\$2" "\$3"

tests/testlib/push-checkheads-util.sh

	# setup config and various utility to test new heads checks on push			# setup config and various utility to test new heads checks on push

	cat >> $HGRCPATH <<EOF			cat >> $HGRCPATH <<EOF
	[ui]			[ui]
	# simpler log output			# simpler log output
	logtemplate ="{node\|short} ({phase}): {desc}\n"			logtemplate ="{node\|short} ({phase}): {desc}\n"

	[phases]			[phases]
	# non publishing server			# non publishing server
	publish=False			publish=False

	[extensions]
	# we need to strip some changeset for some test cases
	strip=

	[experimental]			[experimental]
	# enable evolution			# enable evolution
	evolution=all			evolution=all

	[alias]			[alias]
	# fix date used to create obsolete markers.			# fix date used to create obsolete markers.
	debugobsolete=debugobsolete -d '0 0'			debugobsolete=debugobsolete -d '0 0'
	EOF			EOF

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	16856		Oct 5 2019, 3:41 PM	★	★
Diff 2	16914		Oct 6 2019, 1:48 PM	★	★
Diff 3	17120		Oct 12 2019, 5:59 PM	★	★