tests/test-log.t
1830	would it be better to put the verb in the abort top-line, isntead of the hint? that is: abort: hidden revision 'a' is pruned! (use --hidden to access hidden revisions) or abort: hidden revision 'a' is obsolete with successor: eb5a0daa2192 (use --hidden to access hidden revisions) What do you think?

tests/test-log.t
1830	It's an interesting proposition, I don't have a strong opinion. The current behavior is the same as Evolve so it may be better to keep the same, but again no strong opinion.

mercurial/context.py
457	nit: I think in such cases we pass repo as first argument. Also, I don't think this is a good place for this function, maybe move this to `obsutil.py` too.
mercurial/obsutil.py
757	s/his/it's
761	s/in the following list/ from the following values
tests/test-obshistory.t
288	We should follow the graph description here too i.e. saying `split as x,y,z`.

tests/test-obshistory.t
191	This one looks odd. Please make this one similar to other split message.

tests/test-obshistory.t
191	Fixed, thank you for the catch!

mercurial/obsutil.py
780	These should be 'superseded' and 'superseded_split' (in the docstring above as well as here)

mercurial/obsutil.py
780	Thank you, it's fixed now.

mercurial/context.py
446	Not translatable. Needs a table of {'pruned': _("hidden revision '%s' is pruned"), ..., } Can you send a followup?

mercurial/obsutil.py
871	Maybe it's okay to pass a "filtered" repo to this function as `templatekw.showsuccessorssets()` does.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4116		Dec 5 2017, 9:10 AM	★	★
Diff 2	4156		Dec 6 2017, 12:48 PM	★	★
Diff 3	4250		Dec 8 2017, 5:13 AM	★	★
Diff 4	4527		Dec 18 2017, 7:18 AM	★	★
Diff 5	4679		Jan 2 2018, 5:17 AM	★	★
Diff 6	4703		Jan 5 2018, 3:42 AM	★	★
Diff 7	4746		Jan 10 2018, 2:32 AM	★	★
Diff 8	4764	rHG265cd9e19d26dd7f684f660b6c267b45427284e8	Jan 5 2018, 3:12 AM	★	★

Diff 4764

