Mercurial > hg > hg-git

changeset 527:bc7b18c2e5ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove configuration of bookmarks extension All of our supported Hg versions include bookmarks in core. Thus, actovating it in the hgrc and setting bookmarks.track.current are no longer needed.
author David M. Carr <david@carrclan.us>
date Thu, 13 Sep 2012 20:48:11 -0400
parents 8ede232d3c70
children e48a3f30b73c
files 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-r.t tests/test-push.t tests/test-tree-decomposition.t
diffstat 23 files changed, 0 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-conflict-1.t
+++ b/tests/test-conflict-1.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init hgrepo1
   $ cd hgrepo1
--- a/tests/test-conflict-2.t
+++ b/tests/test-conflict-2.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init hgrepo1
   $ cd hgrepo1
--- a/tests/test-convergedmerge.t
+++ b/tests/test-convergedmerge.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init hgrepo1
   $ cd hgrepo1
--- a/tests/test-empty-working-tree.t
+++ b/tests/test-empty-working-tree.t
@@ -9,13 +9,6 @@
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -12,7 +12,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-file-removal.t
+++ b/tests/test-file-removal.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-git-clone.t
+++ b/tests/test-git-clone.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-git-submodules.t
+++ b/tests/test-git-submodules.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-git-tags.t
+++ b/tests/test-git-tags.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-git-workflow.t
+++ b/tests/test-git-workflow.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-hg-author.t
+++ b/tests/test-hg-author.t
@@ -10,14 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
-
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-hg-branch.t
+++ b/tests/test-hg-branch.t
@@ -10,12 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-hg-tags.t
+++ b/tests/test-hg-tags.t
@@ -10,13 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
-  $ cat >> $HGRCPATH <<EOF
-  > 
-  > [bookmarks]
-  > track.current = True
-  > EOF
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-incoming.t
+++ b/tests/test-incoming.t
@@ -14,7 +14,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-keywords.t
+++ b/tests/test-keywords.t
@@ -9,7 +9,6 @@
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-merge.t
+++ b/tests/test-merge.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-octopus.t
+++ b/tests/test-octopus.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-outgoing.t
+++ b/tests/test-outgoing.t
@@ -7,7 +7,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-pull-after-strip.t
+++ b/tests/test-pull-after-strip.t
@@ -21,7 +21,6 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog=
-  > bookmarks=
   > mq=
   > EOF
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -10,7 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-push-r.t
+++ b/tests/test-push-r.t
@@ -4,7 +4,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ hg init test
   $ cd test
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -10,8 +10,6 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
   $ echo 'hgext.graphlog =' >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
-
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
--- a/tests/test-tree-decomposition.t
+++ b/tests/test-tree-decomposition.t
@@ -9,7 +9,6 @@
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
-  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
   $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
   $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL