This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12010

tests: also test spaces in conflict marker labels
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc852950f0e72: tests: also test spaces in conflict marker labels
Summary

Our fake merge tool printed the arguments using $1 etc. without
quotes, which means that the shell collapsed repeated spaces within
the argument. That resulted in tests that did not pick up changes to
the number of spaces.

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

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 4:33 AM
This revision is now accepted and ready to land.Jan 24 2022, 4:33 AM
martinvonz added a commit: rHGc852950f0e72: tests: also test spaces in conflict marker labels.Jan 24 2022, 12:29 PM
Closed by commit rHGc852950f0e72: tests: also test spaces in conflict marker labels (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-tools.t (22 lines)

Diff 31823

tests/test-merge-tools.t

$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ cat <<EOF > printargs_merge_tool $ cat <<EOF > printargs_merge_tool
> while test \$# -gt 0; do echo arg: \"\$1\"; shift; done > while test \$# -gt 0; do echo arg: \""\$1"\"; shift; done
> EOF > EOF
$ hg --config merge-tools.true.executable='sh' \ $ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \ > --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \ > --config ui.mergemarkers=detailed \
> merge -r 2 > merge -r 2
merging f merging f
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ cat <<EOF > printargs_merge_tool $ cat <<EOF > printargs_merge_tool
> while test \$# -gt 0; do echo arg: \"\$1\"; shift; done > while test \$# -gt 0; do echo arg: \""\$1"\"; shift; done
> EOF > EOF
$ hg --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. \ $ hg --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. \
> --config merge-tools.true.executable='sh' \ > --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \ > --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \ > --config ui.mergemarkers=detailed \
> merge -r 2 > merge -r 2
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ cat <<EOF > printargs_merge_tool $ cat <<EOF > printargs_merge_tool
> while test \$# -gt 0; do echo arg: \"\$1\"; shift; done > while test \$# -gt 0; do echo arg: \""\$1"\"; shift; done
> EOF > EOF
$ hg --config merge-tools.true.executable='sh' \ $ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \ > --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
> --config merge-tools.true.mergemarkers=detailed \ > --config merge-tools.true.mergemarkers=detailed \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \ > --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=basic \ > --config ui.mergemarkers=basic \
> merge -r 2 > merge -r 2
merging f merging f
arg: "ll:working copy: tooltmpl ef83787e2614" arg: "ll:working copy: tooltmpl ef83787e2614"
arg: "lo:" arg: "lo:"
arg: "merge rev: tooltmpl 0185f4e0cf02" arg: "merge rev: tooltmpl 0185f4e0cf02"
arg: "lb:base: */f~base.*" (glob) arg: "lb:base: */f~base.*" (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ rm -f 'printargs_merge_tool' $ rm -f 'printargs_merge_tool'
The merge tool still gets labellocal and labelother as 'basic' even when The merge tool still gets labellocal and labelother as 'basic' even when
premerge=keep is used and has 'detailed' markers: premerge=keep is used and has 'detailed' markers:
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ cat <<EOF > mytool $ cat <<EOF > mytool
> echo labellocal: \"\$1\" > echo labellocal: \""\$1"\"
> echo labelother: \"\$2\" > echo labelother: \""\$2"\"
> echo "output (arg)": \"\$3\" > echo "output (arg)": \""\$3"\"
> echo "output (contents)": > echo "output (contents)":
> cat "\$3" > cat "\$3"
> EOF > EOF
$ hg --config merge-tools.true.executable='sh' \ $ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='mytool $labellocal $labelother $output' \ > --config merge-tools.true.args='mytool $labellocal $labelother $output' \
> --config merge-tools.true.premerge=keep \ > --config merge-tools.true.premerge=keep \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \ > --config ui.mergemarkertemplate='uitmpl {rev}' \
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ cat <<EOF > mytool $ cat <<EOF > mytool
> echo labellocal: \"\$1\" > echo labellocal: \""\$1"\"
> echo labelother: \"\$2\" > echo labelother: \""\$2"\"
> echo "output (arg)": \"\$3\" > echo "output (arg)": \""\$3"\"
> echo "output (contents)": > echo "output (contents)":
> cat "\$3" > cat "\$3"
> EOF > EOF
$ hg --config merge-tools.true.executable='sh' \ $ hg --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='mytool $labellocal $labelother $output' \ > --config merge-tools.true.args='mytool $labellocal $labelother $output' \
> --config merge-tools.true.premerge=keep \ > --config merge-tools.true.premerge=keep \
> --config merge-tools.true.mergemarkers=detailed \ > --config merge-tools.true.mergemarkers=detailed \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \ > --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \ > --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \ > --config ui.mergemarkers=detailed \
> merge -r 2 > merge -r 2
merging f merging f
labellocal: "working copy: tooltmpl ef83787e2614" labellocal: "working copy: tooltmpl ef83787e2614"
labelother: "merge rev: tooltmpl 0185f4e0cf02" labelother: "merge rev: tooltmpl 0185f4e0cf02"
output (arg): "$TESTTMP/repo/f" output (arg): "$TESTTMP/repo/f"
output (contents): output (contents):
<<<<<<< working copy: tooltmpl ef83787e2614 <<<<<<< working copy: tooltmpl ef83787e2614
revision 1 revision 1
======= =======
revision 2 revision 2
>>>>>>> merge rev: tooltmpl 0185f4e0cf02 >>>>>>> merge rev: tooltmpl 0185f4e0cf02
space space