unregisterurl: New command

Implemented by generalizing registerurl. Without the implicit batch mode
of registerurl since that is only a backwards compatability thing
(see commit 1d1054faa6).

doc/git-annex-registerurl.mdwn

@@ -13,10 +13,6 @@ key can be downloaded from.
 
 No verification is performed of the url's contents.
 
-If no key and url pair are specified on the command line,
-batch input is used, the same as if the --batch option were
-specified.
-
 Normally the key is a git-annex formatted key. However, to make it easier
 to use this to add urls, if the key cannot be parsed as a key, and is a
 valid url, an URL key is constructed from the url.
@@ -28,6 +24,11 @@ valid url, an URL key is constructed from the url.
   In batch input mode, lines are read from stdin, and each line
   should contain a key and url, separated by a single space.
 
+  For backwards compatability with old git-annex before this option
+  was added, when no key and url pair are specified on the command line,
+  batch input is used, the same as if the --batch option were
+  specified. It is however recommended to use --batch.
+
 * `-z`
 
    When in batch mode, the input is delimited by nulls instead of the usual
@@ -42,6 +43,8 @@ valid url, an URL key is constructed from the url.
 
 [[git-annex-addurl]](1)
 
+[[git-annex-unregisterurl]](1)
+
 # AUTHOR
 
 Joey Hess <id@joeyh.name>

doc/git-annex-unregisterurl.mdwn

@@ -0,0 +1,41 @@
+# NAME
+
+git-annex unregisterurl - unregisters an url for a key
+
+# SYNOPSIS
+
+git annex unregisterurl `[key url]`
+
+# DESCRIPTION
+
+This plumbing-level command can be used to unregister urls when keys can
+no longer be downloaded from them.
+
+Unregistering a key's last url will make git-annex no longer treat content
+as being present in the web special remote.
+
+# OPTIONS
+
+* `--batch`
+
+  In batch input mode, lines are read from stdin, and each line
+  should contain a key and url, separated by a single space.
+
+* `-z`
+
+   When in batch mode, the input is delimited by nulls instead of the usual
+   newlines.
+
+# SEE ALSO
+
+[[git-annex]](1)
+
+[[git-annex-registerurl]](1)
+
+[[git-annex-rmurl]](1)
+
+# AUTHOR
+
+Joey Hess <id@joeyh.name>
+
+Warning: Automatically converted into a man page by mdwn2man. Edit with care.

doc/git-annex.mdwn

@@ -618,6 +618,12 @@ content from the key-value store.
   Registers an url for a key.
   
   See [[git-annex-registerurl]](1) for details.
+  
+* `unregisterurl [key url]`
+
+  Unregisters an url for a key.
+  
+  See [[git-annex-unregisterurl]](1) for details.
 
 * `setkey key file`
 

doc/todo/unregisterurl_KEY_URL.mdwn

@@ -15,3 +15,5 @@ edit 1: well, instead of adding `unregisterurl` could be done by adding `--key`
 
 [[!meta author=yoh]]
 [[!tag projects/dandi]]
+
+> unregisterurl [[done]] --[[Joey]]