Commit graph

23099 commits

Author SHA1 Message Date
Joey Hess
cf903d5a3c fixup annex link target calculation when submodules are used in filesystems not supporting symlinks 2015-03-04 16:08:41 -04:00
Joey Hess
df4543eb38 avoid checking location of content when calculating gitAnnexLink
It doesn't matter if the object is present or not, gitAnnexLink should
always yield the same symlink target.

This is an optimisation; no behavior should be changed.
2015-03-04 15:45:16 -04:00
Joey Hess
a6db10d565 sync: Fix committing when in a direct mode repo that has no HEAD ref.
Seen for example, a newly checked out git submodule. In this case,
.git/HEAD is a raw sha, rather than the usual reference to a ref.

Removed currentSha in passing, since it was a more roundabout way of
doing what headSha does, and headSha is more robust.
2015-03-04 15:25:35 -04:00
Joey Hess
79b6500111 fix innaccurate comment 2015-03-04 14:44:11 -04:00
Joey Hess
b504b6238d Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-04 12:55:05 -04:00
Joey Hess
9b93278e8a metadata: Fix encoding problem that led to mojibake when storing metadata strings that contained both unicode characters and a space (or '!') character.
The fix is to stop using w82s, which does not properly reconstitute unicode
strings. Instrad, use utf8 bytestring to get the [Word8] to base64. This
passes unicode through perfectly, including any invalid filesystem encoded
characters.

Note that toB64 / fromB64 are also used for creds and cipher
embedding. It would be unfortunate if this change broke those uses.

For cipher embedding, note that ciphers can contain arbitrary bytes (should
really be using ByteString.Char8 there). Testing indicated it's not safe to
use the new fromB64 there; I think that characters were incorrectly
combined.

For credpair embedding, the username or password could contain unicode.
Before, that unicode would fail to round-trip through the b64.
So, I guess this is not going to break any embedded creds that worked
before.

This bug may have affected some creds before, and if so,
this change will not fix old ones, but should fix new ones at least.
2015-03-04 12:54:30 -04:00
Rasmus
d2881f6bd0 Added a comment 2015-03-04 14:35:19 +00:00
Joey Hess
b9ff4a6001 Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-04 10:30:07 -04:00
Joey Hess
9a126d18fd comment 2015-03-04 10:29:25 -04:00
madduck
c65ad7b2f1 2015-03-04 09:06:14 +00:00
Joey Hess
67cd39e8fb groups 2015-03-03 22:40:58 -04:00
Joey Hess
4d0ddb9db7 typo 2015-03-03 22:37:23 -04:00
Joey Hess
5922800c20 clarification 2015-03-03 22:33:46 -04:00
Joey Hess
d45ec91a6b update 2015-03-03 22:30:20 -04:00
Joey Hess
550a2fcac2 Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-03 22:04:56 -04:00
Joey Hess
b52e98b79a update 2015-03-03 22:04:34 -04:00
Joey Hess
b380701776 thundering herd 2015-03-03 22:01:08 -04:00
Joey Hess
d5c8c56bce update 2015-03-03 21:57:25 -04:00
Joey Hess
8beeb1b4f1 item splitting 2015-03-03 21:49:41 -04:00
Joey Hess
979eace260 update 2015-03-03 21:46:49 -04:00
rasmus
880f5a839f 2015-03-04 00:32:13 +00:00
Joey Hess
936349aa81 clarify 2015-03-03 19:20:36 -04:00
Joey Hess
8330bfd9d9 drill 2015-03-03 19:08:13 -04:00
Joey Hess
dfd93de6cf link 2015-03-03 19:05:33 -04:00
Joey Hess
533ac6d989 link 2015-03-03 19:04:32 -04:00
Joey Hess
547c417617 clarify 2015-03-03 19:04:17 -04:00
Joey Hess
92663489a5 update 2015-03-03 19:03:32 -04:00
Joey Hess
f55a711a19 devblog 2015-03-03 18:59:49 -04:00
Joey Hess
e7e434ce75 comment 2015-03-03 18:48:16 -04:00
Joey Hess
8e7af1407a Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-03 18:41:35 -04:00
Joey Hess
1f6a2d0ae0 add 2015-03-03 18:41:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmN1fkq65FL5gtBB6qFmEKWiyl20OutvDI
336ca61495 Added a comment: window manager on 1st machine 2015-03-03 21:30:53 +00:00
markusk
4d0a7fa0cb Added a comment 2015-03-03 21:04:55 +00:00
Rasmus
c1f7e1b7d7 2015-03-03 12:48:19 +00:00
92.129.194.19
678ded502d poll vote (Amazon Glacier (done)) 2015-03-03 12:16:32 +00:00
92.129.194.19
5a771631cb poll vote (Amazon S3 (done)) 2015-03-03 12:16:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawksOCeakibYmGDt3wLLo4nkY0FkB72I2Uo
f4e8351ac7 2015-03-03 01:09:20 +00:00
Joey Hess
8efc7c0e95 Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-02 16:45:14 -04:00
Joey Hess
0e0703e7f1 devblog 2015-03-02 16:44:58 -04:00
Joey Hess
e322826e33 Submodules are now supported by git-annex!
Seems to work, but still experimental until it's been tested more.

When repositories are on filesystems not supporting symlinks, the .git dir
symlink trick cannot be used. Since we're going to be in direct mode
anyway, the .git dir symlink is not strictly needed.

However, I have not fixed the code that creates new annex symlinks to
handle this case -- the committed symlinks will be wrong.

git annex sync happens to currently fail in a submodule using direct mode,
because there's no HEAD ref. That also needs to be dealt with to get
this fully working in crippled filesystems.

Leaving http://github.com/datalad/datalad/issues/44 open until these issues
are dealt with.
2015-03-02 16:43:44 -04:00
Joey Hess
5169999b07 add -q to git symbolic-ref call
Avoids a warning message from git when HEAD doesn't exist. Which it won't
when eg, git-annex is used in a submodule just cloned with
git clone --recursive. In this case, a specific ref is checked out and
there's no HEAD yet.

The code already returned Nothing in this case, so no behavior change other
than not showing the warning. And git-annex operates fine in this
situation.
2015-03-02 15:56:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlc-3pdibcizrdz4WmZooECL0k6AvM1cWc
46a943d37e 2015-03-02 17:43:15 +00:00
195.187.238.80
b3fef24043 poll vote (OpenStack SWIFT) 2015-03-02 17:28:26 +00:00
195.187.238.80
0c3c62df75 poll vote (OpenStack SWIFT) 2015-03-02 17:28:17 +00:00
Joey Hess
b4fbeca215 applied patch 2015-03-02 13:12:24 -04:00
Eric OConnor
a7febaf081 Allow this repository to be checked out in filesystems with 255 char filename limits 2015-03-02 13:09:24 -04:00
Joey Hess
21cf27ccbe Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-02 12:20:36 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnG-DZQa3d3Jn7K2q36TlbmZ8v2YuV-23M
8066fa0c8c removed 2015-03-02 10:57:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnG-DZQa3d3Jn7K2q36TlbmZ8v2YuV-23M
adf58b9636 2015-03-02 10:03:57 +00:00
Eric
8771726dbb 2015-03-02 05:21:12 +00:00