Commit graph

26419 commits

Author SHA1 Message Date
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
c92917d24a Added a comment 2015-12-08 09:44:49 +00:00
cantora@432fae6be728a32ac472387df86a8922f059d4a6
c71a6e3a0d Added a comment: How to view configuration of special remotes? 2015-12-08 08:29:12 +00:00
Joey Hess
50398c69a1
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-07 17:25:20 -04:00
Joey Hess
d9ec9a56d4
devblog 2015-12-07 17:24:44 -04:00
Joey Hess
9923b8dc77
long walk led to long list of things to do 2015-12-07 17:24:16 -04:00
Joey Hess
712c9fc590
require "annex/objects/" before key in pointer files
This removes ambiguity, because while someone might have "WORM--foo" in a
file that's not intended to be a git-annex pointer file,
"annex/objects/WORM--foo" is less likely.

Also, 664cc987e8 had a caveat about symlink
targets being parsed as pointer files, and now the same parser is used for
both.

I did not include any hash directories before the key in the pointer file,
as they're not needed. However, if they were included, the parser would
still work ok.
2015-12-07 15:45:08 -04:00
Joey Hess
664cc987e8
support pointer files
Backend.lookupFile is changed to always fall back to catKey when
operating on a file that's not a symlink.

catKey is changed to understand pointer files, as well as annex symlinks.

Before, catKey needed a file mode witness, to be sure it was looking at a
symlink. That was complicated stuff. Now, it doesn't actually care if a
file in git is a symlink or not; in either case asking git for the content
of the file will get the pointer to the key.

This does mean that git-annex will treat a link
foo -> WORM--bar as a git-annex file, and also treats
a regular file containing annex/objects/WORM--bar as a git-annex file.

Calling catKey could make git-annex commands need to do more work than
before. This would especially be the case if a repo contained many regular
files, and only a few annexed files, as now git-annex will need to ask
git about the contents of the regular files.
2015-12-07 15:35:36 -04:00
Joey Hess
2cbcb4f1a8
update associated files database on smudge and clean 2015-12-07 14:41:22 -04:00
Joey Hess
a6e5ee0d0e
associated files database 2015-12-07 14:35:37 -04:00
Joey Hess
63c466449f
wording 2015-12-07 12:30:10 -04:00
Joey Hess
62a2fba1cd
Merge branch 'master' into smudge 2015-12-07 12:29:34 -04:00
sts
bf02216690 Added a comment 2015-12-07 08:12:26 +00:00
Joey Hess
bd6f694687
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-06 16:56:16 -04:00
Joey Hess
2936153fc4
fix temp filename
Was not putting it inside the temp dir, but next to it!

This was just wrong, and it led to a longer filename that desired being
used, leading to some bug reports.
2015-12-06 16:54:01 -04:00
Joey Hess
6e71094e7d
avoid too long temp dir template
The filename might be at or close to the filename length limit, so using it
as the template for the temp dir would then fail.
2015-12-06 16:42:40 -04:00
Joey Hess
969d54f914
cleanup 2015-12-06 16:36:35 -04:00
Joey Hess
4591569607
avoid looping trying to make temp dir when the name is too long
Only loop when directory creation fails due to the directory existing
already.
2015-12-06 16:29:36 -04:00
torpidus
9d46da4a29 Added a comment 2015-12-06 20:29:26 +00:00
Joey Hess
a0fcb8ec93
generalize catchHardwareFault to catchIOErrorType 2015-12-06 16:26:38 -04:00
torpidus
99fa2b5716 2015-12-06 18:51:12 +00:00
samuel.hym+bugs@a85e9c44dc6369ad6b12e8e6a3896ad34f7df4a3
912246f4ae Fix broken link to other bug 2015-12-06 10:02:35 +00:00
samuel.hym+bugs@a85e9c44dc6369ad6b12e8e6a3896ad34f7df4a3
6e85743a86 Report bug due to broken createSymbolicLink 2015-12-06 10:01:00 +00:00
spwhitton
d1cf30890e m 2015-12-05 19:52:38 +00:00
spwhitton
59aa9d313b Copy hints for Emacs users from propellor coding style page 2015-12-05 19:52:17 +00:00
a@b34f238966e58f7c2ea550cc4cab3005c0e33150
50cd06c332 2015-12-05 18:17:45 +00:00
Joey Hess
1b597cbee6
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-04 18:05:18 -04:00
Joey Hess
7579d50959
devblog 2015-12-04 17:57:34 -04:00
Joey Hess
2fe21d47c5
init: Configure .git/info/attributes to use git-annex as a smudge filter.
Note that this changes the default behavior of git add in a newly
initialized repository; it will add files to the annex.

