Joey Hess [Tue, 31 Dec 2019 22:09:17 +0000 (18:09 -0400)]
force move
Move will fail if the file is already on website and was re-downloaded
to generate rpms with, so force makes sure it moves.
Joey Hess [Tue, 31 Dec 2019 22:01:53 +0000 (18:01 -0400)]
update for RawFilePath changes
Ilya_Shlyakhter [Tue, 31 Dec 2019 01:38:03 +0000 (01:38 +0000)]
Added a comment: named pipes and external remotes
Joey Hess [Mon, 30 Dec 2019 18:50:15 +0000 (14:50 -0400)]
add news item for git-annex 7.
20191230
Joey Hess [Mon, 30 Dec 2019 18:49:31 +0000 (14:49 -0400)]
releasing package git-annex version 7.
20191230
Joey Hess [Mon, 30 Dec 2019 18:36:04 +0000 (14:36 -0400)]
comment
Joey Hess [Mon, 30 Dec 2019 17:54:46 +0000 (13:54 -0400)]
fix quickcheck failure
prop_encode_decode_roundtrip failed on "\175" in C locale.
This may be a new problem after the switch to RawFilePath, but it
already had filtering for high chars, so changed to only test ascii
chars.
Joey Hess [Mon, 30 Dec 2019 17:06:43 +0000 (13:06 -0400)]
if hdiutil create never succeeds, fail the build
Build was succeeding despite the dmg never being created.
Joey Hess [Mon, 30 Dec 2019 16:27:45 +0000 (12:27 -0400)]
different way to avoid NUL in Arbitrary AssociatedFile
Test case has been intermittently failing, with an AssociatedFile that
somehow contains a NUL despite it being filtered out. My guess is
something to do with locales. This new approach should prevent any NUL
at all, although it does weigh the distribution a bit more toward
Nothing.
Joey Hess [Mon, 30 Dec 2019 15:43:15 +0000 (11:43 -0400)]
adjust filepath-bytestring deps
cabal needs to support the old one for debian currently, but stack can
require the newer one
sirio@84e81889437b3f6208201a26e428197c6045c337 [Sun, 29 Dec 2019 22:10:26 +0000 (22:10 +0000)]
Added a comment: Duplicate 'gcrypt-id' may be the issue?
kyle [Sat, 28 Dec 2019 21:06:46 +0000 (21:06 +0000)]
Added a comment
Joey Hess [Fri, 27 Dec 2019 23:29:09 +0000 (19:29 -0400)]
temporary revert "use conversion functions from filepath-bytestring"
This reverts commit
75c40279c1600da157c2ba0981989da9eaf1c502.
Debian unstable is one version too old, so this can be de-reverted in a
bit.
Joey Hess [Fri, 27 Dec 2019 19:20:46 +0000 (15:20 -0400)]
add filepath-bytestring
Joey Hess [Fri, 27 Dec 2019 19:10:11 +0000 (15:10 -0400)]
add libghc-filepath-bytestring-dev build dep
Debian impressively packaged my new library before anyone even asked
them to, and before git-annex needed it.
Joey Hess [Fri, 27 Dec 2019 19:08:11 +0000 (15:08 -0400)]
close
Joey Hess [Fri, 27 Dec 2019 18:58:10 +0000 (14:58 -0400)]
fix a case where file tracked by git unexpectedly becomes annex pointer file
smudge: When annex.largefiles=anything, files that were already stored in
git, and have not been modified could sometimes be converted to being
stored in the annex. Changes in 7.
20191024 made this more of a problem.
This case is now detected and prevented.
Joey Hess [Fri, 27 Dec 2019 18:52:19 +0000 (14:52 -0400)]
comment
Joey Hess [Fri, 27 Dec 2019 17:17:53 +0000 (13:17 -0400)]
update on variant
Joey Hess [Fri, 27 Dec 2019 16:47:32 +0000 (12:47 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 27 Dec 2019 07:04:23 +0000 (03:04 -0400)]
followup
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e [Fri, 27 Dec 2019 00:47:46 +0000 (00:47 +0000)]
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e [Fri, 27 Dec 2019 00:47:03 +0000 (00:47 +0000)]
Joey Hess [Thu, 26 Dec 2019 20:39:27 +0000 (16:39 -0400)]
implelented in v8
Joey Hess [Thu, 26 Dec 2019 19:07:50 +0000 (15:07 -0400)]
didn't mean to commit this incomplete workaround
though I suppose it's nice to have it in the history..
Joey Hess [Thu, 26 Dec 2019 19:05:36 +0000 (15:05 -0400)]
analysis
yarikoptic [Tue, 24 Dec 2019 14:10:49 +0000 (14:10 +0000)]
added projects/datalad
https://christian.amsuess.com/chrysn [Sun, 22 Dec 2019 10:50:33 +0000 (10:50 +0000)]
Added a comment: Workaround
https://christian.amsuess.com/chrysn [Sun, 22 Dec 2019 10:02:23 +0000 (10:02 +0000)]
link from bug report to submodules to make the affecting bug visible there
spwhitton [Sat, 21 Dec 2019 23:03:46 +0000 (23:03 +0000)]
Added a comment
spwhitton [Sat, 21 Dec 2019 22:20:31 +0000 (22:20 +0000)]
add workaround
spwhitton [Sat, 21 Dec 2019 22:11:38 +0000 (22:11 +0000)]
report bug
https://christian.amsuess.com/chrysn [Sat, 21 Dec 2019 20:40:44 +0000 (20:40 +0000)]
report difficulty encountered when using submodules
Added a comment: windows installer has not been updated to version 7.
20191218
spwhitton [Sat, 21 Dec 2019 04:20:40 +0000 (04:20 +0000)]
fix copy/paste mistake
spwhitton [Sat, 21 Dec 2019 04:19:56 +0000 (04:19 +0000)]
file bug
Joey Hess [Fri, 20 Dec 2019 22:01:29 +0000 (18:01 -0400)]
Improve file ordering behavior when one parameter is "." and other parameters are other directories
eg, `git-annex get . ..` used to order the files strangly, because it
did not realize that when git ls-files output eg "foo", that should be
grouped with the first set of files and not the second set.
Fixed by making dirContains "." "./foo" = True
which makes sense, because dirContains ".." "../foo" = True
Joey Hess [Fri, 20 Dec 2019 20:11:21 +0000 (16:11 -0400)]
comment
Joey Hess [Fri, 20 Dec 2019 19:58:15 +0000 (15:58 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 20 Dec 2019 19:01:34 +0000 (15:01 -0400)]
annex.addunlocked expressions
* annex.addunlocked can be set to an expression with the same format used by
annex.largefiles, in case you want to default to unlocking some files but
not others.
* annex.addunlocked can be configured by git-annex config.
Added a git-annex-matching-expression man page, broken out from
tips/largefiles.
A tricky consequence of this is that git-annex add --relaxed
honors annex.addunlocked, but an expression might want to know the size
or content of an url, which it's not going to download. I decided it was
better not to fail, and just dummy up some plausible data in that case.
Performance impact should be negligible. The global config is already
loaded for annex.largefiles. The expression only has to be parsed once,
and in the simple true/false case, it should not do any additional work
matching it.
yarikoptic [Fri, 20 Dec 2019 19:54:04 +0000 (19:54 +0000)]
Added a comment: oh hoh, there is mimeencoding now
yarikoptic [Fri, 20 Dec 2019 19:50:24 +0000 (19:50 +0000)]
elaborated on my previous (marked "done") bug report about mimetypes
Joey Hess [Fri, 20 Dec 2019 17:19:36 +0000 (13:19 -0400)]
improve docs of addunlocked re adjusted branches
Joey Hess [Fri, 20 Dec 2019 17:17:28 +0000 (13:17 -0400)]
git-annex-config --set/--unset: No longer change the local git config setting
e53070c1f quietly made it set the local git config too, but that was never
documented anywhere, and it had surprising results. If I set
annex.largefiles globally in a repo, I would expect to be able to change it
in another repo, and the original repo would get the change and use it,
rather than being stuck on the old value set there.
And, if I have a local annex.largefiles and set a different global default,
I'd be surprised to have my local setting overwritten.
annex.securehashesonly does need to be set locally, since it's a security
feature and the global is only a default until it gets set locally. So
special cased.
Joey Hess [Fri, 20 Dec 2019 17:07:10 +0000 (13:07 -0400)]
when annex.largefiles parse fails, say where the config came from
Joey Hess [Fri, 20 Dec 2019 17:06:53 +0000 (13:06 -0400)]
fix syntax of largefiles example
has always been wrong syntax!
Joey Hess [Fri, 20 Dec 2019 16:12:31 +0000 (12:12 -0400)]
git-annex config annex.largefiles
annex.largefiles can be configured by git-annex config, to more easily set
a default that will also be used by clones, without needing to shoehorn the
expression into the gitattributes file. The git config and gitattributes
override that.
Whenever something is added to git-annex config, we have to consider what
happens if a user puts a purposfully bad value in there. Or, if a new
git-annex adds some new value that an old git-annex can't parse.
In this case, a global annex.largefiles that can't be parsed currently
makes an error be thrown. That might not be ideal, but the gitattribute
behaves the same, and is almost equally repo-global.
Performance notes:
git-annex add and addurl construct a matcher once
and uses it for every file, so the added time penalty for reading the global
config log is minor. If the gitattributes annex.largefiles were deprecated,
git-annex add would get around 2% faster (excluding hashing), because
looking that up for each file is not fast. So this new way of setting
it is progress toward speeding up add.
git-annex smudge does need to load the log every time. As well as checking
the git attribute. Not ideal. Setting annex.gitaddtoannex=false avoids
both overheads.
Joey Hess [Fri, 20 Dec 2019 14:55:23 +0000 (10:55 -0400)]
fixed an oversight that had always prevented annex.resolvemerge from being honored, when it was configured by git-annex config
forgot to add it to the merge function
Joey Hess [Fri, 20 Dec 2019 14:35:44 +0000 (10:35 -0400)]
improve docs of gitaddtoannex
Joey Hess [Thu, 19 Dec 2019 20:44:08 +0000 (16:44 -0400)]
thought
Joey Hess [Thu, 19 Dec 2019 17:39:08 +0000 (13:39 -0400)]
comment
Joey Hess [Thu, 19 Dec 2019 17:12:39 +0000 (13:12 -0400)]
Merge branch 'bs'
Joey Hess [Thu, 19 Dec 2019 16:52:56 +0000 (12:52 -0400)]
typo
Joey Hess [Thu, 19 Dec 2019 16:52:12 +0000 (12:52 -0400)]
formatting
Joey Hess [Thu, 19 Dec 2019 16:50:34 +0000 (12:50 -0400)]
comment
Joey Hess [Thu, 19 Dec 2019 16:06:59 +0000 (12:06 -0400)]
comment
Joey Hess [Wed, 18 Dec 2019 21:11:48 +0000 (17:11 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 18 Dec 2019 21:11:37 +0000 (17:11 -0400)]
devblog
Joey Hess [Wed, 18 Dec 2019 20:45:03 +0000 (16:45 -0400)]
more RawFilePath
Remove dup definitions and just use the RawFilePath one. </> etc are
enough faster that it's probably faster than building a String directly,
although I have not benchmarked.
Joey Hess [Wed, 18 Dec 2019 20:11:14 +0000 (16:11 -0400)]
todo
Joey Hess [Wed, 18 Dec 2019 19:57:40 +0000 (15:57 -0400)]
keep filename ByteString
Minor optimisation, since it still has to be copied from lazy to strict,
but it will add up when doing a big merge.
Joey Hess [Wed, 18 Dec 2019 19:19:19 +0000 (15:19 -0400)]
wrap up
Joey Hess [Wed, 18 Dec 2019 19:13:30 +0000 (15:13 -0400)]
Merge branch 'master' into bs
and update changelog
Joey Hess [Wed, 18 Dec 2019 18:46:05 +0000 (14:46 -0400)]
added dep for custom-setup
stack build failed w/o this though cabal old-build succeeded.
Ilya_Shlyakhter [Wed, 18 Dec 2019 18:41:57 +0000 (18:41 +0000)]
Added a comment: named pipes as destination files
Joey Hess [Wed, 18 Dec 2019 18:37:59 +0000 (14:37 -0400)]
more build fix
Joey Hess [Wed, 18 Dec 2019 18:36:19 +0000 (14:36 -0400)]
build fixes
Joey Hess [Wed, 18 Dec 2019 18:33:29 +0000 (14:33 -0400)]
get any old rpms
to prevent makerepo from falling over on broken symlinks
Joey Hess [Wed, 18 Dec 2019 18:32:13 +0000 (14:32 -0400)]
only delete old rpms for arches that have a new rpm
Joey Hess [Wed, 18 Dec 2019 18:29:23 +0000 (14:29 -0400)]
fixed
Joey Hess [Wed, 18 Dec 2019 18:27:47 +0000 (14:27 -0400)]
remove old rpms
Don't want a mass of old versions of git-annex in rpm form cluttering up
my server.
Also, makerepo falls over when confronted with a dangling symlink.
Joey Hess [Wed, 18 Dec 2019 18:22:55 +0000 (14:22 -0400)]
fix build
Joey Hess [Wed, 18 Dec 2019 18:17:15 +0000 (14:17 -0400)]
add news item for git-annex 7.
20191218
Joey Hess [Wed, 18 Dec 2019 18:04:14 +0000 (14:04 -0400)]
inprogress: Support --key
Joey Hess [Wed, 18 Dec 2019 17:53:10 +0000 (13:53 -0400)]
add back changelog entry
Joey Hess [Wed, 18 Dec 2019 17:52:43 +0000 (13:52 -0400)]
comment
Joey Hess [Wed, 18 Dec 2019 17:48:48 +0000 (13:48 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 18 Dec 2019 17:47:27 +0000 (13:47 -0400)]
Merge branch 'master' into bs
Joey Hess [Wed, 18 Dec 2019 17:33:18 +0000 (13:33 -0400)]
use conversion functions from filepath-bytestring
Behavior should be the same, but I'd hope to eventually get rid of
most of Utility.FileSystemEncoding and this is a first step.
Joey Hess [Wed, 18 Dec 2019 17:26:06 +0000 (13:26 -0400)]
fix ByteString conversion on windows
the encode' and decode' functions on Windows should not apply the
filesystem encoding, which does not work there. Instead, convert to and
from UTF-8.
Also, avoid exporting encodeW8 and decodeW8. Both use the filesystem
encoding, so won't work as expected on windows.
Joey Hess [Wed, 18 Dec 2019 16:12:51 +0000 (12:12 -0400)]
update
Joey Hess [Wed, 18 Dec 2019 15:29:34 +0000 (11:29 -0400)]
fix fileJournal
My ByteString rewrite oversimplified it, resulting in any _ in a journal
file turning into a / in the git-annex branch, which was often the wrong
filename, or sometimes (//) an invalid filename that git
refused to add.
mike@4e7a118bd37129091199ae0fb28184999c5f4725 [Wed, 18 Dec 2019 10:06:08 +0000 (10:06 +0000)]
Added a comment: repodata is outdated
spwhitton [Wed, 18 Dec 2019 05:17:42 +0000 (05:17 +0000)]
add todo
https://christian.amsuess.com/chrysn [Tue, 17 Dec 2019 09:21:52 +0000 (09:21 +0000)]
ask for --key on git-annex-inprogress
https://christian.amsuess.com/chrysn [Tue, 17 Dec 2019 09:08:09 +0000 (09:08 +0000)]
Added a comment: Would be useful
kyle [Fri, 13 Dec 2019 19:08:09 +0000 (19:08 +0000)]
Joey Hess [Fri, 13 Dec 2019 03:06:42 +0000 (22:06 -0500)]
bug report
lykos@d125a37d89b1cfac20829f12911656c40cb70018 [Thu, 12 Dec 2019 21:11:58 +0000 (21:11 +0000)]
Added a comment
Joey Hess [Wed, 11 Dec 2019 21:12:13 +0000 (17:12 -0400)]
more info for debugging
Joey Hess [Wed, 11 Dec 2019 21:09:50 +0000 (17:09 -0400)]
add test case for bug
Joey Hess [Wed, 11 Dec 2019 21:08:26 +0000 (17:08 -0400)]
bug in this branch
Joey Hess [Wed, 11 Dec 2019 21:08:08 +0000 (17:08 -0400)]
match also / path separator on windows
Joey Hess [Wed, 11 Dec 2019 19:28:12 +0000 (15:28 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 11 Dec 2019 19:27:38 +0000 (15:27 -0400)]
devblog
Joey Hess [Wed, 11 Dec 2019 18:12:22 +0000 (14:12 -0400)]
use filepath-bytestring for annex object manipulations
git-annex find is now RawFilePath end to end, no string conversions.
So is git-annex get when it does not need to get anything.
So this is a major milestone on optimisation.
Benchmarks indicate around 30% speedup in both commands.
Probably many other performance improvements. All or nearly all places
where a file is statted use RawFilePath now.
Ilya_Shlyakhter [Wed, 11 Dec 2019 18:13:48 +0000 (18:13 +0000)]
Added a comment: annex-verify