Commit graph

33274 commits

Author SHA1 Message Date
Joey Hess
a8ad577d1d
fix parsing of timestamp w/o trailing 's'
Luckily, this did not affect any git-annex log files, since they all
include the trailing 's' for backwards compatability reasons.

But, if I later want to drop that, this is the first commit where
git-annex can be trusted to parse that right.

The misparse caused it to be off by up to 10 seconds.
2018-10-29 23:36:47 -04:00
Joey Hess
3d1b22dc8e
factor out another function 2018-10-29 23:33:56 -04:00
Joey Hess
2e9f128dea
moved module and relicensed 2018-10-29 23:13:36 -04:00
Joey Hess
5d97898a7c
touch files with high-resolution timestamp
Needs unix 2.7.2, but that was included in ghc 8.0.1 (and much older)
so not really a new dep.
2018-10-29 22:25:21 -04:00
Joey Hess
94b7968f1f
forgot to remove this when dropping support for old ghc 2018-10-29 22:01:06 -04:00
Ilya_Shlyakhter
d1a6daf40b added a use case for alt_keys 2018-10-30 01:40:18 +00:00
Joey Hess
cdb607d937
response 2018-10-29 19:38:19 -04:00
Joey Hess
5cb12f5adb
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-29 19:33:25 -04:00
Joey Hess
595fb98473
add small delay to avoid problems on systems with low-resolution mtime
I've seen intermittent failures of the test suite with v6 for a long time,
it seems to have possibly gotten worse with the changes around v7. Or just
being unlucky; all tests failed today.

Seen on amd64 and i386 builders, repeatedly but intermittently:

	unused: FAIL (4.86s)
	Test.hs:928:
	git diff did not show changes to unlocked file

And I think other such failures, all involving v7/v6 mode tests.

I managed to reproduce the unused failure with --keep-failures,
and inside the repo, git diff was indeed not showing any changes for
the modified unlocked file.

The two stats will be the same other than mtime; the old and new files have
the same size and inode, since the test case writes to the file and then
overwrites it.

Indeed, notice the identical timestamps:

	builder@orca:~/gitbuilder/build/.t/tmprepo335$ echo 1 > foo; stat foo; echo 2 > foo; stat foo
	  File: foo
	  Size: 2         	Blocks: 8          IO Block: 4096   regular file
	Device: 801h/2049d	Inode: 3546179     Links: 1
	Access: (0644/-rw-r--r--)  Uid: ( 1000/ builder)   Gid: ( 1000/ builder)
	Access: 2018-10-29 22:14:10.894942036 +0000
	Modify: 2018-10-29 22:14:10.894942036 +0000
	Change: 2018-10-29 22:14:10.894942036 +0000
	 Birth: -
	  File: foo
	  Size: 2         	Blocks: 8          IO Block: 4096   regular file
	Device: 801h/2049d	Inode: 3546179     Links: 1
	Access: (0644/-rw-r--r--)  Uid: ( 1000/ builder)   Gid: ( 1000/ builder)
	Access: 2018-10-29 22:14:10.894942036 +0000
	Modify: 2018-10-29 22:14:10.898942036 +0000
	Change: 2018-10-29 22:14:10.898942036 +0000
	 Birth: -

I'm seeing this in Linux VMs; it doesn't happen on my laptop. I've also
not experienced the intermittent test suite failures on my laptop.

So, I hope that this small delay will avoid the problem.

Update: I didn't, indeed I then reproduced the same failure on my
laptop, so it must be due to something else. But keeping this change anyway
since not needing to worry about lowish-resolution mtime in the test suite seems
worthwhile.
2018-10-29 19:31:26 -04:00
Gus
288041b609 2018-10-29 23:21:24 +00:00
Joey Hess
bdeba74d4d
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-29 17:11:55 -04:00
Joey Hess
16d56b7eca
remove old flags 2018-10-29 17:10:39 -04:00
Ilya_Shlyakhter
24419efa35 Added a comment 2018-10-29 21:10:29 +00:00
Joey Hess
87d770e3fd
rethink 2018-10-29 17:09:55 -04:00
Ilya_Shlyakhter
6b5f2ecf0e Added a comment 2018-10-29 21:08:55 +00:00
Joey Hess
7a050660d6
ummmmm 2018-10-29 16:48:02 -04:00
Joey Hess
4431b82bce
migrate: Fix failure to migrate from URL keys. (Reversion introduced in version 6.20180926) 2018-10-29 16:36:36 -04:00
Joey Hess
d73f92d8bc
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-29 16:01:46 -04:00
Joey Hess
c472c268c4
webapp: Fixed a crash when adding a git remote.
Reversion introduced in 2b66492d6e which added a new cache that needs to be
cleared.
2018-10-29 16:01:08 -04:00
Ilya_Shlyakhter
b6e90fd18a Added a comment 2018-10-29 19:48:36 +00:00
Ilya_Shlyakhter
50d99e19a3 added suggestion about supporting alternate keys for same content 2018-10-29 19:43:25 +00:00
Joey Hess
3beab402e6
response 2018-10-29 15:40:52 -04:00
Joey Hess
0b52f95c05
followup 2018-10-29 15:28:58 -04:00
Ilya_Shlyakhter
9b268cdcc9 added git-annex-migrate failure 2018-10-29 19:22:24 +00:00
Joey Hess
64a369a1e2
followup 2018-10-29 15:14:34 -04:00
Joey Hess
e32282aa2c
followup 2018-10-29 15:11:40 -04:00
Joey Hess
d61314e494
comment 2018-10-29 15:02:20 -04:00
Joey Hess
a622488758
remove CHECKURL-MULTI single url response special case
Removed undocumented special case in handling of a CHECKURL-MULTI response
with only a single file listed. Rather than ignoring the url that was in
the response, use it. This allows external special remotes that want to
provide some better url to do so, although I don't entirely agree with
using CHECKURL-MULTI to accomplish that. I'm more of the feeling that an
undocumented special case that throws data away is just not a good idea.

