This is an archive of the discontinued Mercurial Phabricator instance.

directaccess: add support to export and tests to demonstrate things
AbandonedPublic

Authored by pulkit on Sep 19 2017, 9:36 PM.

Download Raw Diff

Details

Reviewers

durham
ryanmce

Group Reviewers

hg-reviewers

Summary

This patch adds the cmdtype attribute to export command which is a read only
command and adds test for accessing hidden commits using the same command.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 19 2017, 9:36 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 19 2017, 9:36 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit mentioned this in D614: registrar: make cmdtype an attribute of the function in registar.command.Sep 19 2017, 9:38 PM

pulkit mentioned this in D696: registrar: add a enum 'cmdtype' for the type of the command.

pulkit mentioned this in D612: command: add a cmdtype argument to registrar.command.Sep 19 2017, 9:40 PM

durham accepted this revision.Sep 26 2017, 8:20 AM

durham added a subscriber: durham.

durham added inline comments.

tests/test-directaccess.t
12	Do we need uncommit? It doesn't seem used.
65	I'm still not sure we want to support rev numbers. I think we definitely don't want to support them for write commands, even recoverable ones.

pulkit planned changes to this revision.Oct 6 2017, 5:16 PM

pulkit updated this revision to Diff 2598.Oct 11 2017, 3:11 PM

ryanmce requested changes to this revision.Oct 12 2017, 7:38 AM

ryanmce added a subscriber: ryanmce.

ryanmce added inline comments.

tests/test-directaccess.t
23–35	Why so many commits here? It seems to needlessly bloat the test.
65	This is showing the rev numbers are not supported, right?

This revision now requires changes to proceed.Oct 12 2017, 7:38 AM

pulkit added inline comments.Oct 12 2017, 1:30 PM

tests/test-directaccess.t
23–35	Okay will fix in next version.
65	Yes!

Resend the series as D1140 - D1144.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (5 lines)
A	M		tests/test-directaccess.t (92 lines)

Status	Author	Revision
Abandoned	pulkit	D1014 revset: update repo._pinnedrevs with hidden commits from the tree
Abandoned	pulkit	D1013 dispatch: filter the repository depending on func.cmdtype
Abandoned	pulkit	D738 directaccess: add support to export and tests to demonstrate things
Abandoned	pulkit	D737 directaccess: add support for accessing hidden commits if command is read only
Closed	pulkit	D736 registrar: add support for storing the type of command in func object

Diff 2598

