This is an archive of the discontinued Mercurial Phabricator instance.

tests: cover revision conversion logic in githelp tests
ClosedPublic

Authored by dlax on Dec 2 2019, 4:22 AM.

Download Raw Diff

Details

Reviewers

pulkit
mharbison72

Group Reviewers

hg-reviewers

Commits

rHG5470e63686ca: tests: cover revision conversion logic in githelp tests

Summary

There was no test involving actual conversion of option values when they
contain a git revision name (to be converted as a hg one by
hgext.githelp.convert()). Adding one. This test would fail on Python 3
without https://phab.mercurial-scm.org/D7537.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

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

Event Timeline

dlax created this revision.Dec 2 2019, 4:22 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 2 2019, 4:22 AM

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

dlax added a parent revision: D7537: githelp: fix a `str` type conditional for py3.Dec 2 2019, 4:23 AM

pulkit accepted this revision.Dec 2 2019, 10:07 AM

This revision is now accepted and ready to land.Dec 2 2019, 10:07 AM

mharbison72 accepted this revision.Dec 2 2019, 12:44 PM

mharbison72 added a subscriber: mharbison72.

mharbison72 added inline comments.

tests/test-githelp.t
269	Not a problem with this change, but it doesn't look like commit has a `-M` option.

dlax added a commit: rHG5470e63686ca: tests: cover revision conversion logic in githelp tests.Dec 2 2019, 4:55 PM

Closed by commit rHG5470e63686ca: tests: cover revision conversion logic in githelp tests (authored by dlax). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-githelp.t (4 lines)

Status	Author	Revision
Closed	mharbison72	D7538 pvec: fix a `str` type conditional for py3
Closed	dlax	D7540 tests: cover revision conversion logic in githelp tests
Closed	mharbison72	D7537 githelp: fix a `str` type conditional for py3
Closed	mharbison72	D7536 histedit: fix an `isinstance(nodelist, str)` check for py3
Closed	mharbison72	D7535 win32mbcs: fix a `str` type conditional for py3
Closed	mharbison72	D7534 hgweb: fix a few `str` type conditional for py3
Closed	mharbison72	D7533 repair: fix an `isinstance(nodelist, str)` check for py3

Diff 18432

tests/test-githelp.t

	githelp for reuse message using the shorthand			githelp for reuse message using the shorthand
	$ hg githelp -- git commit -C deadbeef			$ hg githelp -- git commit -C deadbeef
	hg commit -M deadbeef			hg commit -M deadbeef

	githelp for reuse message using the the long version			githelp for reuse message using the the long version
	$ hg githelp -- git commit --reuse-message deadbeef			$ hg githelp -- git commit --reuse-message deadbeef
	hg commit -M deadbeef			hg commit -M deadbeef

				githelp for reuse message using HEAD
				$ hg githelp -- git commit --reuse-message HEAD~
				hg commit -M .~1
				mharbison72Unsubmitted Not Done Not a problem with this change, but it doesn't look like commit has a `-M` option. mharbison72: Not a problem with this change, but it doesn't look like commit has a `-M` option.

	githelp for apply with no options			githelp for apply with no options
	$ hg githelp -- apply			$ hg githelp -- apply
	hg import --no-commit			hg import --no-commit

	githelp for apply with directory strip custom			githelp for apply with directory strip custom
	$ hg githelp -- apply -p 5			$ hg githelp -- apply -p 5
	hg import --no-commit -p 5			hg import --no-commit -p 5

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18417		Dec 2 2019, 4:22 AM	★	★
Diff 2	18432	rHG5470e63686ca82ca765b3f2871b92552b5ec0a42	Dec 2 2019, 4:18 AM	★	★