Commit graph

20934 commits

Author SHA1 Message Date
https://id.koumbit.net/anarcat
d3abb3a619 Added a comment 2014-08-12 19:56:58 +00:00
http://joeyh.name/
eac61dacd1 Added a comment 2014-08-12 19:51:38 +00:00
http://joeyh.name/
d2879070a9 Added a comment 2014-08-12 19:49:35 +00:00
Joey Hess
2369ba4618 move bug and close it 2014-08-12 15:40:21 -04:00
Joey Hess
c963563602 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-12 15:39:27 -04:00
http://joeyh.name/
2718c78ae7 Added a comment 2014-08-12 19:37:56 +00:00
Joey Hess
fbdeeeed5f S3, Glacier, WebDAV: Fix bug that prevented accessing the creds when the repository was configured with encryption=shared embedcreds=yes.
Since encryption=shared, the encryption key is stored in the git repo, so
there is no point at all in encrypting the creds, also stored in the git
repo with that key. So `initremote` doesn't. The creds are simply stored
base-64 encoded.

However, it then tried to always decrypt creds when encryption was used..
2014-08-12 15:35:29 -04:00
http://joeyh.name/
57fb728b62 Added a comment 2014-08-12 18:58:49 +00:00
Joey Hess
631bf3cbc2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-12 14:45:00 -04:00
Joey Hess
f0df660570 WORM backend: When adding a file in a subdirectory, avoid including the subdirectory in the key name. 2014-08-12 14:38:53 -04:00
Joey Hess
4ae25032c6 maybe better note for direct mode, although I dislike the walkthrough being complicated by direct mode at all 2014-08-12 14:30:44 -04:00
http://joeyh.name/
1782fd177c Added a comment 2014-08-12 18:24:57 +00:00
Joey Hess
b09c02b4f9 confirmed; really a git bug 2014-08-12 14:24:38 -04:00
http://joeyh.name/
6113f4cf0f Added a comment 2014-08-12 18:00:47 +00:00
http://joeyh.name/
54d4ce654b Added a comment 2014-08-12 17:57:26 +00:00
http://joeyh.name/
ee7872d3b2 Added a comment 2014-08-12 17:50:15 +00:00
http://joeyh.name/
99ee12d513 Added a comment 2014-08-12 17:48:35 +00:00
http://joeyh.name/
1ac2e022c7 Added a comment 2014-08-12 17:39:10 +00:00
http://joeyh.name/
e698bbc258 Added a comment 2014-08-12 17:33:25 +00:00
http://joeyh.name/
fb1dc71cc8 Added a comment 2014-08-12 17:29:17 +00:00
http://joeyh.name/
6f24dc28ab Added a comment 2014-08-12 17:26:46 +00:00
Joey Hess
26ceb09794 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-12 13:24:02 -04:00
Joey Hess
d8be828734 direct: Fix ugly warning messages.
replaceFileOr was broken and ran the rollback action always.
Luckily, for replaceFile, the rollback action was safe to run, since it
just nuked a temp file that had already been moved into place.

However, when `git annex direct` used replaeFileOr, its rollback printed a
scary message:

  /home/joey/tmp/rrrr/.git/annex/misctmp/tmp32268: rename: does not exist (No such file or directory)

There was actually no bad result though.
2014-08-12 13:00:08 -04:00
Joey Hess
7285896996 make windows depend on new enough unix-compat to get inode numbers 2014-08-12 12:30:40 -04:00
Joey Hess
9193d6e6bd fix build on windows with unix-compat-0.4.1.3
FileID type changed, needs Arbitrary instance.

On the plus side, getFileStatus on Windows now actually gets file id's,
not always 0, so direct mode is safer there now.
2014-08-11 17:25:31 -04:00
https://launchpad.net/~rorymcc
be6f7b4567 Added a comment 2014-08-11 18:41:05 +00:00
https://launchpad.net/~rorymcc
7a7e2ef606 Added a comment 2014-08-11 18:37:47 +00:00
sts
7e78aff15c Added a comment 2014-08-11 11:39:44 +00:00
sts
1cb4fb012e 2014-08-11 08:29:24 +00:00
https://id.koumbit.net/anarcat
a40f1552c2 i believe i provided moreinto in the comments now 2014-08-11 01:58:50 +00:00
https://id.koumbit.net/anarcat
1824d56383 Added a comment: more info 2014-08-11 01:55:28 +00:00
Joey Hess
6bfc3cf3be re-evil-splicved new version of DAV 2014-08-10 20:01:54 -04:00
Joey Hess
3f661d54d8 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-10 19:58:20 -04:00
Joey Hess
800f8f1028 giving up on windows autobuilder until its HP can be upgraded 2014-08-10 19:56:55 -04:00
https://id.koumbit.net/anarcat
6332d7161e icing 2014-08-10 23:56:48 +00:00
https://id.koumbit.net/anarcat
34f5beaaef always set the playcount to some numeric value, 0 if we fail 2014-08-10 23:48:06 +00:00
Joey Hess
b3a9d41910 fix build 2014-08-10 19:44:09 -04:00
Joey Hess
b011439d2f Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-10 19:41:41 -04:00
Joey Hess
fb66ee8c85 qualify catch and try
got a build failure on android due to there being a Prelude.catch
2014-08-10 19:40:21 -04:00
https://id.koumbit.net/anarcat
5141e53ca2 rename tips/dumb_metadata_extraction_from_xbmc/git-annex-xbmc-playcount.pl.pl to tips/dumb_metadata_extraction_from_xbmc/git-annex-xbmc-playcount.pl 2014-08-10 23:35:43 +00:00
https://id.koumbit.net/anarcat
fd2546dafb trying script upload from the web interface, neat 2014-08-10 23:33:36 +00:00
https://id.koumbit.net/anarcat
ae30cba464 this is degenerate, but should work 2014-08-10 23:32:47 +00:00
Joey Hess
29aa5e82dc trying to work around a dep problem on windows 2014-08-10 19:26:03 -04:00
Joey Hess
f709c786d9 stop nuking cabal 2014-08-10 16:23:25 -04:00
Joey Hess
d8240ca1c1 nuke cabal on windows, so it will build new DAV 2014-08-10 16:06:20 -04:00
Joey Hess
c27d9f909b fix windows build 2014-08-10 15:30:55 -04:00
Joey Hess
54b74ef8db Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-10 15:20:03 -04:00
Joey Hess
dc2155c2b8 devblog 2014-08-10 15:17:59 -04:00
Joey Hess
c78a7aa1e1 unlock of not present file should still be a failure, just not a crash 2014-08-10 15:16:24 -04:00
Joey Hess
6adbd50cd9 testremote: Add testing of behavior when remote is not available
Added a mkUnavailable method, which a Remote can use to generate a version
of itself that is not available. Implemented for several, but not yet all
remotes.

This allows testing that checkPresent properly throws an exceptions when
it cannot check if a key is present or not. It also allows testing that the
other methods don't throw exceptions in these circumstances.

This immediately found several bugs, which this commit also fixes!

* git remotes using ssh accidentially had checkPresent return
  an exception, rather than throwing it
* The chunking code accidentially returned False rather than
  propigating an exception when there were no chunks and
  checkPresent threw an exception for the non-chunked key.

This commit was sponsored by Carlo Matteo Capocasa.
2014-08-10 15:02:59 -04:00