hgext3rd/undo.py
209–212	BTW, why do you need a `tr`? It's not used
901	Technically it's `_undoredopreview(...)` :). So maybe just rename to `_preview(...)`?
908–915	I'm confused. What part of code will read this fake index, why do we need to overwrite it?
917	Does it make sense to put in in try: ... finally: _logundoredoindex(repo, repo.currenttransaction(), savedindex) ?

hgext3rd/undo.py
209–212	Good catch. This used to be necessary but isn't anymore.
908–915	The template code that shows commits and bookmarks that will disappear as red doesn't really know where we are undoing to. Its much easier to simply change the undoredo index than to pass the index we are undoing to through the template logic.
917	Yes, that would be better

hgext3rd/undo.py
377	Not related to this diff, but `olddraft` doesn't read `undolog/redonode`, and so `hg undo && hg log -r 'draft()'` is different from `hg log -r 'olddraft(1)`. Am I right? If yes, then can you please make it clear in the comment?
920–926	This logic about rewriting indices definitely requires a good comment explaining what is going on. I'd prefer to add a new field to the repo object if there are no other way of passing parameter to the template
929–933	Why are you catching IndexError?
936	No need for return

hgext3rd/undo.py
377	You are correct. `hg undo --absolute && hg log -r 'draft()'` would be the same. Generally `draft()` and `olddraft()` have also an important nuanced difference in terms of hidden commits. `olddraft(0) --hidden` is no different from `olddraft(0)` which isn't the same for draft(). I'll improve the documentation.
929–933	An out of bounds state being blank in preview makes sense. We could also print something out. If we ask preview, "what would happen if I undo here?" the response shouldn't be "index out of bounds for preview", it should be: "index will be out of bounds for undo." A blank repo state represents that clearly enough to the user without making them have to think about what indexes are. "Its a blank state, I don't want to go there" is in my opinion good from a UX side.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	490		Aug 1 2017, 8:04 PM	★	★
Diff 2	511		Aug 2 2017, 4:38 PM	★	★
Diff 3	610		Aug 7 2017, 3:32 PM	★	★
Diff 4	721		Aug 9 2017, 7:52 PM	★	★
Diff 5	739		Aug 10 2017, 1:55 PM	★	★
Diff 6	882	rFBHGXfc0806ff0c3df1118b82eab7e90559b9de7f22a3	Aug 11 2017, 9:05 PM	★	★

	Status	Author	Revision
	Closed	felixmerk	D263 undo: preview interactive ui
	Closed	felixmerk	D207 undo: add --index and redo support to preview

Diff 882

hgext3rd/undo.py

	error,			error,
	extensions,			extensions,
	hg,			hg,
	localrepo,			localrepo,
	lock as lockmod,			lock as lockmod,
	obsolete,			obsolete,
	obsutil,			obsutil,
	phases,			phases,
	pycompat,
	registrar,			registrar,
	revlog,			revlog,
	revset,			revset,
	revsetlang,			revsetlang,
	smartset,			smartset,
	templatekw,			templatekw,
				templater,
	transaction,			transaction,
	util,			util,
	)			)

	from mercurial.node import (			from mercurial.node import (
	bin,			bin,
	hex,			hex,
	nullid,			nullid,
	def _logworkingparent(repo, tr):			def _logworkingparent(repo, tr):
	revstring = repo['.'].hex()			revstring = repo['.'].hex()
	return writelog(repo, tr, "workingparent.i", revstring)			return writelog(repo, tr, "workingparent.i", revstring)

	def _logindex(repo, tr, nodes):			def _logindex(repo, tr, nodes):
	revstring = "\n".join(sorted('%s %s' % (k, v) for k, v in nodes.items()))			revstring = "\n".join(sorted('%s %s' % (k, v) for k, v in nodes.items()))
	return writelog(repo, tr, "index.i", revstring)			return writelog(repo, tr, "index.i", revstring)

	def _logundoredoindex(repo, tr, reverseindex, branch=""):			def _logundoredoindex(repo, reverseindex, branch=""):
	rlog = _getrevlog(repo, 'index.i')			rlog = _getrevlog(repo, 'index.i')
	hexnode = hex(rlog.node(_invertindex(rlog, reverseindex)))			hexnode = hex(rlog.node(_invertindex(rlog, reverseindex)))
	return repo.vfs.write("undolog/redonode", str(hexnode) + "\0" + branch)			return repo.vfs.write("undolog/redonode", str(hexnode) + "\0" + branch)
				stashUnsubmitted Not Done BTW, why do you need a `tr`? It's not used stash: BTW, why do you need a `tr`? It's not used
				felixmerkAuthorUnsubmitted Not Done Good catch. This used to be necessary but isn't anymore. felixmerk: Good catch. This used to be necessary but isn't anymore.

	def _delundoredo(repo):			def _delundoredo(repo):
	path = 'undolog' + '/' + 'redonode'			path = 'undolog' + '/' + 'redonode'
	repo.vfs.tryunlink(path)			repo.vfs.tryunlink(path)

	def _recordnewgap(repo, absoluteindex=None):			def _recordnewgap(repo, absoluteindex=None):
	path = 'undolog' + '/' + 'gap'			path = 'undolog' + '/' + 'gap'
	if absoluteindex is None:			if absoluteindex is None:

	revsetpredicate = registrar.revsetpredicate()			revsetpredicate = registrar.revsetpredicate()

	@revsetpredicate('olddraft')			@revsetpredicate('olddraft')
	def _olddraft(repo, subset, x):			def _olddraft(repo, subset, x):
	"""``olddraft([index])``			"""``olddraft([index])``
	previous draft commits			previous draft commits

	'index' is how many undoable commands you want to look back			'index' is how many undoable commands you want to look back
				stashUnsubmitted Not Done Not related to this diff, but `olddraft` doesn't read `undolog/redonode`, and so `hg undo && hg log -r 'draft()'` is different from `hg log -r 'olddraft(1)`. Am I right? If yes, then can you please make it clear in the comment? stash: Not related to this diff, but `olddraft` doesn't read `undolog/redonode`, and so `hg undo && hg…
				felixmerkAuthorUnsubmitted Not Done You are correct. `hg undo --absolute && hg log -r 'draft()'` would be the same. Generally `draft()` and `olddraft()` have also an important nuanced difference in terms of hidden commits. `olddraft(0) --hidden` is no different from `olddraft(0)` which isn't the same for draft(). I'll improve the documentation. felixmerk: You are correct. `hg undo --absolute && hg log -r 'draft()'` would be the same. Generally…
	an undoable command is one that changed draft heads, bookmarks			an undoable command is one that changed draft heads, bookmarks
	and or working copy parent			and or working copy parent. Note that olddraft uses an absolute index and
				so olddraft(1) represents the state after an hg undo -a and not an hg undo.
	Note: this revset may include hidden commits			Note: this revset may include hidden commits
	"""			"""
	args = revset.getargsdict(x, 'olddraftrevset', 'reverseindex')			args = revset.getargsdict(x, 'olddraftrevset', 'reverseindex')
	reverseindex = revsetlang.getinteger(args.get('reverseindex'),			reverseindex = revsetlang.getinteger(args.get('reverseindex'),
	_('index must be a positive integer'), 1)			_('index must be a positive integer'), 1)
	revs = _getolddrafts(repo, reverseindex)			revs = _getolddrafts(repo, reverseindex)
	return subset & smartset.baseset(revs)			return subset & smartset.baseset(revs)

	if repo[revs.first()].phase() == phases.public:			if repo[revs.first()].phase() == phases.public:
	querystring = revsetlang.formatspec('(children(%d) & draft())::',			querystring = revsetlang.formatspec('(children(%d) & draft())::',
	revs.first())			revs.first())
	else:			else:
	querystring = revsetlang.formatspec('((::%ld) & draft())::', revs)			querystring = revsetlang.formatspec('((::%ld) & draft())::', revs)
	return subset & smartset.baseset(repo.revs(querystring))			return subset & smartset.baseset(repo.revs(querystring))

	# Templates			# Templates
	keywords = {}			templatefunc = registrar.templatefunc()

	templatekeyword = registrar.templatekeyword(keywords)			def _undonehexnodes(repo, reverseindex):

	def _undonehexnodes(repo):
	repo = repo.unfiltered()			repo = repo.unfiltered()
	reverseindex = _computerelative(repo, 1)
	revstring = revsetlang.formatspec('draft() - olddraft(%d)', reverseindex)			revstring = revsetlang.formatspec('draft() - olddraft(%d)', reverseindex)
	revs = repo.revs(revstring)			revs = repo.revs(revstring)
	tonode = repo.changelog.node			tonode = repo.changelog.node
	hexnodes = [repo[tonode(x)] for x in revs]			hexnodes = [repo[tonode(x)] for x in revs]
	return hexnodes			return hexnodes

	@templatekeyword("undonecommits")			@templatefunc('undonecommits(reverseindex)')
	def showundonecommits(repo, ctx, **args):			def showundonecommits(context, mapping, args):
	"""String. Changectxs added by last command."""			"""String. Changectxs added since reverseindex command."""
	hexnodes = _undonehexnodes(repo)			reverseindex = templater.evalinteger(context, mapping, args[0],
				_('undonecommits needs an integer argument'))
				repo = mapping['ctx']._repo
				ctx = mapping['ctx']
				hexnodes = _undonehexnodes(repo, reverseindex)
	if ctx in hexnodes:			if ctx in hexnodes:
	result = ctx.hex()			result = ctx.hex()
	else:			else:
	result = None			result = None
	return result			return result

	def _donehexnodes(repo):			def _donehexnodes(repo, reverseindex):
	repo = repo.unfiltered()			repo = repo.unfiltered()
	reverseindex = _computerelative(repo, 1)
	revstring = revsetlang.formatspec('olddraft(%d)', reverseindex)			revstring = revsetlang.formatspec('olddraft(%d)', reverseindex)
	revs = repo.revs(revstring)			revs = repo.revs(revstring)
	tonode = repo.changelog.node			tonode = repo.changelog.node
	hexnodes = [repo[tonode(x)] for x in revs]			hexnodes = [repo[tonode(x)] for x in revs]
	return hexnodes			return hexnodes

	@templatekeyword("donecommits")			@templatefunc('donecommits(reverseindex)')
	def showdonecommits(repo, ctx, **args):			def showdonecommits(context, mapping, args):
	"""String. Changectxs one repo state ago."""			"""String. Changectxs reverseindex repo states ago."""
	hexnodes = _donehexnodes(repo)			reverseindex = templater.evalinteger(context, mapping, args[0],
				_('donecommits needs an integer argument'))
				repo = mapping['ctx']._repo
				ctx = mapping['ctx']
				hexnodes = _donehexnodes(repo, reverseindex)
	if ctx in hexnodes:			if ctx in hexnodes:
	result = ctx.hex()			result = ctx.hex()
	else:			else:
	result = None			result = None
	return result			return result

	def _oldmarks(repo):			def _oldmarks(repo, reverseindex):
	reverseindex = _computerelative(repo, 1)
	nodedict = _readindex(repo, reverseindex)			nodedict = _readindex(repo, reverseindex)
	bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"])			bookstring = _readnode(repo, "bookmarks.i", nodedict["bookmarks"])
	oldmarks = bookstring.split("\n")			oldmarks = bookstring.split("\n")
	result = []			result = []
	for mark in oldmarks:			for mark in oldmarks:
	kv = mark.rsplit(" ", 1)			kv = mark.rsplit(" ", 1)
	if len(kv) == 2:			if len(kv) == 2:
	result.append(kv)			result.append(kv)
	return result			return result

	@templatekeyword("oldbookmarks")			@templatefunc('oldbookmarks(reverseindex)')
	def showoldbookmarks(**args):			def showoldbookmarks(context, mapping, args):
	"""List of strings. Bookmarks one repo state ago."""			"""List of Strings. Bookmarks that used to be at the changectx reverseindex
	args = pycompat.byteskwargs(args)			repo states ago."""
	repo = args['ctx']._repo			reverseindex = templater.evalinteger(context, mapping, args[0],
	oldmarks = _oldmarks(repo)			_('oldbookmarks needs an integer argument'))
				repo = mapping['ctx']._repo
				ctx = mapping['ctx']
				oldmarks = _oldmarks(repo, reverseindex)
	bookmarks = []			bookmarks = []
	for kv in oldmarks:			for kv in oldmarks:
	if repo[kv[1]] == repo[args['ctx']]:			if repo[kv[1]] == repo[ctx]:
	bookmarks.append(kv[0])			bookmarks.append(kv[0])
	active = repo._activebookmark			active = repo._activebookmark
	makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}			makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}
	f = templatekw._showlist('bookmark', bookmarks, args)			f = templatekw._showlist('bookmark', bookmarks, mapping)
	return templatekw._hybrid(f, bookmarks, makemap, lambda x: x['bookmark'])			return templatekw._hybrid(f, bookmarks, makemap, lambda x: x['bookmark'])

	@templatekeyword("removedbookmarks")			@templatefunc('removedbookmarks(reverseindex)')
	def showremovedbookmarks(**args):			def removedbookmarks(context, mapping, args):
	"""List of strings. Bookmarks added/moved by last command."""			"""List of Strings. Bookmarks that have been moved or removed from a given
	args = pycompat.byteskwargs(args)			changectx by reverseindex repo state."""
	repo = args['ctx']._repo			reverseindex = templater.evalinteger(context, mapping, args[0],
	currentbookmarks = args['ctx'].bookmarks()			_('removedbookmarks needs an integer argument'))
	oldmarks = _oldmarks(repo)			repo = mapping['ctx']._repo
				ctx = mapping['ctx']
				currentbookmarks = mapping['ctx'].bookmarks()
				oldmarks = _oldmarks(repo, reverseindex)
	oldbookmarks = []			oldbookmarks = []
	for kv in oldmarks:			for kv in oldmarks:
	if repo[kv[1]] == repo[args['ctx']]:			if repo[kv[1]] == repo[ctx]:
	oldbookmarks.append(kv[0])			oldbookmarks.append(kv[0])
	bookmarks = list(set(currentbookmarks) - set(oldbookmarks))			bookmarks = list(set(currentbookmarks) - set(oldbookmarks))
	active = repo._activebookmark			active = repo._activebookmark
	makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}			makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}
	f = templatekw._showlist('bookmark', bookmarks, args)			f = templatekw._showlist('bookmark', bookmarks, mapping)
	return templatekw._hybrid(f, bookmarks, makemap, lambda x: x['bookmark'])			return templatekw._hybrid(f, bookmarks, makemap, lambda x: x['bookmark'])

	# Undo:			# Undo:

	@command('undo', [			@command('undo', [
	('a', 'absolute', False, _("absolute based on command index instead of "			('a', 'absolute', False, _("absolute based on command index instead of "
	"relative undo")),			"relative undo")),
	('b', 'branch', "", _("local branch undo, accepts commit hash "			('b', 'branch', "", _("local branch undo, accepts commit hash "
	reverseindex = opts.get("index")			reverseindex = opts.get("index")
	relativeundo = not opts.get("absolute")			relativeundo = not opts.get("absolute")
	keep = opts.get("keep")			keep = opts.get("keep")
	branch = opts.get("branch")			branch = opts.get("branch")
	preview = opts.get("preview")			preview = opts.get("preview")

	if branch and reverseindex != 1:			if branch and reverseindex != 1:
	raise error.Abort(_("--branch with --index not supported"))			raise error.Abort(_("--branch with --index not supported"))
				if relativeundo:
				reverseindex = _computerelative(repo, reverseindex,
				absolute = not relativeundo,
				branch = branch)

	if preview:			if preview:
	_preview(ui, repo)			_preview(ui, repo, reverseindex)
	return			return

	with repo.wlock(), repo.lock(), repo.transaction("undo"):			with repo.wlock(), repo.lock(), repo.transaction("undo"):
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	cmdutil.bailifchanged(repo)			cmdutil.bailifchanged(repo)
	repo = repo.unfiltered()			repo = repo.unfiltered()
	reverseindex = _computerelative(repo, reverseindex,
	absolute=not relativeundo,
	branch=branch)
	if not (opts.get("force") or _gapcheck(repo, reverseindex)):			if not (opts.get("force") or _gapcheck(repo, reverseindex)):
	raise error.Abort(_("attempted risky undo across"			raise error.Abort(_("attempted risky undo across"
	" missing history"))			" missing history"))
	_undoto(ui, repo, reverseindex, keep=keep, branch=branch)			_undoto(ui, repo, reverseindex, keep=keep, branch=branch)

	# store undo data			# store undo data
	# for absolute undos, think of this as a reset			# for absolute undos, think of this as a reset
	# for relative undos, think of this as an update			# for relative undos, think of this as an update
	_logundoredoindex(repo, repo.currenttransaction(), reverseindex, branch)			_logundoredoindex(repo, reverseindex, branch)

	@command('redo', [			@command('redo', [
	('b', 'branch', "", _("single branch undo, accepts commit hash "			('b', 'branch', "", _("single branch undo, accepts commit hash "
	"(ADVANCED)")),			"(ADVANCED)")),
	('n', 'index', 1, _("how many commands to redo")),			('n', 'index', 1, _("how many commands to redo")),
				('p', 'preview', False, _("see smartlog like preview of future redo "
				"state")),
	])			])
	def redo(ui, repo, args, *opts):			def redo(ui, repo, args, *opts):
	""" perform a redo			""" perform a redo

	Performs a redo. Specifically, redo moves forward a repo state relative to			Performs a redo. Specifically, redo moves forward a repo state relative to
	the previous undo or redo command. If you run hg undo -n 10, you can redo			the previous undo or redo command. If you run hg undo -n 10, you can redo
	each of the 10 repo states one by one all the way back to the state from			each of the 10 repo states one by one all the way back to the state from
	which you ran undo. You can use --index to redo across more states at once,			which you ran undo. You can use --index to redo across more states at once,
	and you can use any number of undos/redos up to the current state or back to			and you can use any number of undos/redos up to the current state or back to
	when the undo extension was first active.			when the undo extension was first active.
	"""			"""
	branch = opts.get("branch")			branch = opts.get("branch")
	reverseindex = -1 * abs(opts.get("index"))			reverseindex = -1 * abs(opts.get("index"))
				preview = opts.get("preview")

	if branch and reverseindex != -1:			if branch and reverseindex != -1:
	raise error.Abort(_("--branch with --index not supported"))			raise error.Abort(_("--branch with --index not supported"))

				reverseindex = _computerelative(repo, reverseindex)

				if preview:
				_preview(ui, repo, reverseindex)
				return

	with repo.wlock(), repo.lock(), repo.transaction("redo"):			with repo.wlock(), repo.lock(), repo.transaction("redo"):
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	cmdutil.bailifchanged(repo)			cmdutil.bailifchanged(repo)
	repo = repo.unfiltered()			repo = repo.unfiltered()
	reverseindex = _computerelative(repo, reverseindex, branch=branch)
	_undoto(ui, repo, reverseindex, branch=branch)			_undoto(ui, repo, reverseindex, branch=branch)
	_logundoredoindex(repo, repo.currenttransaction(), reverseindex, branch)			_logundoredoindex(repo, reverseindex, branch=branch)

	def _undoto(ui, repo, reverseindex, keep=False, branch=None):			def _undoto(ui, repo, reverseindex, keep=False, branch=None):
	# undo to specific reverseindex			# undo to specific reverseindex
	# requires inhibit extension			# requires inhibit extension
	# branch is a changectx hash (potentially short form)			# branch is a changectx hash (potentially short form)
	# which identifies its branch via localbranch revset			# which identifies its branch via localbranch revset
	if repo != repo.unfiltered():			if repo != repo.unfiltered():
	raise error.ProgrammingError(_("_undoto expects unfilterd repo"))			raise error.ProgrammingError(_("_undoto expects unfilterd repo"))
	try:			try:
	inhibit = extensions.find('inhibit')			inhibit = extensions.find('inhibit')
	except KeyError:			except KeyError:
	raise error.Abort(_('undo requires inhibit to work properly'))			raise error.Abort(_('undo requires inhibit to work properly'))
	else:			else:
	ctxts = repo.set(rev)			ctxts = repo.set(rev)
	inhibit.revive(ctxts)			inhibit.revive(ctxts)

	def _preview(ui, repo):			def _preview(ui, repo, reverseindex):
				stashUnsubmitted Not Done Technically it's `_undoredopreview(...)` :). So maybe just rename to `_preview(...)`? stash: Technically it's `_undoredopreview(...)` :). So maybe just rename to `_preview(...)`?
	# Print smartlog like preview of undo			# Print smartlog like preview of undo
	# Input:			# Input:
	# ui:			# ui:
	# repo: mercurial.localrepo			# repo: mercurial.localrepo
	# Output:			# Output:
	# None			# None

	reverseindex = 1			# override "UNDOINDEX" as a variable usable in template
				overrides = {
				('templates', 'UNDOINDEX'): str(reverseindex),
				}

	opts = {}			opts = {}
	opts["template"] = "{undopreview}"			opts["template"] = "{undopreview}"
				stashUnsubmitted Not Done I'm confused. What part of code will read this fake index, why do we need to overwrite it? stash: I'm confused. What part of code will read this fake index, why do we need to overwrite it?
				felixmerkAuthorUnsubmitted Not Done The template code that shows commits and bookmarks that will disappear as red doesn't really know where we are undoing to. Its much easier to simply change the undoredo index than to pass the index we are undoing to through the template logic. felixmerk: The template code that shows commits and bookmarks that will disappear as red doesn't really…
	reverseindex = _computerelative(repo, reverseindex)
	repo = repo.unfiltered()			repo = repo.unfiltered()
	revstring = revsetlang.formatspec("olddraft(%d) + olddraft(0)",			revstring = revsetlang.formatspec("olddraft(%d) + olddraft(0)",
				stashUnsubmitted Not Done Does it make sense to put in in try: ... finally: _logundoredoindex(repo, repo.currenttransaction(), savedindex) ? stash: Does it make sense to put in in ``` try: ... finally: _logundoredoindex(repo, repo.
				felixmerkAuthorUnsubmitted Not Done Yes, that would be better felixmerk: Yes, that would be better
	reverseindex)			reverseindex)
	opts['rev'] = [revstring]			opts['rev'] = [revstring]
				try:
				with ui.configoverride(overrides):
	cmdutil.graphlog(ui, repo, None, opts)			cmdutil.graphlog(ui, repo, None, opts)
				except IndexError:
				# don't print anything
				pass

				stashUnsubmitted Not Done This logic about rewriting indices definitely requires a good comment explaining what is going on. I'd prefer to add a new field to the repo object if there are no other way of passing parameter to the template stash: This logic about rewriting indices definitely requires a good comment explaining what is going…
	# Tools			# Tools

	def _invertindex(rlog, indexorreverseindex):			def _invertindex(rlog, indexorreverseindex):
	return len(rlog) - 1 - indexorreverseindex			return len(rlog) - 1 - indexorreverseindex

	def _getrevlog(repo, filename):			def _getrevlog(repo, filename):
	path = 'undolog/' + filename			path = 'undolog/' + filename
				stashUnsubmitted Not Done Why are you catching IndexError? stash: Why are you catching IndexError?
				felixmerkAuthorUnsubmitted Not Done An out of bounds state being blank in preview makes sense. We could also print something out. If we ask preview, "what would happen if I undo here?" the response shouldn't be "index out of bounds for preview", it should be: "index will be out of bounds for undo." A blank repo state represents that clearly enough to the user without making them have to think about what indexes are. "Its a blank state, I don't want to go there" is in my opinion good from a UX side. felixmerk: An out of bounds state being blank in preview makes sense. We could also print something out.
	try:			try:
	return revlog.revlog(repo.vfs, path)			return revlog.revlog(repo.vfs, path)
	except error.RevlogError:			except error.RevlogError:
				stashUnsubmitted Not Done No need for return stash: No need for return
	# corruption: for now, we can simply nuke all files			# corruption: for now, we can simply nuke all files
	# TODO: log to Scuba			# TODO: log to Scuba
	repo.ui.debug("caught revlog error. %s was probably corrupted\n" % path)			repo.ui.debug("caught revlog error. %s was probably corrupted\n" % path)
	repo.vfs.rmtree('undolog')			repo.vfs.rmtree('undolog')
	repo.vfs.makedirs('undolog')			repo.vfs.makedirs('undolog')
	# if we get the error a second time			# if we get the error a second time
	# then someone is actively messing with these files			# then someone is actively messing with these files
	return revlog.revlog(repo.vfs, path)			return revlog.revlog(repo.vfs, path)

	def tohexnode(repo, spec):			def tohexnode(repo, spec):
	revs = repo.revs(spec)			revs = repo.revs(spec)
	tonode = repo.changelog.node			tonode = repo.changelog.node
	hexnodes = [hex(tonode(x)) for x in revs]			hexnodes = [hex(tonode(x)) for x in revs]
	return hexnodes			return hexnodes

