diff options
7 files changed, 22 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 3a277a82a..1e106f2e5 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -266,9 +266,14 @@ onLocal r a = do a keyUrls :: Git.Repo -> Key -> [String] -keyUrls r key = map tourl (annexLocations key) +keyUrls r key = map tourl locs where tourl l = Git.repoLocation r ++ "/" ++ l +#ifndef __WINDOWS__ + locs = annexLocations key +#else + locs = replace "\\" "/" $ annexLocations key +#endif dropKey :: Remote -> Key -> Annex Bool dropKey r key diff --git a/debian/changelog b/debian/changelog index 740f34ed5..582f4eab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ git-annex (4.20130628) UNRELEASED; urgency=low than the urls's path. * Windows: Look for .exe extension when searching for a command in path. * Pass -f to curl when downloading a file with it, so it propigates failure. + * Windows: Fix url to object when using a http remote. -- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400 diff --git a/doc/bugs/On_Windows__44___annex_get_fails_with_HTTP_Remote__44___but_believes_it_has_succeeded..mdwn b/doc/bugs/On_Windows__44___annex_get_fails_with_HTTP_Remote__44___but_believes_it_has_succeeded..mdwn index 9604042e2..b34befcc0 100644 --- a/doc/bugs/On_Windows__44___annex_get_fails_with_HTTP_Remote__44___but_believes_it_has_succeeded..mdwn +++ b/doc/bugs/On_Windows__44___annex_get_fails_with_HTTP_Remote__44___but_believes_it_has_succeeded..mdwn @@ -171,3 +171,10 @@ C:\Users\test-git-annex\test_annex>type file1.txt 192.168.0.2 - - [<datetime>] "GET /test_annex/.git/annex\objects\c96\53e\SHA256-s21--6ed275e9e01c84a57fdd99d6af793c5d587d02e699cd2c28b32b7dc90f73e729\SHA256-s21--6ed275e9e01c84a57fdd99d6af793c5d587d02e699cd2c28b32b7dc90f73e729 HTTP/1.1" 404 - 192.168.0.2 - - [<datetime>] code 404, message File not found """]] + +> This seems to be two distinct bugs. First, curl was not propigating the exit +> status. I already fixed that. +> +> Second, it's using DOS style path separators when constructing the url. +> `http://192.168.0.8:8000/test_annex/.git/annex\\objects\\c96` +> I've put in an (ugly) fix for that. [[done]] --[[Joey]] diff --git a/doc/bugs/On_Windows__44___annex_get_over_HTTP_sends_URLs_with_incorrect_separator.mdwn b/doc/bugs/On_Windows__44___annex_get_over_HTTP_sends_URLs_with_incorrect_separator.mdwn index 5b97cfa1e..08bc76ed1 100644 --- a/doc/bugs/On_Windows__44___annex_get_over_HTTP_sends_URLs_with_incorrect_separator.mdwn +++ b/doc/bugs/On_Windows__44___annex_get_over_HTTP_sends_URLs_with_incorrect_separator.mdwn @@ -182,3 +182,5 @@ git-annex: get: 1 failed 192.168.0.2 - - [<datetime>] code 404, message File not found 192.168.0.2 - - [<datetime>] "GET /test_annex/.git/annex%5Cobjects%5CJ9%5Cm6%5CSHA256-s21--6ed275e9e01c84a57fdd99d6af793c5d587d02e699cd2c28b32b7dc90f73e729%5CSHA256-s21--6ed275e9e01c84a57fdd99d6af793c5d587d02e699cd2c28b32b7dc90f73e729 HTTP/1.1" 404 - """]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/On_Windows__44___wget_is_not_used__44___even_if_available.mdwn b/doc/bugs/On_Windows__44___wget_is_not_used__44___even_if_available.mdwn index 6a2d98685..5420b986c 100644 --- a/doc/bugs/On_Windows__44___wget_is_not_used__44___even_if_available.mdwn +++ b/doc/bugs/On_Windows__44___wget_is_not_used__44___even_if_available.mdwn @@ -63,3 +63,5 @@ C:\Users\test-git-annex\test_annex> git annex get file.txt #fails, with error dialog box, indicating libcurl-4.dll is missing, indicating git-annex is trying to use curl. """]] + +> I fixed this immediately after it was mentioned on IRC. [[done]] --[[Joey]] diff --git a/doc/bugs/can__39__t_annex_get_from_annex_in_direct_mode.mdwn b/doc/bugs/can__39__t_annex_get_from_annex_in_direct_mode.mdwn index fac2554ec..d09a13b07 100644 --- a/doc/bugs/can__39__t_annex_get_from_annex_in_direct_mode.mdwn +++ b/doc/bugs/can__39__t_annex_get_from_annex_in_direct_mode.mdwn @@ -17,3 +17,5 @@ Debian Linux: 3.20120629 (from the package manager) ### Please provide any additional information below. there is no <filehash>.<extension> file in the relevant directories, there are only .map and .cache files. The Windows annex is in direct mode, and the Linux annex fails to annex get from this correctly. + +[[!meta title="can't use a direct mode repository as a http remote"]] diff --git a/doc/bugs/hGetContents:_user_error.mdwn b/doc/bugs/hGetContents:_user_error.mdwn index 8ec84f5ea..b6079d1bf 100644 --- a/doc/bugs/hGetContents:_user_error.mdwn +++ b/doc/bugs/hGetContents:_user_error.mdwn @@ -31,3 +31,5 @@ See above. ### What version of git-annex are you using? On what operating system? Server: 4.20130521 on debian testing (now: 4.20130627) Local: 4.20130621 on debian sid (now: 4.20130627) + +[[!meta title="fails to run on Linux with libc 2.17 and old kernel 2.6.32"]] |