Commit graph

30265 commits

Author SHA1 Message Date
Joey Hess
664103b77f
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-26 11:09:13 -04:00
http://schnouki.net/
787b14f1ce 2017-06-23 09:33:23 +00:00
Joey Hess
66ed62454c
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-22 12:28:26 -04:00
olaf
75e97fde46 Added a comment 2017-06-22 04:55:35 +00:00
olaf
d86c61f13e Added a comment 2017-06-22 04:50:13 +00:00
https://launchpad.net/~felixonmars
70abadf906 2017-06-19 19:15:44 +00:00
unqueued
63c60c9897 removed 2017-06-19 01:20:40 +00:00
unqueued
94dae0ff7c Added a comment 2017-06-18 14:45:13 +00:00
Joey Hess
4502d8bc4f
remove reference to some old docker image of mine 2017-06-18 09:35:26 -04:00
Joey Hess
d9237da8aa
update, removing notes about by now quite old ubuntu releases 2017-06-18 09:32:34 -04:00
Joey Hess
c8e5eb0c9a
update for debian release 2017-06-18 09:28:51 -04:00
Joey Hess
da8e84efe9
fix failing quickcheck properties
QuickCheck 2.10 found a counterexample eg "\929184" broke the property.

As far as I can tell, Git.Filename is matching how git handles encoding
of strange high unicode characters in filenames for display. Git does
not display high unicode characters, and instead displays the C-style
escaped form of each byte. This is ambiguous, but since git is not
unicode aware, it doesn't need to roundtrip parse it.

So, making Git.FileName's roundtrip test only chars < 256 seems fine.

Utility.Format.format uses encode_c, in order to mimic git, so that's
ok.

Utility.Format.gen uses decode_c, but only so that stuff like "\n"
in the format string is handled. If the format string contains C-style
octal escapes, they will be converted to ascii characters, and not
combined into unicode characters, but that should not be a problem.
If the user wants unicode characters, they can include them in the
format string, without escaping them.

Finally, decode_c is used by Utility.Gpg.secretKeys, because gpg
--with-colons hex-escapes some characters in particular ':' and '\\'.
gpg passes unicode through, so this use of decode_c is not a problem.

This commit was sponsored by Henrik Riomar on Patreon.
2017-06-17 16:48:00 -04:00
Joey Hess
89df21b8b8
close 2017-06-17 13:20:31 -04:00
Joey Hess
d8a462186e
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-17 13:20:09 -04:00
Joey Hess
75cecbbe3f
Fix build with QuickCheck 2.10.
QuickCheck added an Arbitrary instance for CTime aka EpochTime. However,
while git-annex's instance disallowed times before the epoch, QuickCheck's
does not. So, rather than using its instance, convert from an Integer.

This commit was sponsored by Thomas Hochstein on Patreon.
2017-06-17 13:04:48 -04:00
ilovezfs
eeaa670b61 2017-06-17 16:00:36 +00:00
avar
27f7c8d09a Added a comment 2017-06-16 20:37:48 +00:00
memeplex
63317c321c 2017-06-16 13:23:51 +00:00
t.z.mates
489d7f10f6 Added a comment 2017-06-15 23:07:48 +00:00
t.z.mates
09129a756d Added a comment: Error messages changed 2017-06-15 22:59:43 +00:00
glasserc
5991d5c1ab A wishlist item I would like 2017-06-14 21:26:39 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
a93bcffcd7 2017-06-14 03:21:04 +00:00
Joey Hess
26137ef9fb
add news item for git-annex 6.20170520 2017-06-12 13:55:27 -04:00
Joey Hess
e4100fd60e
releasing package git-annex version 6.20170520 2017-06-12 13:55:00 -04:00
user4
b493ac8d35 Added a comment: remote.log 2017-06-11 19:53:27 +00:00
user4
add2f406a8 2017-06-11 19:27:15 +00:00
Joey Hess
ada1f56806
devblog 2017-06-09 17:00:46 -04:00
Joey Hess
3bd3885dbb
fix OSX build 2017-06-09 14:57:11 -04:00
Joey Hess
1426f7ff3a
disable closingTracked on OSX
Don't trust OSX FSEvents's eventFlagItemModified to be called when the last
writer of a file closes it; apparently that sometimes does not happen,
which prevented files from being quickly added.

