Mercurial > hg
view tests/test-convert-darcs @ 7732:3793802ea41b
Make util.find_exe alway returns existing file, fixing issue1459
It seems like the old behaviour with different handling for commands with and
without path was intended, but I think this behaviour of util.find_exe is
better:
* Always returns existing file
* or None if command not found - no default
* Windows: Returned file thus always ends with extension from PATHEXT
This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might
fix other unintended behaviour too.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 25 Jan 2009 21:20:13 +0100 |
parents | 14ed6662af48 |
children | 5b7da468531b |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" darcs || exit 80 if darcs --version 2>&1 | grep '^2\.' > /dev/null; then # FIXME: darcs 2 will fail with ### Abort: timeout after 180 seconds. echo 'skipped: test currently disabled for darcs 2' exit 80 fi echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH echo 'hgext.graphlog =' >> $HGRCPATH DARCS_EMAIL='test@example.org'; export DARCS_EMAIL HOME=do_not_use_HOME_darcs; export HOME # skip if we can't import elementtree mkdir dummy mkdir dummy/_darcs if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then echo 'skipped: missing feature: elementtree module' exit 80 fi echo % initialize darcs repo mkdir darcs-repo cd darcs-repo darcs init echo a > a darcs record -a -l -m p0 cd .. echo % branch and update darcs get darcs-repo darcs-clone >/dev/null cd darcs-clone echo c >> a echo c > c darcs record -a -l -m p1.1 cd .. echo % update source cd darcs-repo echo b >> a echo b > b darcs record -a -l -m p1.2 echo % merge branch darcs pull -a ../darcs-clone echo e > a darcs record -a -l -m p2 cd .. glog() { hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@" } hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$' # The converter does not currently handle patch conflicts very well. # When they occur, it reverts *all* changes and moves forward, # letting the conflict resolving patch fix collisions. # Unfortunately, non-conflicting changes, like the addition of the # "c" file in p1.1 patch are reverted too. # Just to say that manifest not listing "c" here is a bug. glog -R darcs-repo-hg hg up -q -R darcs-repo-hg hg -R darcs-repo-hg manifest --debug