Joey Hess
ce3fb0b2e5
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
2019-12-20 11:00:08 -04:00
Joey Hess
f07cb76640
improve docs of gitaddtoannex
2019-12-20 10:35:44 -04:00
Joey Hess
7d50e98646
thought
2019-12-19 16:44:08 -04:00
Joey Hess
e8651fbd09
comment
2019-12-19 13:39:08 -04:00
Joey Hess
37db1fa5a0
Merge branch 'bs'
2019-12-19 13:12:39 -04:00
Joey Hess
96a8b2d095
typo
2019-12-19 12:52:56 -04:00
Joey Hess
2e34516e6a
formatting
2019-12-19 12:52:12 -04:00
Joey Hess
09272507c1
comment
2019-12-19 12:50:34 -04:00
Joey Hess
67ae6ddecb
comment
2019-12-19 12:06:59 -04:00
Joey Hess
8bce94b8e2
Merge branch 'master' of ssh://git-annex.branchable.com
2019-12-18 17:11:48 -04:00
Joey Hess
7d85f9176f
devblog
2019-12-18 17:11:37 -04:00
Joey Hess
686791c4ed
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.
2019-12-18 17:10:28 -04:00
Joey Hess
9e9def2dc0
todo
2019-12-18 16:11:18 -04:00
Joey Hess
16125694eb
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.
2019-12-18 15:57:40 -04:00
Joey Hess
7b7e0d8a86
wrap up
2019-12-18 15:19:19 -04:00
Joey Hess
7d9dff5b05
Merge branch 'master' into bs
...
and update changelog
2019-12-18 15:13:30 -04:00
Joey Hess
007397a2c8
added dep for custom-setup
...
stack build failed w/o this though cabal old-build succeeded.
2019-12-18 14:46:43 -04:00
Ilya_Shlyakhter
f2052f67fb
Added a comment: named pipes as destination files
2019-12-18 18:41:57 +00:00
Joey Hess
9b29f0f5a3
more build fix
2019-12-18 14:37:59 -04:00
Joey Hess
7d82b6911b
build fixes
2019-12-18 14:36:19 -04:00
Joey Hess
a94d804f63
get any old rpms
...
to prevent makerepo from falling over on broken symlinks
2019-12-18 14:33:29 -04:00
Joey Hess
6b2e471330
only delete old rpms for arches that have a new rpm
2019-12-18 14:32:13 -04:00
Joey Hess
73c9a6e7d7
fixed
2019-12-18 14:29:23 -04:00
Joey Hess
c9a3336235
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.
2019-12-18 14:27:47 -04:00
Joey Hess
c4e34cf55d
fix build
2019-12-18 14:22:55 -04:00
Joey Hess
e7ff0607f8
add news item for git-annex 7.20191218
2019-12-18 14:17:15 -04:00
Joey Hess
7fd5376334
inprogress: Support --key
2019-12-18 14:14:16 -04:00
Joey Hess
1bc7055a21
add back changelog entry
2019-12-18 13:53:10 -04:00
Joey Hess
92c566f1b2
comment
2019-12-18 13:52:43 -04:00
Joey Hess
83a3b1bec4
Merge branch 'master' of ssh://git-annex.branchable.com
2019-12-18 13:48:48 -04:00
Joey Hess
c745fa2852
Merge branch 'master' into bs
2019-12-18 13:47:27 -04:00
Joey Hess
75c40279c1
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.
2019-12-18 13:42:43 -04:00
Joey Hess
322c542b5c
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.
2019-12-18 13:32:56 -04:00
Joey Hess
0246ecbe94
update
2019-12-18 12:15:06 -04:00
Joey Hess
3d38ec9585
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.
2019-12-18 11:29:34 -04:00
mike@4e7a118bd37129091199ae0fb28184999c5f4725
448a69e6b8
Added a comment: repodata is outdated
2019-12-18 10:06:08 +00:00
spwhitton
53fdd34f79
add todo
2019-12-18 05:17:42 +00:00
https://christian.amsuess.com/chrysn
418890c5cb
ask for --key on git-annex-inprogress
2019-12-17 09:21:52 +00:00
https://christian.amsuess.com/chrysn
1653957166
Added a comment: Would be useful
2019-12-17 09:08:09 +00:00
kyle
d0e52837bc
2019-12-13 19:08:09 +00:00
Joey Hess
3a14bc8220
bug report
2019-12-12 22:06:42 -05:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
b962471c21
Added a comment
2019-12-12 21:11:58 +00:00
Joey Hess
8ed171c69f
more info for debugging
2019-12-11 17:12:13 -04:00
Joey Hess
7a41f94e84
add test case for bug
2019-12-11 17:09:50 -04:00
Joey Hess
2e4de42d55
bug in this branch
2019-12-11 17:08:26 -04:00
Joey Hess
cee0d738fc
match also / path separator on windows
2019-12-11 17:08:08 -04:00
Joey Hess
4c0550222a
Merge branch 'master' of ssh://git-annex.branchable.com
2019-12-11 15:28:12 -04:00
Joey Hess
458d04e729
devblog
2019-12-11 15:27:38 -04:00
Joey Hess
c19211774f
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.
2019-12-11 15:25:07 -04:00
Ilya_Shlyakhter
8b07ab553f
Added a comment: annex-verify
2019-12-11 18:13:48 +00:00