mercurial/context.py

	)			)
	from . import (			from . import (
	encoding,			encoding,
	error,			error,
	fileset,			fileset,
	match as matchmod,			match as matchmod,
	mdiff,			mdiff,
	obsolete as obsmod,			obsolete as obsmod,
				obsutil,
	patch,			patch,
	pathutil,			pathutil,
	phases,			phases,
	pycompat,			pycompat,
	repoview,			repoview,
	revlog,			revlog,
	scmutil,			scmutil,
	sparse,			sparse,
	return r			return r

	def _filterederror(repo, changeid):			def _filterederror(repo, changeid):
	"""build an exception to be raised about a filtered changeid			"""build an exception to be raised about a filtered changeid

	This is extracted in a function to help extensions (eg: evolve) to			This is extracted in a function to help extensions (eg: evolve) to
	experiment with various message variants."""			experiment with various message variants."""
	if repo.filtername.startswith('visible'):			if repo.filtername.startswith('visible'):

				# Check if the changeset is obsolete
				unfilteredrepo = repo.unfiltered()
				ctx = unfilteredrepo[changeid]

				# If the changeset is obsolete, enrich the hint with the reason that
				# made this changeset not visible
				if ctx.obsolete():
				reason = obsutil._getfilteredreason(unfilteredrepo, ctx)
				msg = _("hidden revision '%s' %s") % (changeid, reason)
				yujaUnsubmitted Not Done Not translatable. Needs a table of {'pruned': _("hidden revision '%s' is pruned"), ..., } Can you send a followup? yuja: Not translatable. Needs a table of ``` {'pruned': _("hidden revision '%s' is pruned"), ...
				else:
	msg = _("hidden revision '%s'") % changeid			msg = _("hidden revision '%s'") % changeid

	hint = _('use --hidden to access hidden revisions')			hint = _('use --hidden to access hidden revisions')

	return error.FilteredRepoLookupError(msg, hint=hint)			return error.FilteredRepoLookupError(msg, hint=hint)
	msg = _("filtered revision '%s' (not in '%s' subset)")			msg = _("filtered revision '%s' (not in '%s' subset)")
	msg %= (changeid, repo.filtername)			msg %= (changeid, repo.filtername)
	return error.FilteredRepoLookupError(msg)			return error.FilteredRepoLookupError(msg)

	class changectx(basectx):			class changectx(basectx):
				pulkitUnsubmitted Not Done nit: I think in such cases we pass repo as first argument. Also, I don't think this is a good place for this function, maybe move this to `obsutil.py` too. pulkit: nit: I think in such cases we pass repo as first argument. Also, I don't think this is a good…
	"""A changecontext object makes access to data related to a particular			"""A changecontext object makes access to data related to a particular
	changeset convenient. It represents a read-only context already present in			changeset convenient. It represents a read-only context already present in
	the repo."""			the repo."""
	def __init__(self, repo, changeid=''):			def __init__(self, repo, changeid=''):
	"""changeid is a revision number, node, or tag"""			"""changeid is a revision number, node, or tag"""

	# since basectx.__new__ already took care of copying the object, we			# since basectx.__new__ already took care of copying the object, we
	# don't need to do anything in __init__, so we just exit here			# don't need to do anything in __init__, so we just exit here

mercurial/obsutil.py

	# obsutil.py - utility functions for obsolescence			# obsutil.py - utility functions for obsolescence
	#			#
	# Copyright 2017 Boris Feld <boris.feld@octobus.net>			# Copyright 2017 Boris Feld <boris.feld@octobus.net>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	import re			import re

				from .i18n import _
	from . import (			from . import (
				node as nodemod,
	phases,			phases,
	util			util,
	)			)

	class marker(object):			class marker(object):
	"""Wrap obsolete marker raw data"""			"""Wrap obsolete marker raw data"""

	def __init__(self, repo, data):			def __init__(self, repo, data):
	# the repo argument will be used to create changectx in later version			# the repo argument will be used to create changectx in later version
	self._repo = repo			self._repo = repo
	fullsuccessorsets.append(_succs())			fullsuccessorsets.append(_succs())

	values = []			values = []
	for sset in fullsuccessorsets:			for sset in fullsuccessorsets:
	values.append({'successors': sset, 'markers': sset.markers})			values.append({'successors': sset, 'markers': sset.markers})

	return values			return values

				def _getobsfate(successorssets):
				""" Compute a changeset obsolescence fate based on its successorssets.
				pulkitUnsubmitted Not Done s/his/it's pulkit: s/his/it's
				Successors can be the tipmost ones or the immediate ones. This function
				return values are not meant to be shown directly to users, it is meant to
				be used by internal functions only.
				Returns one fate from the following values:
				pulkitUnsubmitted Not Done s/in the following list/ from the following values pulkit: s/in the following list/ from the following values
				- pruned
				- diverged
				- superseded
				- superseded_split
				"""

				if len(successorssets) == 0:
				# The commit has been pruned
				return 'pruned'
				elif len(successorssets) > 1:
				return 'diverged'
				else:
				# No divergence, only one set of successors
				successors = successorssets[0]

				if len(successors) == 1:
				return 'superseded'
				else:
				return 'superseded_split'
				krbullockUnsubmitted Done These should be 'superseded' and 'superseded_split' (in the docstring above as well as here) krbullock: These should be 'superseded' and 'superseded_split' (in the docstring above as well as here)
				lothiraldanAuthorUnsubmitted Not Done Thank you, it's fixed now. lothiraldan: Thank you, it's fixed now.

	def obsfateverb(successorset, markers):			def obsfateverb(successorset, markers):
	""" Return the verb summarizing the successorset and potentially using			""" Return the verb summarizing the successorset and potentially using
	information from the markers			information from the markers
	"""			"""
	if not successorset:			if not successorset:
	verb = 'pruned'			verb = 'pruned'
	elif len(successorset) == 1:			elif len(successorset) == 1:
	verb = 'rewritten'			verb = 'rewritten'
	fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2')			fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2')
	line.append(" (at %s)" % fmtmin_date)			line.append(" (at %s)" % fmtmin_date)
	else:			else:
	fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2')			fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2')
	fmtmax_date = util.datestr(max_date, '%Y-%m-%d %H:%M %1%2')			fmtmax_date = util.datestr(max_date, '%Y-%m-%d %H:%M %1%2')
	line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date))			line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date))

	return "".join(line)			return "".join(line)

				def _getfilteredreason(unfilteredrepo, ctx):
				"""return a human-friendly string on why a obsolete changeset is hidden
				"""
				successors = successorssets(unfilteredrepo, ctx.node())
				yujaUnsubmitted Not Done Maybe it's okay to pass a "filtered" repo to this function as `templatekw.showsuccessorssets()` does. yuja: Maybe it's okay to pass a "filtered" repo to this function as `templatekw.showsuccessorssets()`…
				fate = _getobsfate(successors)

				# Be more precise in case the revision is superseded
				if fate == 'pruned':
				reason = _('is pruned')
				elif fate == 'diverged':
				reason = _('has diverged')
				elif fate == 'superseded':
				reason = _("was rewritten as: %s") % nodemod.short(successors[0][0])
				elif fate == 'superseded_split':

				succs = []
				for node_id in successors[0]:
				succs.append(nodemod.short(node_id))

				if len(succs) <= 2:
				reason = _("was split as: %s") % ", ".join(succs)
				else:
				firstsuccessors = ", ".join(succs[:2])
				remainingnumber = len(succs) - 2

				args = (firstsuccessors, remainingnumber)
				successorsmsg = _("%s and %d more") % args
				reason = _("was split as: %s") % successorsmsg

				return reason

tests/test-directaccess.t

	\|			\|
	o 0:18d04c59bb5d2d4090ad9a5b59bd6274adb63add Added a			o 0:18d04c59bb5d2d4090ad9a5b59bd6274adb63add Added a

	Testing read only commands on the hidden revision			Testing read only commands on the hidden revision

	Testing with rev number			Testing with rev number

	$ hg exp 2 --config experimental.directaccess.revnums=False			$ hg exp 2 --config experimental.directaccess.revnums=False
	abort: hidden revision '2'!			abort: hidden revision '2' was rewritten as: 2443a0e66469!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	$ hg exp 2			$ hg exp 2
	# HG changeset patch			# HG changeset patch
	# User test			# User test
	# Date 0 0			# Date 0 0
	# Thu Jan 01 00:00:00 1970 +0000			# Thu Jan 01 00:00:00 1970 +0000

	$ hg identify -r 2			$ hg identify -r 2
	28ad74487de9			28ad74487de9

	$ hg status --change 2			$ hg status --change 2
	A c			A c

	$ hg status --change 2 --config experimental.directaccess.revnums=False			$ hg status --change 2 --config experimental.directaccess.revnums=False
	abort: hidden revision '2'!			abort: hidden revision '2' was rewritten as: 2443a0e66469!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	$ hg diff -c 2			$ hg diff -c 2
	diff -r 29becc82797a -r 28ad74487de9 c			diff -r 29becc82797a -r 28ad74487de9 c
	--- /dev/null Thu Jan 01 00:00:00 1970 +0000			--- /dev/null Thu Jan 01 00:00:00 1970 +0000
	+++ b/c Thu Jan 01 00:00:00 1970 +0000			+++ b/c Thu Jan 01 00:00:00 1970 +0000
	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+++ b/c Thu Jan 01 00:00:00 1970 +0000			+++ b/c Thu Jan 01 00:00:00 1970 +0000
	@@ -1,2 +1,1 @@			@@ -1,2 +1,1 @@
	foo			foo
	-bar			-bar

	Commands with undefined cmdtype should not work right now			Commands with undefined cmdtype should not work right now

	$ hg phase -r 28ad74			$ hg phase -r 28ad74
	abort: hidden revision '28ad74'!			abort: hidden revision '28ad74' was rewritten as: 2443a0e66469!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	$ hg phase -r 2			$ hg phase -r 2
	abort: hidden revision '2'!			abort: hidden revision '2' was rewritten as: 2443a0e66469!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

tests/test-log.t

	obsoleted 1 changesets			obsoleted 1 changesets
	$ hg up null -q			$ hg up null -q
	$ hg log --template='{rev}:{node}\n'			$ hg log --template='{rev}:{node}\n'
	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05			0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
	$ hg log --template='{rev}:{node}\n' --hidden			$ hg log --template='{rev}:{node}\n' --hidden
	1:a765632148dc55d38c35c4f247c618701886cb2f			1:a765632148dc55d38c35c4f247c618701886cb2f
	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05			0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
	$ hg log -r a			$ hg log -r a
	abort: hidden revision 'a'!			abort: hidden revision 'a' is pruned!
				durin42Unsubmitted Not Done would it be better to put the verb in the abort top-line, isntead of the hint? that is: abort: hidden revision 'a' is pruned! (use --hidden to access hidden revisions) or abort: hidden revision 'a' is obsolete with successor: eb5a0daa2192 (use --hidden to access hidden revisions) What do you think? durin42: would it be better to put the verb in the abort top-line, isntead of the hint? that is: abort…
				lothiraldanAuthorUnsubmitted Not Done It's an interesting proposition, I don't have a strong opinion. The current behavior is the same as Evolve so it may be better to keep the same, but again no strong opinion. lothiraldan: It's an interesting proposition, I don't have a strong opinion. The current behavior is the…
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	test that parent prevent a changeset to be hidden			test that parent prevent a changeset to be hidden

	$ hg up 1 -q --hidden			$ hg up 1 -q --hidden
	updating to a hidden changeset a765632148dc			updating to a hidden changeset a765632148dc
	$ hg log --template='{rev}:{node}\n'			$ hg log --template='{rev}:{node}\n'

	$ hg log -T'{rev}:{node}\n' -r:			$ hg log -T'{rev}:{node}\n' -r:
	2:94375ec45bddd2a824535fc04855bd058c926ec0			2:94375ec45bddd2a824535fc04855bd058c926ec0
	3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e			3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
	$ hg log -T'{rev}:{node}\n' -r:tip			$ hg log -T'{rev}:{node}\n' -r:tip
	2:94375ec45bddd2a824535fc04855bd058c926ec0			2:94375ec45bddd2a824535fc04855bd058c926ec0
	3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e			3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
	$ hg log -T'{rev}:{node}\n' -r:0			$ hg log -T'{rev}:{node}\n' -r:0
	abort: hidden revision '0'!			abort: hidden revision '0' is pruned!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]
	$ hg log -T'{rev}:{node}\n' -f			$ hg log -T'{rev}:{node}\n' -f
	3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e			3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
	2:94375ec45bddd2a824535fc04855bd058c926ec0			2:94375ec45bddd2a824535fc04855bd058c926ec0

	clear extensions configuration			clear extensions configuration
	$ echo '[extensions]' >> $HGRCPATH			$ echo '[extensions]' >> $HGRCPATH

tests/test-obshistory.t

This file was added.

				This test file test the various messages when accessing obsolete
				revisions.

				Global setup
				============

				$ . $TESTDIR/testlib/obsmarker-common.sh
				$ cat >> $HGRCPATH <<EOF
				> [ui]
				> interactive = true
				> [phases]
				> publish=False
				> [experimental]
				> evolution.createmarkers = yes
				> evolution.effect-flags = yes
				> EOF

				Test output on amended commit
				=============================

				Test setup
				----------

				$ hg init $TESTTMP/local-amend
				$ cd $TESTTMP/local-amend
				$ mkcommit ROOT
				$ mkcommit A0
				$ echo 42 >> A0
				$ hg commit --amend -m "A1
				>
				> Better commit message"
				$ hg log --hidden -G
				@ changeset: 2:4ae3a4151de9
				\| tag: tip
				\| parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A1
				\|
				\| x changeset: 1:471f378eab4c
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: rewritten using amend as 2:4ae3a4151de9
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				Actual test
				-----------
				$ hg update 471f378eab4c
				abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
				(use --hidden to access hidden revisions)
				[255]
				$ hg update --hidden "desc(A0)"
				updating to a hidden changeset 471f378eab4c
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test output with pruned commit
				==============================

				Test setup
				----------

				$ hg init $TESTTMP/local-prune
				$ cd $TESTTMP/local-prune
				$ mkcommit ROOT
				$ mkcommit A0 # 0
				$ mkcommit B0 # 1
				$ hg log --hidden -G
				@ changeset: 2:0dec01379d3b
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B0
				\|
				o changeset: 1:471f378eab4c
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				$ hg debugobsolete --record-parents `getid 'desc(B0)'`
				obsoleted 1 changesets

				$ hg log --hidden -G
				@ changeset: 2:0dec01379d3b
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: pruned
				\| summary: B0
				\|
				o changeset: 1:471f378eab4c
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT


				Actual test
				-----------
				$ hg up 1
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg up 0dec01379d3b
				abort: hidden revision '0dec01379d3b' is pruned!
				(use --hidden to access hidden revisions)
				[255]
				$ hg up --hidden -r 'desc(B0)'
				updating to a hidden changeset 0dec01379d3b
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test output with splitted commit
				================================

				Test setup
				----------

				$ hg init $TESTTMP/local-split
				$ cd $TESTTMP/local-split
				$ mkcommit ROOT
				$ echo 42 >> a
				$ echo 43 >> b
				$ hg commit -A -m "A0"
				adding a
				adding b
				$ hg log --hidden -G
				@ changeset: 1:471597cad322
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				# Simulate a split
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved

				$ echo 42 >> a
				$ hg commit -A -m "A0"
				adding a
				created new head

				$ echo 43 >> b
				$ hg commit -A -m "A0"
				adding b

				$ hg debugobsolete `getid '1'` `getid '2'` `getid '3'`
				obsoleted 1 changesets

				$ hg log --hidden -G
				@ changeset: 3:f257fde29c7a
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 2:337fec4d2edc
				\| parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				\| x changeset: 1:471597cad322
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				Actual test
				-----------
				$ hg update 471597cad322
				pulkitUnsubmitted Not Done This one looks odd. Please make this one similar to other split message. pulkit: This one looks odd. Please make this one similar to other split message.
				lothiraldanAuthorUnsubmitted Not Done Fixed, thank you for the catch! lothiraldan: Fixed, thank you for the catch!
				abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
				(use --hidden to access hidden revisions)
				[255]
				$ hg update --hidden 'min(desc(A0))'
				updating to a hidden changeset 471597cad322
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test output with lots of splitted commit
				========================================

				Test setup
				----------

				$ hg init $TESTTMP/local-lots-split
				$ cd $TESTTMP/local-lots-split
				$ mkcommit ROOT
				$ echo 42 >> a
				$ echo 43 >> b
				$ echo 44 >> c
				$ echo 45 >> d
				$ hg commit -A -m "A0"
				adding a
				adding b
				adding c
				adding d
				$ hg log --hidden -G
				@ changeset: 1:de7290d8b885
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				# Simulate a split
				$ hg up 0
				0 files updated, 0 files merged, 4 files removed, 0 files unresolved

				$ echo 42 >> a
				$ hg commit -A -m "A0"
				adding a
				created new head

				$ echo 43 >> b
				$ hg commit -A -m "A0"
				adding b

				$ echo 44 >> c
				$ hg commit -A -m "A0"
				adding c

				$ echo 45 >> d
				$ hg commit -A -m "A0"
				adding d

				$ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` `getid '4'` `getid '5'`
				obsoleted 1 changesets

				$ hg log --hidden -G
				@ changeset: 5:c7f044602e9b
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 4:1ae8bc733a14
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 3:f257fde29c7a
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 2:337fec4d2edc
				\| parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				\| x changeset: 1:de7290d8b885
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				Actual test
				-----------
				pulkitUnsubmitted Not Done We should follow the graph description here too i.e. saying `split as x,y,z`. pulkit: We should follow the graph description here too i.e. saying `split as x,y,z`.
				$ hg update de7290d8b885
				abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
				(use --hidden to access hidden revisions)
				[255]
				$ hg update --hidden 'min(desc(A0))'
				updating to a hidden changeset de7290d8b885
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test output with folded commit
				==============================

				Test setup
				----------

				$ hg init $TESTTMP/local-fold
				$ cd $TESTTMP/local-fold
				$ mkcommit ROOT
				$ mkcommit A0
				$ mkcommit B0
				$ hg log --hidden -G
				@ changeset: 2:0dec01379d3b
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B0
				\|
				o changeset: 1:471f378eab4c
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				# Simulate a fold
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ echo "A0" > A0
				$ echo "B0" > B0
				$ hg add A0 B0
				$ hg commit -m "C0"
				created new head

				$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
				obsoleted 1 changesets
				$ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'`
				obsoleted 1 changesets

				$ hg log --hidden -G
				@ changeset: 3:eb5a0daa2192
				\| tag: tip
				\| parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: C0
				\|
				\| x changeset: 2:0dec01379d3b
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| obsolete: rewritten as 3:eb5a0daa2192
				\| \| summary: B0
				\| \|
				\| x changeset: 1:471f378eab4c
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: rewritten as 3:eb5a0daa2192
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				Actual test
				-----------
				$ hg update 471f378eab4c
				abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
				(use --hidden to access hidden revisions)
				[255]
				$ hg update --hidden 'desc(A0)'
				updating to a hidden changeset 471f378eab4c
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg update 0dec01379d3b
				abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
				(use --hidden to access hidden revisions)
				[255]
				$ hg update --hidden 'desc(B0)'
				updating to a hidden changeset 0dec01379d3b
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test output with divergence
				===========================

				Test setup
				----------

				$ hg init $TESTTMP/local-divergence
				$ cd $TESTTMP/local-divergence
				$ mkcommit ROOT
				$ mkcommit A0
				$ hg commit --amend -m "A1"
				$ hg log --hidden -G
				@ changeset: 2:fdf9bde5129a
				\| tag: tip
				\| parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A1
				\|
				\| x changeset: 1:471f378eab4c
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: rewritten using amend as 2:fdf9bde5129a
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				$ hg update --hidden 'desc(A0)'
				updating to a hidden changeset 471f378eab4c
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg commit --amend -m "A2"
				$ hg log --hidden -G
				@ changeset: 3:65b757b745b9
				\| tag: tip
				\| parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| instability: content-divergent
				\| summary: A2
				\|
				\| * changeset: 2:fdf9bde5129a
				\|/ parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| instability: content-divergent
				\| summary: A1
				\|
				\| x changeset: 1:471f378eab4c
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: rewritten using amend as 2:fdf9bde5129a
				\| obsolete: rewritten using amend as 3:65b757b745b9
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				Actual test
				-----------
				$ hg update 471f378eab4c
				abort: hidden revision '471f378eab4c' has diverged!
				(use --hidden to access hidden revisions)
				[255]
				$ hg update --hidden 'desc(A0)'
				updating to a hidden changeset 471f378eab4c
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test output with amended + folded commit
				========================================

				Test setup
				----------

				$ hg init $TESTTMP/local-amend-fold
				$ cd $TESTTMP/local-amend-fold
				$ mkcommit ROOT
				$ mkcommit A0
				$ mkcommit B0
				$ hg commit --amend -m "B1"
				$ hg log --hidden -G
				@ changeset: 3:b7ea6d14e664
				\| tag: tip
				\| parent: 1:471f378eab4c
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B1
				\|
				\| x changeset: 2:0dec01379d3b
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: rewritten using amend as 3:b7ea6d14e664
				\| summary: B0
				\|
				o changeset: 1:471f378eab4c
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT


				# Simulate a fold
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ echo "A0" > A0
				$ echo "B0" > B0
				$ hg add A0 B0
				$ hg commit -m "C0"
				created new head

				$ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
				obsoleted 1 changesets
				$ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'`
				obsoleted 1 changesets

				$ hg log --hidden -G
				@ changeset: 4:eb5a0daa2192
				\| tag: tip
				\| parent: 0:ea207398892e
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: C0
				\|
				\| x changeset: 3:b7ea6d14e664
				\| \| parent: 1:471f378eab4c
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| obsolete: rewritten as 4:eb5a0daa2192
				\| \| summary: B1
				\| \|
				\| \| x changeset: 2:0dec01379d3b
				\| \|/ user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| obsolete: rewritten using amend as 3:b7ea6d14e664
				\| \| summary: B0
				\| \|
				\| x changeset: 1:471f378eab4c
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| obsolete: rewritten as 4:eb5a0daa2192
				\| summary: A0
				\|
				o changeset: 0:ea207398892e
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ROOT

				Actual test
				-----------
				$ hg update 471f378eab4c
				abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
				(use --hidden to access hidden revisions)
				[255]
				$ hg update --hidden 'desc(A0)'
				updating to a hidden changeset 471f378eab4c
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg update --hidden 0dec01379d3b
				updating to a hidden changeset 0dec01379d3b
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg update 0dec01379d3b
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg update --hidden 'desc(B0)'
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-obsolete.t

	check that various commands work well with filtering			check that various commands work well with filtering

	$ hg tip			$ hg tip
	5:5601fb93a350 (draft) [tip ] add new_3_c			5:5601fb93a350 (draft) [tip ] add new_3_c
	$ hg log -r 6			$ hg log -r 6
	abort: unknown revision '6'!			abort: unknown revision '6'!
	[255]			[255]
	$ hg log -r 4			$ hg log -r 4
	abort: hidden revision '4'!			abort: hidden revision '4' was rewritten as: 5601fb93a350!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]
	$ hg debugrevspec 'rev(6)'			$ hg debugrevspec 'rev(6)'
	$ hg debugrevspec 'rev(4)'			$ hg debugrevspec 'rev(4)'
	$ hg debugrevspec 'null'			$ hg debugrevspec 'null'
	-1			-1

	Check that public changeset are not accounted as obsolete:			Check that public changeset are not accounted as obsolete:
	13bedc178fce tip			13bedc178fce tip
	$ echo "hello" > b			$ echo "hello" > b
	$ hg commit --amend -m "message"			$ hg commit --amend -m "message"
	$ hg book bookb -r 13bedc178fce --hidden			$ hg book bookb -r 13bedc178fce --hidden
	$ hg log -r 13bedc178fce			$ hg log -r 13bedc178fce
	4:13bedc178fce (draft obsolete) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]			4:13bedc178fce (draft obsolete) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
	$ hg book -d bookb			$ hg book -d bookb
	$ hg log -r 13bedc178fce			$ hg log -r 13bedc178fce
	abort: hidden revision '13bedc178fce'!			abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	Empty out the test extension, as it isn't compatible with later parts			Empty out the test extension, as it isn't compatible with later parts
	of the test.			of the test.
	$ echo > $TESTTMP/test_extension.py			$ echo > $TESTTMP/test_extension.py

	Test ability to pull changeset with locally applying obsolescence markers			Test ability to pull changeset with locally applying obsolescence markers

		Path
M		mercurial/context.py (16 lines)
M		mercurial/obsutil.py (61 lines)
M		tests/test-directaccess.t (8 lines)
M		tests/test-log.t (4 lines)
A	M	tests/test-obshistory.t (551 lines)
M		tests/test-obsolete.t (4 lines)

This is an archive of the discontinued Mercurial Phabricator instance.

visibility: improve the message when accessing filtered obsolete rev
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 4764

mercurial/context.py

mercurial/obsutil.py

tests/test-directaccess.t

tests/test-log.t

tests/test-obshistory.t

tests/test-obsolete.t

This is an archive of the discontinued Mercurial Phabricator instance.

visibility: improve the message when accessing filtered obsolete revClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4764

mercurial/context.py

mercurial/obsutil.py

tests/test-directaccess.t

tests/test-log.t

tests/test-obshistory.t

tests/test-obsolete.t

visibility: improve the message when accessing filtered obsolete rev
ClosedPublic

Revision Contents
Changeset List