This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2676

tests: stop over-specifying tempfile name
ClosedPublic

Authored by durin42 on Mar 4 2018, 4:50 PM.

Details

Reviewers
pulkit
yuja
Group Reviewers
hg-reviewers
Commits
rHGccc2d5f10421: tests: stop over-specifying tempfile name
Summary

Python 3 has more random characters in the default template, which is fine.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Mar 4 2018, 4:50 PM
durin42 updated this revision to Diff 6633.Mar 4 2018, 5:18 PM
indygreg added a subscriber: indygreg.Mar 8 2018, 1:30 AM

I'm -0 on this. I'd prefer to change the temp file code to be consistent between Python versions. Preferably standardizing on the Python 3 version.

durin42 added a comment.Mar 8 2018, 2:26 PM
In D2676#43853, @indygreg wrote:

I'm -0 on this. I'd prefer to change the temp file code to be consistent between Python versions. Preferably standardizing on the Python 3 version.

It looks like these are coming from filemerge._maketempfiles, which is using tempfile.mkstemp(). I don't see a way to influence the number of wildcard characters there.

durin42 updated this revision to Diff 6732.Mar 8 2018, 2:26 PM
durin42 updated this revision to Diff 7096.Mar 17 2018, 10:00 PM
durin42 added a comment.Mar 17 2018, 10:04 PM

Friendly ping.

yuja accepted this revision.Mar 19 2018, 9:32 AM
This revision is now accepted and ready to land.Mar 19 2018, 9:32 AM
Closed by commit rHGccc2d5f10421: tests: stop over-specifying tempfile name (authored by durin42). · Explain WhyMar 19 2018, 9:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-merge-tools.t (2 lines)

Diff 6633

contrib/python3-whitelist

test-merge-default.t test-merge-default.t
test-merge-internal-tools-pattern.t test-merge-internal-tools-pattern.t
test-merge-local.t test-merge-local.t
test-merge-remove.t test-merge-remove.t
test-merge-revert.t test-merge-revert.t
test-merge-revert2.t test-merge-revert2.t
test-merge-subrepos.t test-merge-subrepos.t
test-merge-symlinks.t test-merge-symlinks.t
test-merge-tools.t
test-merge-types.t test-merge-types.t
test-merge1.t test-merge1.t
test-merge10.t test-merge10.t
test-merge2.t test-merge2.t
test-merge4.t test-merge4.t
test-merge5.t test-merge5.t
test-merge6.t test-merge6.t
test-merge7.t test-merge7.t

tests/test-merge-tools.t

Verify naming of temporary files and that extension is preserved: Verify naming of temporary files and that extension is preserved:
$ hg update -q -C 1 $ hg update -q -C 1
$ hg mv f f.txt $ hg mv f f.txt
$ hg ci -qm "f.txt" $ hg ci -qm "f.txt"
$ hg update -q -C 2 $ hg update -q -C 2
$ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
merging f and f.txt to f.txt merging f and f.txt to f.txt
*/f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) */f~base.* $TESTTMP/f.txt.orig */f~other.*.txt $TESTTMP/f.txt (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)
Check that debugpicktool examines which merge tool is chosen for Check that debugpicktool examines which merge tool is chosen for
specified file as expected specified file as expected
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]