Don't like that this could break workflows, but it's necessary in order for
any pointer files in the repo to be handled by git-annex.
2015-12-04 17:57:15 -04:00
Joey Hess
fb6ebdaae7
refactor 2015-12-04 17:18:26 -04:00
Joey Hess
e8ca01cbc0
comments 2015-12-04 16:46:00 -04:00
Joey Hess
e7f75b079d
don't let git-annex direct be run in a v6 repo 2015-12-04 16:33:09 -04:00
Joey Hess
ccc49861ca
add v6; keep v5 working for now and manual upgrade
Since all places where a repo is used in direct mode need to have git-annex
upgraded before the repo can safely be converted to v6, the upgrade needs
to be manual for now.

I suppose that at some point I'll want to drop all the direct mode support
code. At that point, will stop supporting v5, and will need to auto-upgrade
any remaining v5 repos. If possible, I'd like to carry the direct mode
support for say, a year or so, to give people plenty of time to upgrade and
avoid disruption.
2015-12-04 16:14:48 -04:00
Joey Hess
34ead644d9
auto-configure filter.annex.smudge and clean on init 2015-12-04 16:14:11 -04:00
Joey Hess
723e4e31a1
merge clean into smudge command
The git filter config can be used to map the single git-annex command to
the 2 actions, and this avoids "git annex clean" being used for this thing,
it might have a better use for that name later.
2015-12-04 15:32:47 -04:00
Joey Hess
983c1894eb
avoid unnecessary reading of git-annex branch data when matching on annex.largefiles
This makes git annex clean not look at the git-annex branch at all,
and so speeds it up by 50% or more.
2015-12-04 15:06:41 -04:00
Joey Hess
99b2a524a0
clean filter should update location log when adding new content to annex 2015-12-04 14:20:32 -04:00
Joey Hess
ad06f8ceed
avoid commit and messages for smudge filter 2015-12-04 14:20:22 -04:00
Joey Hess
fdfda7b7bb
annex.largefiles support for clean filter 2015-12-04 14:10:18 -04:00
Joey Hess
d349693269
smudge filter working 2015-12-04 14:03:10 -04:00
Joey Hess
2c6454a2e2
basic clean filter working 2015-12-04 13:39:14 -04:00
mellon85@e4812de7355433a8e232ce8ca4c231092d9afebb
f966984cd3 2015-12-04 17:15:34 +00:00
mellon85@e4812de7355433a8e232ce8ca4c231092d9afebb
05bd8ae9bd 2015-12-04 17:11:45 +00:00
Joey Hess
20ca89dfa3
skeleton smudge/clean filters 2015-12-04 13:03:39 -04:00
sts
b27b851436 2015-12-04 12:57:59 +00:00
OlivierBerger
bddeb020e9 Added a comment: Again, difficult to tell 2015-12-04 12:24:07 +00:00
OlivierBerger
ce1757e7e4 Added a comment: Difficult to tell 2015-12-04 10:21:26 +00:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
a3fb7a38ce 2015-12-04 10:18:08 +00:00
encryptio@2557a3f5b4ef0cddf8f011d7dbb3e76d46ed9c79
9ca5fe58e7 Added a comment: git-annex-remote-b2 2015-12-04 03:19:29 +00:00
Joey Hess
37a5e2d419
dropunused: Make more robust when trying to drop an object that has already been dropped.
Before it crashed trying to lock the not-present content and prevented
dropping anything else. Instead, succeed.
2015-12-03 15:58:00 -04:00
rpglover64@acd6753c831cc132736943bec350391fcb2ff77d
5e3e6b9ff9 Added a comment: Thanks! 2015-12-02 20:15:57 +00:00