summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-03 14:10:11 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-03 14:10:11 -0400
commit6a759f62bc7b5f1ee24c0b9989da8b977d796d63 (patch)
tree17ca6c75ce0f114bcf864a3f91ca531d187fa22d
parent58e511c9994ada62d70674cf4ed83270f5d60e8c (diff)
use DIRHASH-LOWER for consistency
-rw-r--r--Remote/External/Types.hs2
-rw-r--r--debian/changelog2
-rw-r--r--doc/design/external_special_remote_protocol.mdwn2
-rw-r--r--doc/design/external_special_remote_protocol/comment_28_74961b12a73a52a700e10a21674e66ee._comment7
4 files changed, 10 insertions, 3 deletions
diff --git a/Remote/External/Types.hs b/Remote/External/Types.hs
index 9050d0a84..2ce498341 100644
--- a/Remote/External/Types.hs
+++ b/Remote/External/Types.hs
@@ -199,7 +199,7 @@ instance Proto.Receivable RemoteRequest where
parseCommand "VERSION" = Proto.parse1 VERSION
parseCommand "PROGRESS" = Proto.parse1 PROGRESS
parseCommand "DIRHASH" = Proto.parse1 DIRHASH
- parseCommand "DIRHASH_LOWER" = Proto.parse1 DIRHASH_LOWER
+ parseCommand "DIRHASH-LOWER" = Proto.parse1 DIRHASH_LOWER
parseCommand "SETCONFIG" = Proto.parse2 SETCONFIG
parseCommand "GETCONFIG" = Proto.parse1 GETCONFIG
parseCommand "SETCREDS" = Proto.parse3 SETCREDS
diff --git a/debian/changelog b/debian/changelog
index 68de420af..c291cab53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ git-annex (6.20160420) UNRELEASED; urgency=medium
again later.
* Android: Icon refresh.
Thanks, freewheelinfranks.
- * Added DIRHASH_LOWER to external special remote protocol.
+ * Added DIRHASH-LOWER to external special remote protocol.
-- Joey Hess <id@joeyh.name> Thu, 28 Apr 2016 13:17:04 -0400
diff --git a/doc/design/external_special_remote_protocol.mdwn b/doc/design/external_special_remote_protocol.mdwn
index cbe8504ed..81feda145 100644
--- a/doc/design/external_special_remote_protocol.mdwn
+++ b/doc/design/external_special_remote_protocol.mdwn
@@ -233,7 +233,7 @@ in control.
creating hash directory structures to store Keys in. This is the same
directory hash that git-annex uses inside `.git/annex/objects/`
(git-annex replies with VALUE followed by the value.)
-* `DIRHASH_LOWER Key`
+* `DIRHASH-LOWER Key`
Gets a two level hash associated with a Key, using only lower-case.
Something like "abc/def".
This is always the same for any given Key, so can be used for eg,
diff --git a/doc/design/external_special_remote_protocol/comment_28_74961b12a73a52a700e10a21674e66ee._comment b/doc/design/external_special_remote_protocol/comment_28_74961b12a73a52a700e10a21674e66ee._comment
new file mode 100644
index 000000000..faaf26a2d
--- /dev/null
+++ b/doc/design/external_special_remote_protocol/comment_28_74961b12a73a52a700e10a21674e66ee._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 28"""
+ date="2016-05-03T18:09:50Z"
+ content="""
+Agreed, DIRHASH-LOWER is more consistent, changed it to that.
+"""]]