This could in theory break some external special remote program that relied
on the current behavior, but its seems unlikely that it would because such
a program must already handle the multiple url case, unless it only ever
provides a single url response to CHECKURL-MULTI.

Make addurl --file work with a single item CHECKURL-MULTI response.
It already did for external special remotes due to the special case,
but now it also will for builtin ones like the BitTorrent special remote.

This commit was sponsored by Ilya Shlyakhter on Patron.
2018-10-29 14:52:12 -04:00
Joey Hess
3248319ca1
close todo item about bug report 2018-10-29 13:47:55 -04:00
Joey Hess
0b8dd0c35f
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-29 13:47:14 -04:00
Ilya_Shlyakhter
d69ebc62a2 reformatted listing 2018-10-28 20:34:52 +00:00
Ilya_Shlyakhter
f4d22a4586 added addurl suggestions 2018-10-28 20:32:25 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
32477c0446 2018-10-28 15:05:16 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
8e2834e5b4 2018-10-28 15:00:59 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
46f65cc657 2018-10-28 14:55:13 +00:00
CandyAngel
b9063f94fc Added a comment 2018-10-27 22:33:21 +00:00
Joey Hess
bb8e245bc3
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-27 13:24:37 -04:00
kamil.figiela@79c245579d15acc2bf83467adce982bfaf8fc4cc
543a714b39 Added a comment 2018-10-27 09:32:22 +00:00
Joey Hess
5b9c66b551
fix link 2018-10-26 16:21:34 -04:00
Joey Hess
497846d740
don't probe support for git-annex smudge --update
Any git-annex not supporting that doesn't support v7 repositories,
so will refuse to work in a repository that has this hook installed.
2018-10-26 14:37:43 -04:00
Joey Hess
12c88ee571
fix upgrade of more than 1 version at a time
It was only running the first upgrade and not subsequent ones, but
setting annex.version to the final version.
2018-10-26 14:31:13 -04:00
Joey Hess
900887c9ac
update for v7 2018-10-26 14:20:05 -04:00
Joey Hess
1f96b24382
remove section on direct mode
git-annex init on the sdcard will now create a v7 adjusted unlocked
repo. While the assistant does still set up direct mode, that's not
because of /sdcard being a crippled filesystem.
2018-10-26 13:57:17 -04:00
Joey Hess
7540ca6fca
some more v6 -> v7 doc changes 2018-10-26 13:56:36 -04:00
Joey Hess
6fd37fb016
Merge branch 'v7' 2018-10-26 13:52:09 -04:00
Joey Hess
3af29b3ba9
When annex.thin is set, allow hard links to be made between executable work tree files and annex objects.
This is safe, because while the annex object ends up executable,
there were already at least two other cases where it ended up executable:

1. git add an an executable file
2. chmod +x of a a non-executable worktree file that was hard linked to the
   annex object

After copy/hard link, it always fixes up the permissions to match the mode
of the worktree file, so when an executable annex object gets hard linked
to a non-executable worktree file, its execute bit gets removed.

Commit b7c8bf5274 already *said* it would do
this; I suspect the line of code I've removed was included in that commit
accidentially.

Also improves annex.thin documentation.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2018-10-26 13:51:43 -04:00
Joey Hess
c7885491b2
clarifications 2018-10-26 13:51:15 -04:00
Joey Hess
2e6aff74c2
response 2018-10-26 13:44:55 -04:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
30a4e63f2a removed 2018-10-26 17:26:37 +00:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
45fd9057ca Added a comment: Awesome! 2018-10-26 17:13:48 +00:00