Joey Hess
08bb3b1b1d
quvi may output utf-8 encoded data when the conifigured locale doesn't support that; avoid crashing on such invalid encoding.
2015-11-09 12:19:23 -04:00
Joey Hess
af863b5b1b
close
2015-11-09 11:56:56 -04:00
Joey Hess
140d74196c
Merge branch 'master' of ssh://git-annex.branchable.com
2015-11-09 11:34:30 -04:00
OlivierBerger
eb0b79c991
Added a comment: More details
2015-11-09 14:52:24 +00:00
Joey Hess
6cfcdc99f1
remove badly named bug report, which was later posted under good name
2015-11-08 12:18:00 -04:00
https://id.koumbit.net/anarcat
b85e5749c8
Added a comment: could / will this help with global status?
2015-11-07 16:43:42 +00:00
http://www.joachim-breitner.de/
3cd7d21aae
Added a comment
2015-11-07 09:02:08 +00:00
Joey Hess
12a791c7a4
devblog
2015-11-06 16:03:02 -04:00
Joey Hess
53db9d0b5c
work around git check-ignore --batch bad exit status bug, and bring back import -J
2015-11-06 15:39:51 -04:00
Joey Hess
7938b87864
add: Fix error recovery rollback to not move the injested file content out of the annex back to the file, because other files may point to that same content. Instead, copy the injected file content out to recover.
...
That was not a data loss, but it came close!
2015-11-06 15:28:20 -04:00
Joey Hess
d435a717e6
enable ConcurrentOutput flag for stack
2015-11-06 15:26:12 -04:00
Joey Hess
51e60259e1
fix replaceFile makeAnnexLink race
...
replaceFile created a temp file, which was guaranteed to not overlap with
another temp file. However, makeAnnexLink then deleted that file, in
preparation for making the symlink in its place. This caused a race, since
some other replaceFile could create a temp file, using the same name!
I was able to reproduce the race easily running git-annex add -J10 in a
directory with 100 files (all with different contents). Some files would
get ingested into the annex, but their annex links would fail to be added.
There could be other situations where this same problem could occur.
Perhaps when the assistant is adding a file, if the user manually also ran
git-annex add. Perhaps in cases not involving adding a file.
The new replaceFile makes a temprary directory, which is guaranteed to be
unique, and doesn't make a temp file in there. makeAnnexLink can thus
create the symlink without problem and the race is avoided.
Audited all calls to replaceFile to make sure that the old behavior of
providing an empty temp file was not relied on.
The general problem of asking for a temp file and deleting it as part of
the process of using it could reach beyond replaceFile. Did some quick
audits and didn't find other cases of it. Probably only symlink creation
stuff would tend to make that mistake, mostly.
2015-11-06 15:08:19 -04:00
Joey Hess
78b63888a6
close
2015-11-06 13:52:47 -04:00
Joey Hess
04c113a3f9
Merge branch 'master' of ssh://git-annex.branchable.com
2015-11-06 13:45:27 -04:00
Joey Hess
416c7656a1
Concurrent progress bars are now displayed when using -J with a command that moves file contents around.
2015-11-06 13:44:57 -04:00
Joey Hess
8ea594f565
missed adding allowConcurrentOutput here
2015-11-06 13:41:26 -04:00
aloukian
7f94b74536
Added a comment
2015-11-06 17:33:32 +00:00
reyman64@f52a9d695f5dc1d5b0788fbb9877e9401fae7421
6803f17a1e
Added a comment
2015-11-06 17:07:21 +00:00
Joey Hess
e96d9bbdb4
move dep on http-client to main dep list, since Utility.Url uses it
2015-11-06 12:54:23 -04:00
Joey Hess
013986b492
fix build w/o concurrent-output
2015-11-06 12:52:31 -04:00
Joey Hess
cf8076522c
Merge branch 'master' of ssh://git-annex.branchable.com
2015-11-06 12:48:02 -04:00
reyman64@f52a9d695f5dc1d5b0788fbb9877e9401fae7421
749aa0fdb6
Added a comment: Error with Url.hs
2015-11-06 13:37:41 +00:00
vvghadge@ec0c34f6cadf7a32fc6cf0b2bee34c3ce9c568f2
34491b5748
Added a comment: location of Mapping of file to tahoe uri?
2015-11-06 02:28:04 +00:00
vvghadge@ec0c34f6cadf7a32fc6cf0b2bee34c3ce9c568f2
9c597a9135
removed
2015-11-06 02:27:26 +00:00
vvghadge@ec0c34f6cadf7a32fc6cf0b2bee34c3ce9c568f2
e0832b4c8d
Added a comment: location of Mapping of file to tahoe uri?
2015-11-06 02:27:10 +00:00
vvghadge@ec0c34f6cadf7a32fc6cf0b2bee34c3ce9c568f2
f95c0398ab
removed
2015-11-06 02:26:01 +00:00
vvghadge@ec0c34f6cadf7a32fc6cf0b2bee34c3ce9c568f2
19c6fdc6cb
Added a comment: location of Mapping of file to tahoe uri?
2015-11-06 02:24:39 +00:00
Joey Hess
17b173dec9
don't display console regions untill there is output in them
2015-11-05 20:18:27 -04:00
Joey Hess
5e2ea9c1a5
increase number of capabilities to match -Jn setting
2015-11-05 19:57:41 -04:00
Joey Hess
32fedcf56a
Merge branch 'master' of ssh://git-annex.branchable.com
2015-11-05 18:57:35 -04:00
Joey Hess
758efa9230
devbog
2015-11-05 18:49:16 -04:00
Joey Hess
362ab39aad
import -J fails at the end, disable util it can be fixed
2015-11-05 18:48:46 -04:00
Joey Hess
7dc90f2225
import: Avoid very ugly error messages when the directory files are imported to is not a directort, but perhaps an annexed file.
2015-11-05 18:46:05 -04:00
Joey Hess
5db7d435e7
-J for add/addurl/import
2015-11-05 18:24:15 -04:00
Joey Hess
31472161e4
merge git command queue when joining with concurrent thread
2015-11-05 18:21:48 -04:00
Joey Hess
ab6b1edfee
join back threads before ending concurrent output so display works
...
I didn't really want to put allowConcurrentOutput in CmdLine.Action,
but there were dep loops and that was the best place available.
2015-11-05 17:23:26 -04:00
Joey Hess
2ca52b4a9d
needs concurrent-output 1.6 for bugfixes and windows port
2015-11-05 16:13:10 -04:00
berend.van.berkum@0cc715f45d5a86c134f9192722f7adef9dc63488
34abd76bf7
2015-11-05 18:58:25 +00:00
OlivierBerger
6097d6b06d
2015-11-05 09:30:23 +00:00
gmazzurco89@89ed4f74a057a9c71b2a00000fdb201a88f81bcd
286bce874e
Added a comment
2015-11-05 07:28:02 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
4780318ea9
2015-11-04 23:29:15 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
50ba4f2a95
2015-11-04 23:28:46 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
f73c762bc3
2015-11-04 23:25:21 +00:00
Joey Hess
db745a8616
Merge branch 'master' of ssh://git-annex.branchable.com
2015-11-04 18:37:42 -04:00
Joey Hess
f2f75ccca7
devblog
2015-11-04 18:36:46 -04:00
Joey Hess
c4d45ef83d
drop -Jn
2015-11-04 17:13:20 -04:00
Joey Hess
c6fc0945f3
update
2015-11-04 17:03:32 -04:00
Joey Hess
e620073936
don't display blank regions once done
2015-11-04 16:58:19 -04:00
Joey Hess
340208f86b
remove some debug prints
2015-11-04 16:30:55 -04:00
Joey Hess
3d0f41518d
parallel fsck (yes, these changes are all it takes now!)
2015-11-04 16:28:14 -04:00
