Patchwork D2676: tests: stop over-specifying tempfile name

login
register
mail settings
Submitter phabricator
Date March 4, 2018, 9:51 p.m.
Message ID <differential-rev-PHID-DREV-oecdm3d6jnket33rxu7a-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/29015/
State Superseded
Headers show

Comments

phabricator - March 4, 2018, 9:51 p.m.
durin42 created this revision.
Herald added a reviewer: pulkit.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2676

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-merge-tools.t

CHANGE DETAILS




To: durin42, pulkit, #hg-reviewers
Cc: mercurial-devel
phabricator - March 8, 2018, 6:30 a.m.
indygreg added a comment.


  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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2676

To: durin42, pulkit, #hg-reviewers
Cc: indygreg, mercurial-devel
phabricator - March 8, 2018, 7:26 p.m.
durin42 added a comment.


  In https://phab.mercurial-scm.org/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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2676

To: durin42, pulkit, #hg-reviewers
Cc: indygreg, mercurial-devel
phabricator - March 18, 2018, 2:04 a.m.
durin42 added a comment.


  Friendly ping.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2676

To: durin42, pulkit, #hg-reviewers
Cc: indygreg, mercurial-devel

Patch

diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -1558,7 +1558,7 @@ 
   $ hg update -q -C 2
   $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
   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
   (branch merge, don't forget to commit)
 
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -201,6 +201,7 @@ 
 test-merge-revert2.t
 test-merge-subrepos.t
 test-merge-symlinks.t
+test-merge-tools.t
 test-merge-types.t
 test-merge1.t
 test-merge10.t