Mercurial > hg > hg-git

changeset 566:81832807d193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: uncomment calls to hghave git Now that hghave git works properly, uncomment the calls, and add ones that were missing.
author David M. Carr <david@carrclan.us>
date Mon, 29 Oct 2012 00:17:55 -0400
parents 8c6dc6a6f5d8
children b933b2b06b87
files tests/test-bookmark-workflow.t tests/test-clone.t tests/test-conflict-1.t tests/test-conflict-2.t tests/test-convergedmerge.t tests/test-empty-working-tree.t tests/test-encoding.t tests/test-file-removal.t tests/test-git-clone.t tests/test-git-submodules.t tests/test-git-tags.t tests/test-git-workflow.t tests/test-hg-author.t tests/test-hg-branch.t tests/test-hg-tags.t tests/test-incoming.t tests/test-keywords.t tests/test-merge.t tests/test-octopus.t tests/test-outgoing.t tests/test-pull-after-strip.t tests/test-pull.t tests/test-push.t tests/test-subrepos.t tests/test-tree-decomposition.t
diffstat 25 files changed, 51 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-bookmark-workflow.t
+++ b/tests/test-bookmark-workflow.t
@@ -9,8 +9,8 @@
 of bookmarks should be considered "under test", and mutation of bookmarks
 locally is only to provide a test fixture.
 
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 Bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-conflict-1.t
+++ b/tests/test-conflict-1.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-conflict-2.t
+++ b/tests/test-conflict-2.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-convergedmerge.t
+++ b/tests/test-convergedmerge.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-empty-working-tree.t
+++ b/tests/test-empty-working-tree.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-file-removal.t
+++ b/tests/test-file-removal.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-git-clone.t
+++ b/tests/test-git-clone.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-git-submodules.t
+++ b/tests/test-git-submodules.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-git-tags.t
+++ b/tests/test-git-tags.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-git-workflow.t
+++ b/tests/test-git-workflow.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-hg-author.t
+++ b/tests/test-hg-author.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-hg-branch.t
+++ b/tests/test-hg-branch.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-hg-tags.t
+++ b/tests/test-hg-tags.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-incoming.t
+++ b/tests/test-incoming.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-keywords.t
+++ b/tests/test-keywords.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-merge.t
+++ b/tests/test-merge.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-octopus.t
+++ b/tests/test-octopus.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-outgoing.t
+++ b/tests/test-outgoing.t
@@ -1,3 +1,6 @@
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
+
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
 
--- a/tests/test-pull-after-strip.t
+++ b/tests/test-pull-after-strip.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 this test is busted on hg < 1.5. I'm not sure how to fix it.
   $ cat > tmp.py <<EOF
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-subrepos.t
+++ b/tests/test-subrepos.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
 python -c 'import dulwich, dulwich.repo' || exit 80
--- a/tests/test-tree-decomposition.t
+++ b/tests/test-tree-decomposition.t
@@ -1,5 +1,5 @@
-# Fails for some reason, need to investigate
-#   $ "$TESTDIR/hghave" git || exit 80
+bail if the user does not have git command-line client
+  $ "$TESTDIR/hghave" git || exit 80
 
 bail if the user does not have dulwich
   $ python -c 'import dulwich, dulwich.repo' || exit 80