tests/test-undo.t

	> strip =!			> strip =!
	> fbamend =!			> fbamend =!
	> EOF			> EOF

	hg undo --preview test			hg undo --preview test
	$ touch prev1 && hg add prev1 && hg ci -m prev1			$ touch prev1 && hg add prev1 && hg ci -m prev1
	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [templatealias]			> [templatealias]
	> undopreview = '{if(undonecommits, "Undone")}'			> undopreview = '{if(undonecommits(UNDOINDEX), "Undone")}'
	> EOF			> EOF
	$ hg undo -p			$ hg undo -p
	@ Undone			@ Undone
	\|			\|
	o			o
	\|			\|
	\| o			\| o
	\|/			\|/
	o			o
	\|			\|
	o			o
	\|			\|
	o			o
	\|			\|
	~			~
	o			o
	\|			\|
	~			~
	o			o
	\|			\|
	~			~
				$ hg undo -p -n 2
				@ Undone
				\|
				o Undone
				\|
				\| o
				\|/
				o
				\|
				o
				\|
				o
				\|
				~
				o
				\|
				~
				o
				\|
				~

			Path	Packages
M			hgext3rd/undo.py (123 lines)
M			tests/test-undo.t (22 lines)

This is an archive of the discontinued Mercurial Phabricator instance.

undo: add --index and redo support to preview
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 882

hgext3rd/undo.py

tests/test-undo.t

This is an archive of the discontinued Mercurial Phabricator instance.

undo: add --index and redo support to previewClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 882

hgext3rd/undo.py

tests/test-undo.t

undo: add --index and redo support to preview
ClosedPublic

Revision Contents
Changeset List