summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command/FuzzTest.hs2
-rw-r--r--Command/Test.hs2
-rw-r--r--Types/Command.hs2
-rw-r--r--debian/changelog1
-rw-r--r--doc/git-annex.mdwn21
5 files changed, 20 insertions, 8 deletions
diff --git a/Command/FuzzTest.hs b/Command/FuzzTest.hs
index 08103edc8..d673541fb 100644
--- a/Command/FuzzTest.hs
+++ b/Command/FuzzTest.hs
@@ -22,7 +22,7 @@ import Test.QuickCheck
import Control.Concurrent
def :: [Command]
-def = [ notBareRepo $ command "fuzztest" paramNothing seek SectionPlumbing
+def = [ notBareRepo $ command "fuzztest" paramNothing seek SectionTesting
"generates fuzz test files"]
seek :: CommandSeek
diff --git a/Command/Test.hs b/Command/Test.hs
index ee7220142..08e9d1b6e 100644
--- a/Command/Test.hs
+++ b/Command/Test.hs
@@ -13,7 +13,7 @@ import Messages
def :: [Command]
def = [ noRepo startIO $ dontCheck repoExists $
- command "test" paramNothing seek SectionPlumbing
+ command "test" paramNothing seek SectionTesting
"run built-in test suite"]
seek :: CommandSeek
diff --git a/Types/Command.hs b/Types/Command.hs
index 0df7c82e6..1f8456194 100644
--- a/Types/Command.hs
+++ b/Types/Command.hs
@@ -69,6 +69,7 @@ data CommandSection
| SectionMetaData
| SectionUtility
| SectionPlumbing
+ | SectionTesting
deriving (Eq, Ord, Enum, Bounded)
descSection :: CommandSection -> String
@@ -79,3 +80,4 @@ descSection SectionQuery = "Query commands"
descSection SectionMetaData = "Metadata commands"
descSection SectionUtility = "Utility commands"
descSection SectionPlumbing = "Plumbing commands"
+descSection SectionTesting = "Testing commands"
diff --git a/debian/changelog b/debian/changelog
index bacd89080..eb399dfee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ git-annex (5.20140718) UNRELEASED; urgency=medium
were incompletely repaired before.
* Fix cost calculation for non-encrypted remotes.
* WebDAV: Dropped support for DAV before 0.6.1.
+ * testremote: New command.
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2014 14:41:26 -0400
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 8ba3558d3..9158b54e0 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -949,12 +949,6 @@ subdirectories).
Merge conflicts between two files that are not annexed will not be
automatically resolved.
-* `test`
-
- This runs git-annex's built-in test suite.
-
- There are several parameters, provided by Haskell's tasty test framework.
-
* `remotedaemon`
Detects when network remotes have received git pushes and fetches from them.
@@ -963,6 +957,21 @@ subdirectories).
This command is used internally to perform git pulls over XMPP.
+# TESTING COMMANDS
+
+* `test`
+
+ This runs git-annex's built-in test suite.
+
+ There are several parameters, provided by Haskell's tasty test framework.
+ Pass --help for details.
+
+* `fuzztest`
+
+ Generates random changes to files in the current repository,
+ for use in testing the assistant. This is dangerous, so it will not
+ do anything unless --forced.
+
# OPTIONS
* `--force`