Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrap Schematron command lines in bin/xspec.* #550

Merged
merged 1,270 commits into from
Jul 23, 2019

Conversation

AirQuick
Copy link
Member

This pull request derives from #549. So needs to be handled after that.


This pull request just wraps Schematron command lines in bin/xspec.* to make it easier to diff future changes.
Virtually no code change.

# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
# Conflicts:
#	test/generate-tests-utils.xspec
#	test/generate-x-utils.xspec
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
# Conflicts:
#	src/compiler/generate-xspec-tests.xsl
# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/xspec-308.xspec
#	test/xspec-node-selection.xspec
# Conflicts:
#	src/compiler/generate-tests-utils.xsl
# Conflicts:
#	src/compiler/generate-xspec-tests.xsl
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-450-451-result.html
# Conflicts:
#	test/generate-xspec-tests.xspec
#	test/unit-expect-xsl.xspec
# Conflicts:
#	src/reporter/format-xspec-report.xsl
#	test/end-to-end/cases/expected/stylesheet/xspec-serialize-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
…nario-block

# Conflicts:
#	src/reporter/format-xspec-report.xsl
#	test/end-to-end/cases/expected/query/xspec-153-result.html
#	test/end-to-end/cases/expected/query/xspec-177-result.html
#	test/end-to-end/cases/expected/query/xspec-346-result.html
#	test/end-to-end/cases/expected/query/xspec-452-result.html
#	test/end-to-end/cases/expected/query/xspec-467-result.html
#	test/end-to-end/cases/expected/query/xspec-67-result.html
#	test/end-to-end/cases/expected/query/xspec-ambiguous-expect-result.html
#	test/end-to-end/cases/expected/query/xspec-focus-1-result.html
#	test/end-to-end/cases/expected/query/xspec-function-result.html
#	test/end-to-end/cases/expected/query/xspec-import-result.html
#	test/end-to-end/cases/expected/query/xspec-imported-result.html
#	test/end-to-end/cases/expected/query/xspec-pending-result.html
#	test/end-to-end/cases/expected/query/xspec-report-result.html
#	test/end-to-end/cases/expected/query/xspec-serialize-result.html
#	test/end-to-end/cases/expected/query/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-151-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-153-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-177-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-23_2-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-346-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-452-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-467-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-50-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-528-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-55-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-67-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-focus-1-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-function-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-import-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-imported-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-pending-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-report-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-result-naming-collision-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-serialize-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-three-dots-result.html
#	test/end-to-end/cases/expected/stylesheet/xspec-xslt2-result.html
@AirQuick AirQuick merged commit d244dfb into xspec:master Jul 23, 2019
@AirQuick AirQuick deleted the wrap-cli-sch-lines branch July 23, 2019 01:09
@AirQuick
Copy link
Member Author

@cirulls
Merged this formatting update.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant