summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* add test case for windows sync push failureGravatar Joey Hess2014-02-04
| | | | | | This adds a test for a failure mode seemingly specific to Windows that was removed in f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d, and puts it in its own test case.
* set up git email config in clone repos too when running testGravatar Joey Hess2014-02-04
| | | | | | | | | 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.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-03
|\
* | devblogGravatar Joey Hess2014-02-03
| |
* | updateGravatar Joey Hess2014-02-03
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2014-02-03
|/
* fix broken testGravatar Joey Hess2014-02-03
| | | | | | f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d 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.)
* fix reversion on repo deletionGravatar Joey Hess2014-02-03
| | | | A broken symlink would cause the mode setting to fail.
* improve failure messageGravatar Joey Hess2014-02-03
|
* fix test suite to pass on windowsGravatar Joey Hess2014-02-03
| | | | | | | 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.
* try harder to delete test dir on windowsGravatar Joey Hess2014-02-03
|
* Windows: Fix deletion of repositories by test suite and webapp.Gravatar Joey Hess2014-02-03
| | | | | | 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.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-03
|\
* | reorgGravatar Joey Hess2014-02-03
| |
| * Added a comment: Still have not found a reasonable solution for this myself.Gravatar https://launchpad.net/~timo-linux2014-02-03
| |
* | fix failing test case on WindowsGravatar Joey Hess2014-02-03
| | | | | | | | ensure file being modified is all read before it's opened for write
* | avoid using openFile when withFile can be usedGravatar Joey Hess2014-02-03
| | | | | | | | | | | | 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.
* | factor out utility functionGravatar Joey Hess2014-02-03
| |
* | comment spellingGravatar Joey Hess2014-02-03
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-02-03
| |
* | sync --content: Drop files from remotes that don't have them after getting them.Gravatar Joey Hess2014-02-02
| | | | | | | | | | | | 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.
* | update function name in commentGravatar Joey Hess2014-02-02
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-02
|\
* | sync --content: Reuse smart copy code from copy command, including handling ↵Gravatar Joey Hess2014-02-02
| | | | | | | | and repairing out of date location tracking info. Closes: #737480
* | Document in man page that sshcaching uses ssh ControlMaster. Closes: #737476Gravatar Joey Hess2014-02-02
| |
| * Note about git-annex assistantGravatar https://www.google.com/accounts/o8/id?id=AItOawmdPlD2j96DEwNSGiAHUYKnz2oFHC3rDQY2014-02-02
| |
| * Formatting fixesGravatar https://www.google.com/accounts/o8/id?id=AItOawmdPlD2j96DEwNSGiAHUYKnz2oFHC3rDQY2014-02-02
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmdPlD2j96DEwNSGiAHUYKnz2oFHC3rDQY2014-02-02
| |
| * openwrt packages. multiplle architecturesGravatar https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE2014-02-02
| |
| * Added a commentGravatar http://joeyh.name/2014-02-02
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-02
|\
* | add a walkthrough section discussing git-annex's skipping of files on noopGravatar Joey Hess2014-02-02
| |
* | update docs for sync --contentGravatar Joey Hess2014-02-02
| |
* | exclude user pages and devblog from doc buildGravatar Joey Hess2014-02-02
| |
* | Added ways to configure rsync options to be used only when uploading or ↵Gravatar Joey Hess2014-02-02
| | | | | | | | downloading from a remote. Useful to eg limit upload bandwidth.
* | close; fixed by 6f622c6043ad8db9f27a16020c371af68506e8e7Gravatar Joey Hess2014-02-02
| |
* | improve directory special remote docsGravatar Joey Hess2014-02-02
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-02-02
|/
* remove some monkey facesGravatar Joey Hess2014-02-01
|
* remove comment posted directly to comments pageGravatar Joey Hess2014-02-01
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-01
|\
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkQsZE5doTYwTsizI1Ym8SHxGIW9yWkp2s2014-02-01
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnhrtcVb6osHXjvZeNpj9diqh_JjyARc302014-02-01
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM2014-02-01
| |
| * Added a comment: On Opensuse 13.1 - I was able to run git-annex-webapp once.Gravatar https://www.google.com/accounts/o8/id?id=AItOawk4_47QIHYfGlI9aL04LXxOczcYABmmIfA2014-02-01
| |
| * Added a comment: On Opensuse 13.1 - I was able to run git-annex-webapp once.Gravatar https://www.google.com/accounts/o8/id?id=AItOawk4_47QIHYfGlI9aL04LXxOczcYABmmIfA2014-02-01
| |
* | sync --content: Re-pull from remotes after downloading content, since that ↵Gravatar Joey Hess2014-02-01
| | | | | | | | can take a while and other changes may be pushed in the meantime.
* | improve sync with xmpp and annex-ignoreGravatar Joey Hess2014-02-01
| | | | | | | | | | | | * sync --content: Honor annex-ignore configuration. * sync: Don't try to sync with xmpp remotes, which are only currently supported when using the assistant.
| * Added a comment: ssh-askpass workaround does workGravatar https://www.google.com/accounts/o8/id?id=AItOawl7Tgnd2BBdIXVlNKjG4dkTj3paf7FHeHQ2014-02-01
| |
| * (no commit message)Gravatar https://me.yahoo.com/a/VemDaJIx1OlHQEvbDZnBbgXZtkod0g--#e5f922014-02-01
| |