From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Nov 2012 20:53:50 +0000 (-0800)
Subject: Merge branch 'fc/remote-hg'
X-Git-Tag: v1.8.1-rc0~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/545492f0783f115ba2f9076471baf91d991337fe?ds=inline;hp=-c

Merge branch 'fc/remote-hg'

New remote helper for hg.

* fc/remote-hg: (22 commits)
remote-hg: fix for older versions of python
remote-hg: fix for files with spaces
remote-hg: avoid bad refs
remote-hg: try the 'tip' if no checkout present
remote-hg: fix compatibility with older versions of hg
remote-hg: add missing config for basic tests
remote-hg: the author email can be null
remote-hg: add option to not track branches
remote-hg: add extra author test
remote-hg: add tests to compare with hg-git
remote-hg: add bidirectional tests
test-lib: avoid full path to store test results
remote-hg: add basic tests
remote-hg: fake bookmark when there's none
remote-hg: add compat for hg-git author fixes
remote-hg: add support for hg-git compat mode
remote-hg: match hg merge behavior
remote-hg: make sure the encoding is correct
remote-hg: add support to push URLs
remote-hg: add support for remote pushing
...
---

545492f0783f115ba2f9076471baf91d991337fe
diff --combined t/test-lib.sh
index 0334a9e8fd,0f45481809..f50f8341d4
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -389,7 -389,8 +389,8 @@@ test_done () 
  	then
  		test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results"
  		mkdir -p "$test_results_dir"
- 		test_results_path="$test_results_dir/${0%.sh}-$$.counts"
+ 		base=${0##*/}
+ 		test_results_path="$test_results_dir/${base%.sh}-$$.counts"
  
  		cat >>"$test_results_path" <<-EOF
  		total $test_count
@@@ -738,12 -739,6 +739,12 @@@ test_lazy_prereq UTF8_NFD_TO_NFC 
  	esac
  '
  
 +test_lazy_prereq AUTOIDENT '
 +	sane_unset GIT_AUTHOR_NAME &&
 +	sane_unset GIT_AUTHOR_EMAIL &&
 +	git var GIT_AUTHOR_IDENT
 +'
 +
  # When the tests are run as root, permission tests will report that
  # things are writable when they shouldn't be.
  test -w / || test_set_prereq SANITY