This commit was sponsored by John Peloquin on Patreon.
2017-06-09 14:18:58 -04:00
Joey Hess
a20d8ed4cc
comment 2017-06-09 13:50:59 -04:00
Joey Hess
99a1e6efe2
close as dup 2017-06-09 13:43:53 -04:00
Joey Hess
aa2ab14a83
followup 2017-06-09 13:34:08 -04:00
Joey Hess
233f13b1e5
followup 2017-06-09 13:31:34 -04:00
Joey Hess
5be8df01cb
followup 2017-06-09 13:11:25 -04:00
Joey Hess
9db49af63f
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-09 11:42:51 -04:00
Joey Hess
5cf7216774
zsh and fish completions
optparse-applicative-0.14.0.0 adds support for these, so have the
Makefile install their scripts when built with it.

CmdLine/GitAnnex/Options.hs now uses action "file" in cmdParams,
which affects the bash and zsh completions, letting them complete
filenames for subcommands that use that. This is not needed for
bash, since bash-completion.bash enables -o bashdefault, which
lets it complete filenames too. But it does not seem to break the bash
completions. It is needed for zsh; the zsh completion otherwise
does not complete filenames. The fish completion will always complete
filenames no matter what. Messy.

This commit was sponsored by Denis Dzyubenko on Patreon.
2017-06-09 11:38:20 -04:00
Joey Hess
c6f087829e
update from optparse-applicative output
Fix local to use right case, and merge in IFS setting from a more recent
version of optparse-applicative.
2017-06-09 11:30:24 -04:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
e1164ce23a Added a comment 2017-06-09 01:48:15 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
e19752a653 Added a comment 2017-06-09 01:40:01 +00:00
jeff
855f35d00d Added a comment 2017-06-07 21:24:36 +00:00
Joey Hess
28b80599e2
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-07 16:19:45 -04:00
Joey Hess
4a92eac23e
assistant: Merge changes from refs/remotes/foo/master into master.
Previously, only sync branches were merged. This makes regular git push
into a repository watched by the assistant auto-merge.

While this does hardcode an assumption about what the remote tracking
branch is named, which some unusual git configurations won't match,
git-annex sync already made the same assumption.

Also, changed behavior when a tracking branch like
refs/remotes/synced/not/master is received. When on the master branch,
that used to get merged into it, but it's the tracking branch for
not/master, so should only be merged in when on the not/master branch.

This commit was sponsored by Ewen McNeill.
2017-06-07 16:17:46 -04:00
ano.nymous@12ebd53e5933cd1730c84027a7cb905e7c3fdd9c
6a19f79c4a Added a comment: Workaround for switching repos from WebApp 2017-06-07 19:18:51 +00:00
Joey Hess
86e4ea00b2
analysis
Also, added a comment to Assistant/Threads/Merger.hs to explain
why it only merges from /synced/ branches.
2017-06-07 13:45:18 -04:00
Joey Hess
f62e6b358d
followup 2017-06-07 12:31:33 -04:00
Joey Hess
252f254349
more 2017-06-06 16:02:11 -04:00
Joey Hess
aff0ce86da
merge and followup window path length bugs 2017-06-06 15:57:35 -04:00
Joey Hess
bb5f22d815
response 2017-06-06 15:49:40 -04:00
Joey Hess
7b5c00eea7
followup 2017-06-06 15:42:27 -04:00
Joey Hess
eb79584bfe
followup; close 2017-06-06 15:36:10 -04:00