This is an archive of the discontinued Mercurial Phabricator instance.

fbamend: add unhide command for easy unhiding of commits
ClosedPublic

Authored by mitrandir on Jul 24 2017, 8:11 AM.

Download Raw Diff

Details

Reviewers

durham
kulshrax
quark

Group Reviewers

Restricted Project

Commits

rFBHGX338278622dce: fbamend: add unhide command for easy unhiding of commits

Summary

This command helps the user to bring back the commits to life with an explicit
command - wihtout the need to change working copy parent or create bookmarks.

Test Plan

see test

Diff Detail

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mitrandir created this revision.Jul 24 2017, 8:11 AM

Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 24 2017, 8:11 AM

mitrandir added a parent revision: D178: fbamend: add hide - a simple command for hiding commits.Jul 24 2017, 8:12 AM

mitrandir added reviewers: durham, kulshrax, quark.Jul 24 2017, 10:51 AM

There are 2 concepts: visible, and obsolete. Is it intentionally to unobsolete commits? If not, I'd rather just change visibility while still making the commit obsoleted (via hiddenoverride, not inhibit), since that will not cause divergence (which could confuse auto rebase and make future workflows harder).

This revision now requires changes to proceed.Jul 24 2017, 12:19 PM

quark mentioned this in D178: fbamend: add hide - a simple command for hiding commits.Jul 24 2017, 12:22 PM

Per discussion internally, the local unhide/hide concepts could be too complicated and a common user won't be able to distinguish between unhide and revive/touch. So let's make unhide/touch the same thing then. We can revisit this later.

This revision is now accepted and ready to land.Jul 25 2017, 1:11 PM

I was thinking something along the lines of hg hide --global REV and hg unhide --global REV for the "make this visible/invisible everywhere" idea.

In D179#2789, @ryanmce wrote:

I was thinking something along the lines of hg hide --global REV and hg unhide --global REV for the "make this visible/invisible everywhere" idea.

I'm more concerned about the complexity here, both concept-wise and implementation-wise. I'm leaning towards global-by-default now.

I was thinking this way: what's the downside if we go the always-global approach? Unwanted divergence and unwanted strip of others' commits when exchanged. They seem easier to solve than the complexity of local hidden.

refactor to use repo.set and context managers

Closed by commit rFBHGX338278622dce: fbamend: add unhide command for easy unhiding of commits (authored by mitrandir). · Explain WhyJul 28 2017, 9:29 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext3rd/fbamend/hide.py (18 lines)
M			tests/test-fbamend-hide.t (23 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	390		Jul 24 2017, 8:11 AM	★	★
Diff 2	412	refactor to use repo.set and context managers	Jul 26 2017, 12:01 PM	★	★
Diff 3	440	rFBHGX338278622dce3520d67ab35295c913576bf14531	Jul 27 2017, 6:39 AM	★	★

	Status	Author	Revision
	Closed	mitrandir	D179 fbamend: add unhide command for easy unhiding of commits
	Closed	mitrandir	D178 fbamend: add hide - a simple command for hiding commits

Diff 440

hgext3rd/fbamend/hide.py

	# hide.py - simple and user-friendly commands to hide and unhide commits			# hide.py - simple and user-friendly commands to hide and unhide commits
	#			#
	# Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>			# Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
	# Logilab SA <contact@logilab.fr>			# Logilab SA <contact@logilab.fr>
	# Pierre-Yves David <pierre-yves.david@ens-lyon.org>			# Pierre-Yves David <pierre-yves.david@ens-lyon.org>
	# Patrick Mezard <patrick@mezard.eu>			# Patrick Mezard <patrick@mezard.eu>
	# Copyright 2017 Facebook, Inc.			# Copyright 2017 Facebook, Inc.
	#			#
	# 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
	from mercurial import (			from mercurial import (
	bookmarks as bookmarksmod,			bookmarks as bookmarksmod,
	cmdutil,			cmdutil,
	error,			error,
	hg,			hg,
				extensions,
	obsolete,			obsolete,
	registrar,			registrar,
	scmutil,			scmutil,
	)			)
	from mercurial.i18n import _			from mercurial.i18n import _

	cmdtable = {}			cmdtable = {}
	command = registrar.command(cmdtable)			command = registrar.command(cmdtable)
	bmchanges = []			bmchanges = []
	for book, node in bookmarksmod.listbinbookmarks(repo):			for book, node in bookmarksmod.listbinbookmarks(repo):
	if node in hnodes:			if node in hnodes:
	bmchanges.append((book, None))			bmchanges.append((book, None))
	repo._bookmarks.applychanges(repo, tr, bmchanges)			repo._bookmarks.applychanges(repo, tr, bmchanges)

	if len(bmchanges) > 0:			if len(bmchanges) > 0:
	ui.status(_('%i bookmarks removed\n') % len(bmchanges))			ui.status(_('%i bookmarks removed\n') % len(bmchanges))

				@command('^unhide', [('r', 'rev', [], _("revisions to unhide"))])
				def unhide(ui, repo, revs, *opts):
				"""unhide changesets and their ancestors
				"""
				unfi = repo.unfiltered()
				revs = list(revs) + opts.pop('rev', [])
				revs = set(scmutil.revrange(unfi, revs))
				ctxs = unfi.set("::(%ld) & obsolete()", revs)

				with repo.wlock(), repo.lock(), repo.transaction('unhide'):
				try:
				inhibit = extensions.find('inhibit')
				inhibit.revive(ctxs, operation='unhide')
				except KeyError:
				raise error.Abort(_('cannot unhide - inhibit extension '
				'is not enabled'))

tests/test-fbamend-hide.t

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [extensions]			> [extensions]
	> fbamend=$TESTDIR/../hgext3rd/fbamend			> fbamend=$TESTDIR/../hgext3rd/fbamend
				> inhibit=$TESTDIR/../hgext3rd/inhibit.py
	> drawdag=$RUNTESTDIR/drawdag.py			> drawdag=$RUNTESTDIR/drawdag.py
	> [experimental]			> [experimental]
	> evolution = createmarkers, allowunstable			> evolution = createmarkers, allowunstable
	> EOF			> EOF

	Create repo			Create repo
	$ hg init			$ hg init
	$ hg debugdrawdag <<'EOS'			$ hg debugdrawdag <<'EOS'
	$ hg hide .			$ hg hide .
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	working directory now at 426bada5c675			working directory now at 426bada5c675
	3 changesets hidden			3 changesets hidden
	2 bookmarks removed			2 bookmarks removed
	$ hg log -G -T '{rev} {desc} {bookmarks}\n'			$ hg log -G -T '{rev} {desc} {bookmarks}\n'
	@ 0 A			@ 0 A


				Unhide stuff
				$ hg unhide 2
				$ hg log -G -T '{rev} {desc} {bookmarks}\n'
				o 2 C
				\|
				o 1 B
				\|
				@ 0 A

				$ hg unhide -r 4 -r 3
				$ hg log -G -T '{rev} {desc} {bookmarks}\n'
				o 4 E
				\|
				\| o 3 D
				\| \|
				o \| 2 C
				\|/
				o 1 B
				\|
				@ 0 A