mercurial/commands.py

	tags as tagsmod,			tags as tagsmod,
	templatekw,			templatekw,
	ui as uimod,			ui as uimod,
	util,			util,
	)			)

	release = lockmod.release			release = lockmod.release

				readonly = registrar.command.readonly

	table = {}			table = {}
	table.update(debugcommandsmod.command._table)			table.update(debugcommandsmod.command._table)

	command = registrar.command(table)			command = registrar.command(table)

	# common command options			# common command options

	globalopts = [			globalopts = [
	root=opts.get('root'))			root=opts.get('root'))

	@command('^export',			@command('^export',
	[('o', 'output', '',			[('o', 'output', '',
	_('print output to file with formatted name'), _('FORMAT')),			_('print output to file with formatted name'), _('FORMAT')),
	('', 'switch-parent', None, _('diff against the second parent')),			('', 'switch-parent', None, _('diff against the second parent')),
	('r', 'rev', [], _('revisions to export'), _('REV')),			('r', 'rev', [], _('revisions to export'), _('REV')),
	] + diffopts,			] + diffopts,
	_('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))			_('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
				cmdtype=readonly)
	def export(ui, repo, changesets, *opts):			def export(ui, repo, changesets, *opts):
	"""dump the header and diffs for one or more changesets			"""dump the header and diffs for one or more changesets

	Print the changeset header and diffs for one or more revisions.			Print the changeset header and diffs for one or more revisions.
	If no revision is given, the parent of the working directory is used.			If no revision is given, the parent of the working directory is used.

	The information shown in the changeset header is: author, date,			The information shown in the changeset header is: author, date,
	branch name (if non-default), changeset hash, parent(s) and commit			branch name (if non-default), changeset hash, parent(s) and commit

tests/test-directaccess.t

This file was added.

				Tests for access level on hidden commits by various commands on based of their
				type.

				Setting the required config to start this

				$ cat >> $HGRCPATH <<EOF
				> [experimental]
				> evolution=createmarkers, allowunstable
				> directaccess=True
				> [extensions]
				> uncommit =
				> amend =
				durhamUnsubmitted Not Done Do we need uncommit? It doesn't seem used. durham: Do we need uncommit? It doesn't seem used.
				> rebase =
				> EOF

				$ hg init repo
				$ cd repo
				$ for ch in {a..h}; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done

				$ hg log -G -T '{rev}:{node} {desc}' --hidden
				@ 7:ec2426147f0e39dbc9cef599b066be6035ce691d Added h
				\|
				o 6:87d6d66763085b629e6d7ed56778c79827273022 Added g
				\|
				o 5:825660c69f0cd8d9542c1fea6e5d444c666f063b Added f
				\|
				o 4:aa98ab95a9284d289c73a270d70c37914795a842 Added e
				\|
				o 3:62615734edd52f06b6fb9c2beb429e4fe30d57b8 Added d
				\|
				o 2:28ad74487de9599d00d81085be739c61fc340652 Added c
				\|
				o 1:29becc82797a4bc11ec8880b58eaecd2ab3e7760 Added b
				\|
				o 0:18d04c59bb5d2d4090ad9a5b59bd6274adb63add Added a
				ryanmceUnsubmitted Not Done Why so many commits here? It seems to needlessly bloat the test. ryanmce: Why so many commits here? It seems to needlessly bloat the test.
				pulkitAuthorUnsubmitted Not Done Okay will fix in next version. pulkit: Okay will fix in next version.

				$ echo "bar" >> h
				$ hg amend

				$ hg log -G -T '{rev}:{node} {desc}' --hidden
				@ 8:c9fa1a715c1b7661c0fafb362a9f30bd75878d7d Added h
				\|
				\| x 7:ec2426147f0e39dbc9cef599b066be6035ce691d Added h
				\|/
				o 6:87d6d66763085b629e6d7ed56778c79827273022 Added g
				\|
				o 5:825660c69f0cd8d9542c1fea6e5d444c666f063b Added f
				\|
				o 4:aa98ab95a9284d289c73a270d70c37914795a842 Added e
				\|
				o 3:62615734edd52f06b6fb9c2beb429e4fe30d57b8 Added d
				\|
				o 2:28ad74487de9599d00d81085be739c61fc340652 Added c
				\|
				o 1:29becc82797a4bc11ec8880b58eaecd2ab3e7760 Added b
				\|
				o 0:18d04c59bb5d2d4090ad9a5b59bd6274adb63add Added a

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

				Testing with rev number

				$ hg exp 7
				abort: hidden revision '7'!
				durhamUnsubmitted Not Done I'm still not sure we want to support rev numbers. I think we definitely don't want to support them for write commands, even recoverable ones. durham: I'm still not sure we want to support rev numbers. I think we definitely don't want to support…
				ryanmceUnsubmitted Not Done This is showing the rev numbers are not supported, right? ryanmce: This is showing the rev numbers are not supported, right?
				pulkitAuthorUnsubmitted Not Done Yes! pulkit: Yes!
				(use --hidden to access hidden revisions)
				[255]

				Testing with hash

				$ hg exp ec2426
				# HG changeset patch
				# User test
				# Date 0 0
				# Thu Jan 01 00:00:00 1970 +0000
				# Node ID ec2426147f0e39dbc9cef599b066be6035ce691d
				# Parent 87d6d66763085b629e6d7ed56778c79827273022
				Added h

				diff -r 87d6d6676308 -r ec2426147f0e h
				--- /dev/null Thu Jan 01 00:00:00 1970 +0000
				+++ b/h Thu Jan 01 00:00:00 1970 +0000
				@@ -0,0 +1,1 @@
				+foo

				Make sure things with cmdtype undefined dont work with hidden commits
				=====================================================================

				$ hg rebase -s ec2426 -d .
				abort: hidden revision 'ec2426'!
				(use --hidden to access hidden revisions)
				[255]

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1906		Sep 19 2017, 9:36 PM	★	★
Diff 2	2598		Oct 11 2017, 3:11 PM	★	★