summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* eliminating absNormPathGravatar Joey Hess2014-02-07
| | | | | | | | | | | | | | | | git-annex has been using MissingH's `abdNormPath` forever, but that's unmaintained and possibly buggy, and doesn't work on Windows. I've been wanting to get rid of it for some time, and finally did today, writing a `simplifyPath` that does the things git-annex needs and will work with all the Windows filename craziness, and takes advantage of the more modern System.FilePath to be quite a simple peice of code. A QuickCheck test found no important divergences from absNormPath. A good first step to making git-annex not depend on MissingH at all. And it fixed some weird behaviors on Windows like `git annex add ..\subdir\file` not working. Note that absNormPathUnix has been left alone for now.
* updateGravatar Joey Hess2014-02-07
|
* Android: Avoid crashing when unable to set file mode for ssh config file due ↵Gravatar Joey Hess2014-02-07
| | | | to Android filesystem horribleness.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-07
|\
* | reorderGravatar Joey Hess2014-02-07
| |
| * Added a commentGravatar http://joeyh.name/2014-02-07
|/
* added back lost certificate path fix for AndroidGravatar Joey Hess2014-02-07
|
* forwardedGravatar Joey Hess2014-02-07
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-07
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-07
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-02-07
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-07
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-07
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-07
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-06
|\
* | devblogGravatar Joey Hess2014-02-06
| |
* | add regression test for symlink calculationGravatar Joey Hess2014-02-06
| | | | | | | | | | Note: Test reordered because running git-annex sync early broke the environment for some other tests.
* | wiiindddoowwsGravatar Joey Hess2014-02-06
| |
| * TypoGravatar Richard Hartmann2014-02-07
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-06
|\
* | Fix initremote with encryption=pubkey to work with S3, glacier, webdav, and ↵Gravatar Joey Hess2014-02-06
| | | | | | | | external special remotes.
| * Added a commentGravatar http://joeyh.name/2014-02-06
| |
* | fix windows code again (argh)Gravatar Joey Hess2014-02-06
| |
| * removedGravatar http://joeyh.name/2014-02-06
| |
| * Added a commentGravatar http://joeyh.name/2014-02-06
| |
| * Added a commentGravatar http://joeyh.name/2014-02-06
| |
* | remove workaround for old bugGravatar Joey Hess2014-02-06
| | | | | | | | | | | | | | 560b644a52971a7e4706c775982ec29e03ca3ab2 described a bug moving between remotes in direct mode; I can no longer reproduce it with this strange workaround removed. Also test suite still passes. Hope the broken code just got fixed in the meantime.
* | work around absNormPath not working on WindowsGravatar Joey Hess2014-02-06
| | | | | | | | When making git-annex links, we want unix-style paths in the link targets.
* | Revert "work around absNormPath not working on Windows"Gravatar Joey Hess2014-02-06
| | | | | | | | | | | | | | This reverts commit 595e9a41cedbed40dfc6680d34ef6de5e3a2ff8e. That caused 2 other test cases to fail. Windows path slash issues are horrible.
* | work around absNormPath not working on WindowsGravatar Joey Hess2014-02-06
| | | | | | | | | | | | Seems I punted on this while porting before. This hack relies on DOS not using / in filenames, it's effectively an alternate path separatr in at least current versions of windows..
| * Added a commentGravatar http://joeyh.name/2014-02-06
| |
| * Added a commentGravatar http://joeyh.name/2014-02-06
| |
| * Added a commentGravatar http://joeyh.name/2014-02-06
| |
| * Added a commentGravatar http://joeyh.name/2014-02-06
| |
| * Added a commentGravatar http://joeyh.name/2014-02-06
|/
* --in can now refer to files that were located in a repository at some past ↵Gravatar Joey Hess2014-02-06
| | | | date. For example, --in="here@{yesterday}"
* Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82014-02-06
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-02-06
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-06
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-06
|
* removedGravatar https://www.google.com/accounts/o8/id?id=AItOawmj9PMP_cTZvlEbxJ1eqeLCb25bTU6o1pg2014-02-05
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmj9PMP_cTZvlEbxJ1eqeLCb25bTU6o1pg2014-02-05
|
* Added a comment: New git-annex package to blameGravatar https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o2014-02-05
|
* Added a comment: Hash is the sameGravatar https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o2014-02-05
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o2014-02-05
|
* Added a comment: re: Not an backupGravatar https://www.google.com/accounts/o8/id?id=AItOawkRtPz8CAz_1sBR0Rf-b8OlQQ49v9JxOIE2014-02-05
|
* Describe symlink issue on WindowsGravatar https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o2014-02-05
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-04
|\
* | devblogGravatar Joey Hess2014-02-04
| |
* | add test case & fix conflict resolution bug on Windows & FATGravatar Joey Hess2014-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d. 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.