Joey Hess
0c03629173
clean up cruft in assistant fast rename code path
2015-12-22 18:03:47 -04:00
Joey Hess
c4152654d2
combine PendingAddChanges for the same file into one
...
In v6 unlocked mode, this fixes a problem that was making eg,
echo > file cause the assistant to copy the file to the annex object,
instead of hard linking it. That because 2 change events were seen
(one for opening the file and one for closing) and processed together
the file was then locked down twice. Which meant it had mutiple hard links,
and so prevented linkAnnex from hard linking it.
There might be scenarios where multiple events come in, but staggered such
that a file gets locked down repeatedly, and it would still be copied to
the annex object in that case.
2015-12-22 17:52:39 -04:00
Joey Hess
d8a8c77a8f
move cleanOldKey into ingest
2015-12-22 16:55:49 -04:00
Joey Hess
cfaac52b88
populate unlocked files with newly available content when ingesting
...
This can happen when ingesting a new file in either locked or unlocked
mode, when some unlocked files in the repo use the same key, and the
content was not locally available before.
2015-12-22 16:22:28 -04:00
Joey Hess
4f60234690
finish v6 support for assistant
...
Seems to basically work now!
2015-12-22 15:23:27 -04:00
Joey Hess
4392140946
make linkAnnex detect when the file changes as it's being copied/linked in
...
This fixes a race where the modified file ended up in annex/objects, and
the InodeCache stored in the database was for the modified version, so
git-annex didn't know it had gotten modified.
The race could occur when the smudge filter was running; now it gets the
InodeCache before generating the Key, which avoids the race.
2015-12-22 15:20:03 -04:00
Joey Hess
8e9608d7f0
refactoring
...
no behavior changes
2015-12-22 13:42:58 -04:00
Joey Hess
ca2c977704
wip v6 support for assistant
...
Files are not yet added to v6 repos in unlocked mode.
2015-12-21 18:41:15 -04:00
Joey Hess
4cf9efb51a
remove (v6) associated file in unannex
2015-12-21 18:00:48 -04:00
Joey Hess
d82b110da8
Merge branch 'master' into smudge
2015-12-21 17:12:46 -04:00
Joey Hess
d3240f4622
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-21 12:57:20 -04:00
Joey Hess
a8b398c1fa
addurl: Added --batch option.
2015-12-21 12:57:13 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
7505f0970a
Added a comment
2015-12-21 15:46:53 +00:00
Joey Hess
a1927c6adb
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-21 11:34:51 -04:00
cbaines
b032015f57
Added a comment
2015-12-21 13:33:34 +00:00
frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac720
f67862644b
Added a comment
2015-12-21 13:08:49 +00:00
cbaines
6eedcc3a3e
Added a comment
2015-12-21 12:40:52 +00:00
cbaines
8def2688c4
Added a comment
2015-12-21 12:32:55 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
bbfa501f4a
Added a comment
2015-12-21 06:02:21 +00:00
jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565
466a249291
Added a comment: A problem with SmartGit then?
2015-12-21 03:21:59 +00:00
frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac720
29ea9f3782
2015-12-20 21:43:57 +00:00
sts
3bd5cbc131
Added a comment
2015-12-20 19:49:27 +00:00
Joey Hess
b6ac443b60
fix build warnings under ghc 7.10
...
Caused by AMP.. Since I've finally upgraded my dev laptop to 7.10,
I may start missing imports that are not needed with it but are with older
versions..
2015-12-19 17:42:45 -04:00
Joey Hess
4e226d2cd2
update
2015-12-19 14:33:10 -04:00
Joey Hess
02dc62e2d3
reuse comment
2015-12-19 14:29:40 -04:00
Joey Hess
2c014e97dd
comment
2015-12-19 14:27:22 -04:00
Joey Hess
962c5ee0db
comment
2015-12-19 14:19:24 -04:00
Joey Hess
f5b103b455
comment
2015-12-19 14:07:57 -04:00
Joey Hess
7588e2fba7
comment
2015-12-19 13:59:03 -04:00
Joey Hess
9deaf4f1d9
comment
2015-12-19 13:55:28 -04:00
Joey Hess
d215acf6ef
comment
2015-12-19 13:51:26 -04:00
Joey Hess
fa1e9a9ee9
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-19 13:47:01 -04:00
Joey Hess
35827e2705
status: On crippled filesystems, was displaying M for all annexed files that were present. Probably caused by a change to what git status displays in this situation. Fixed by treating files git thinks are modified the same as typechanged files.
2015-12-19 13:36:40 -04:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
df181d5a38
2015-12-19 06:52:08 +00:00
Joey Hess
9d19a60349
add news item for git-annex 5.20151218
2015-12-18 14:48:04 -04:00
Joey Hess
fd13d72109
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-18 14:43:12 -04:00
neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd
5008846f7b
Added a comment
2015-12-18 18:09:54 +00:00
Joey Hess
f1a73de560
prep release
2015-12-18 12:09:55 -04:00
Joey Hess
fbf6c25de5
interaction with shared clones
2015-12-17 18:46:52 -04:00
SamuelTardieu
7b73f343ae
Added a comment
2015-12-17 11:15:55 +00:00
jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565
a604f7cd93
2015-12-17 02:25:02 +00:00
pete.ward@26c41318616c4cf9601d0431557c1df734ccdb77
ffefc488f4
2015-12-16 22:15:17 +00:00
Joey Hess
0914d33b21
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-16 17:05:12 -04:00
Joey Hess
ca9b84754d
devblog
2015-12-16 17:04:48 -04:00
Joey Hess
e55ac3d383
update
2015-12-16 17:04:31 -04:00
Joey Hess
a0498b47de
test suite down to only 4 fails with v6
2015-12-16 16:56:27 -04:00
Joey Hess
e61f3d1752
update todo list
2015-12-16 16:02:21 -04:00
Joey Hess
a858a331c4
fix docs
...
"git -a annex.largefiles=* add" cannot be used.. git does not pass the
config along to the smudge filter, sadly.
2015-12-16 16:00:41 -04:00
Joey Hess
6b717032c5
v6: fix locking modified file when the content is not present
2015-12-16 15:35:42 -04:00
Joey Hess
2d343224dc
fix add of file that was locked but has been replaced by a new, unlocked file (v6)
2015-12-16 14:53:41 -04:00
