mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17452 commits 13 branches 442 tags 103 MiB
Commit graph

17452 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
e20acd9f7a devblog 2014-02-04 17:34:05 -04:00
Joey Hess
751f496c11 add test case & fix conflict resolution bug on Windows & FAT 
Fix bug in automatic merge conflict resolution code when used
on a filesystem not supporting symlinks, which resulted in it losing
track of the symlink bit of annexed files.

This was the underlying bug that was causing another test to fail,
which got worked around in 1c997fd08c.
I've chosen to keep 2 separate test cases since the old test case only
detected the problem accidentially.

Test suite passes on FAT & in windows, as well as on proper unix systems.

This commit was sponsored by Ellis Whitehead.
 2014-02-04 17:24:12 -04:00
Joey Hess
88003c446b narrowing test case 2014-02-04 15:27:49 -04:00
Joey Hess
0be48c58e3 update 2014-02-04 15:13:25 -04:00
Joey Hess
8e81a7e906 add test case for windows sync push failure 
This adds a test for a failure mode seemingly specific to Windows
that was removed in 1c997fd08c, and puts it
in its own test case.
 2014-02-04 14:50:28 -04:00
Joey Hess
5d7777cbe2 set up git email config in clone repos too when running test 
This fixes the problem of the environment variables apparently not being
seen on Windows. I could probably remove the setting of the env vars from
Test.hs now as this covers it better.

Note that outside the test suite, git-annex on windows seems to manage to
configure the repo so commits work on its own.
 2014-02-04 14:31:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
9455a05ef7 Added a comment 2014-02-04 14:05:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
827fc98e99 Added a comment 2014-02-04 14:04:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
ceef16f1f5 Added a comment 2014-02-04 13:45:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8mE_yKvTHFnrQn4MZkvt7pHebyPRqN-E
682100a02f removed 2014-02-04 10:06:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8mE_yKvTHFnrQn4MZkvt7pHebyPRqN-E
994ebedaf2 Added a comment: Me too 2014-02-04 10:03:36 +00:00
139.80.40.12
1ec1029040 poll vote (Tahoe-LAFS) 2014-02-04 03:04:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o
1a6e591a9f Added a comment 2014-02-04 02:05:37 +00:00
Joey Hess
83e6fb7319 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-03 21:26:04 -04:00
Joey Hess
631eeea5a5 devblog 2014-02-03 21:25:33 -04:00
Joey Hess
2287c88bfd update 2014-02-03 21:24:23 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
90439c43d2 2014-02-03 22:04:58 +00:00
Joey Hess
617c63a213 fix broken test 
1c997fd08c broke the mixed conflict
resolution test. Since origin is no longer involved, both sides have to
sync after pairing. (The sync before pairing is just to get a commit.)
 2014-02-03 14:32:07 -04:00
Joey Hess
c91bbc9494 fix reversion on repo deletion 
A broken symlink would cause the mode setting to fail.
 2014-02-03 14:20:39 -04:00
Joey Hess
ec417b108d improve failure message 2014-02-03 12:23:05 -04:00
Joey Hess
1c997fd08c fix test suite to pass on windows 
On windows, the sync of the second cloned repo to origin failed, because
synced/master was a non-fast-forward. This may be a bug of its own, but
it's not the issue that this test was intended to test, so disconnect
the repos from origin before syncing.
 2014-02-03 12:12:50 -04:00
Joey Hess
ecd9b6731e try harder to delete test dir on windows 2014-02-03 11:45:31 -04:00
Joey Hess
29bb04aa0d Windows: Fix deletion of repositories by test suite and webapp. 
On Windows, a file that is not writable cannot be deleted even if in a
directory with write perms. So git object files were not getting deleted
when removing a git repository.
 2014-02-03 11:19:41 -04:00
Joey Hess
01df5ed31d Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-03 10:45:32 -04:00
Joey Hess
f657e4070b reorg 2014-02-03 10:45:28 -04:00
https://launchpad.net/~timo-linux
c3fdbafdf6 Added a comment: Still have not found a reasonable solution for this myself. 2014-02-03 14:34:15 +00:00
Joey Hess
08afe3a1f6 fix failing test case on Windows 
ensure file being modified is all read before it's opened for write
 2014-02-03 10:20:18 -04:00
Joey Hess
1572c460e8 avoid using openFile when withFile can be used 
Potentially fixes some FD leak if an action on an opened file handle fails
for some reason. There have been some hard to reproduce reports of
git-annex leaking FDs, and this may solve them.
 2014-02-03 10:19:06 -04:00
Joey Hess
fd1382f96f factor out utility function 2014-02-03 10:08:28 -04:00
Joey Hess
fd7e9431ff comment spelling 2014-02-03 10:01:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
d2b991e6c0 Added a comment 2014-02-03 11:31:49 +00:00
Joey Hess
fded408b44 sync --content: Drop files from remotes that don't have them after getting them. 
Need to include the uuid of the local repo in the list of belived locations
of a key after getting it, in order for the drop from remote to include it
in the numcopies calculation.
 2014-02-02 22:48:45 -04:00
Joey Hess
0de879e264 update function name in comment 2014-02-02 22:37:09 -04:00
Joey Hess
45a9c3c64e Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-02 19:58:13 -04:00
Joey Hess
4676706756 sync --content: Reuse smart copy code from copy command, including handling and repairing out of date location tracking info. Closes: #737480 2014-02-02 19:57:22 -04:00
Joey Hess
1858c1f44a Document in man page that sshcaching uses ssh ControlMaster. Closes: #737476 2014-02-02 19:27:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmdPlD2j96DEwNSGiAHUYKnz2oFHC3rDQY
0d5304cc92 Note about git-annex assistant 2014-02-02 22:59:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmdPlD2j96DEwNSGiAHUYKnz2oFHC3rDQY
a9d9b6ee8f Formatting fixes 2014-02-02 22:56:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmdPlD2j96DEwNSGiAHUYKnz2oFHC3rDQY
7b6a108437 2014-02-02 22:55:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
c6ee7f143a openwrt packages. multiplle architectures 2014-02-02 22:35:55 +00:00
http://joeyh.name/
097bc2b558 Added a comment 2014-02-02 21:13:22 +00:00
Joey Hess
db82c3dc8f Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-02 17:08:51 -04:00
Joey Hess
de8126ab72 add a walkthrough section discussing git-annex's skipping of files on noop 2014-02-02 17:01:41 -04:00
Joey Hess
ba6cba97d2 update docs for sync --content 2014-02-02 16:21:42 -04:00
Joey Hess
6d5efe34dc exclude user pages and devblog from doc build 2014-02-02 16:16:47 -04:00
Joey Hess
089c0109a2 Added ways to configure rsync options to be used only when uploading or downloading from a remote. Useful to eg limit upload bandwidth. 2014-02-02 16:06:34 -04:00
Joey Hess
9e4675d3c8 close; fixed by bbef0cddfd 2014-02-02 15:33:29 -04:00
Joey Hess
18c98c8cfa improve directory special remote docs 2014-02-02 15:26:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
08febc9a61 Added a comment 2014-02-02 16:48:46 +00:00
Joey Hess
a542781f6a remove some monkey faces 2014-02-01 17:14:38 -04:00