summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* wip v6 support for assistantGravatar Joey Hess2015-12-21
| | | | Files are not yet added to v6 repos in unlocked mode.
* remove (v6) associated file in unannexGravatar Joey Hess2015-12-21
|
* Merge branch 'master' into smudgeGravatar Joey Hess2015-12-21
|\
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-21
| |\
| * | addurl: Added --batch option.Gravatar Joey Hess2015-12-21
| | |
| | * Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42015-12-21
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-21
| |\|
| | * Added a commentGravatar cbaines2015-12-21
| | |
| | * Added a commentGravatar frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac7202015-12-21
| | |
| | * Added a commentGravatar cbaines2015-12-21
| | |
| | * Added a commentGravatar cbaines2015-12-21
| | |
| | * Added a commentGravatar https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf5742015-12-21
| | |
| | * Added a comment: A problem with SmartGit then?Gravatar jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f285652015-12-21
| | |
| | * (no commit message)Gravatar frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac7202015-12-20
| | |
| | * Added a commentGravatar sts2015-12-20
| | |
| * | fix build warnings under ghc 7.10Gravatar Joey Hess2015-12-19
| |/ | | | | | | | | | | Caused by AMP.. Since I've finally upgraded my dev laptop to 7.10, I may start missing imports that are not needed with it but are with older versions..
| * updateGravatar Joey Hess2015-12-19
| |
| * reuse commentGravatar Joey Hess2015-12-19
| |
| * commentGravatar Joey Hess2015-12-19
| |
| * commentGravatar Joey Hess2015-12-19
| |
| * commentGravatar Joey Hess2015-12-19
| |
| * commentGravatar Joey Hess2015-12-19
| |
| * commentGravatar Joey Hess2015-12-19
| |
| * commentGravatar Joey Hess2015-12-19
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-19
| |\
| * | status: On crippled filesystems, was displaying M for all annexed files that ↵Gravatar Joey Hess2015-12-19
| | | | | | | | | | | | were present. Probably caused by a change to what git status displays in this situation. Fixed by treating files git thinks are modified the same as typechanged files.
| | * (no commit message)Gravatar https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf5742015-12-19
| |/
| * add news item for git-annex 5.20151218Gravatar Joey Hess2015-12-18
| |
| * Merge branch 'master' of ssh://git-annex.branchable.com5.20151218Gravatar Joey Hess2015-12-18
| |\
| | * Added a commentGravatar neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd2015-12-18
| | |
| * | prep releaseGravatar Joey Hess2015-12-18
| |/
* | interaction with shared clonesGravatar Joey Hess2015-12-17
| |
| * Added a commentGravatar SamuelTardieu2015-12-17
| |
| * (no commit message)Gravatar jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f285652015-12-17
| |
| * (no commit message)Gravatar pete.ward@26c41318616c4cf9601d0431557c1df734ccdb772015-12-16
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-16
| |\
| * | devblogGravatar Joey Hess2015-12-16
| | |
* | | updateGravatar Joey Hess2015-12-16
| | |
* | | test suite down to only 4 fails with v6Gravatar Joey Hess2015-12-16
| | |
* | | update todo listGravatar Joey Hess2015-12-16
| | |
* | | fix docsGravatar Joey Hess2015-12-16
| | | | | | | | | | | | | | | "git -a annex.largefiles=* add" cannot be used.. git does not pass the config along to the smudge filter, sadly.
* | | v6: fix locking modified file when the content is not presentGravatar Joey Hess2015-12-16
| | |
* | | fix add of file that was locked but has been replaced by a new, unlocked ↵Gravatar Joey Hess2015-12-16
| | | | | | | | | | | | file (v6)
* | | fix reversion in v5 git-annex add of unlocked fileGravatar Joey Hess2015-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | In v5, lookupFile is supposed to only look at symlinks on disk (except when in direct mode). Note that v6 also has a bug when a locked file's symlink is deleted and is replaced with a new file. It sees that a link is staged and gets that key.
* | | temporarily remove cached keys database connectionGravatar Joey Hess2015-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that shutdown is not always called, particularly in the test suite. So, a database connection would be opened, possibly some changes queued, and then not shut down. One way this can happen is when using Annex.eval or Annex.run with a new state. A better fix might be to make both of them call Keys.shutdown (and be sure to do it even if the annex action threw an error). Complication: Sometimes they're run reusing an existing state, so shutting down a database connection could cause problems for other users of that same state. I think this would need a MVar holding the database handle, so it could be emptied once shut down, and another user of the database connection could then start up a new one if it got shut down. But, what if 2 threads were concurrently using the same database handle and one shut it down while the other was writing to it? Urgh. Might have to go that route eventually to get the database access to run fast enough. For now, a quick fix to get the test suite happier, at the expense of speed.
* | | reorder database shutdown to be concurrency safeGravatar Joey Hess2015-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a DbHandle is in use by another thread, it could be queueing changes while shutdown is running. So, wait for the worker to finish before flushing the queue, so that any last-minute writes are included. Before this fix, they would be silently dropped. Of course, if the other thread continues to try to use a DbHandle once it's closed, it will block forever as the worker is no longer reading from the jobs MVar. So, that would crash with "thread blocked indefinitely in an MVar operation".
* | | commentGravatar Joey Hess2015-12-16
| | |
* | | pass --version to init when neededGravatar Joey Hess2015-12-16
| | |
* | | Merge branch 'master' into smudgeGravatar Joey Hess2015-12-16
|\| |
| | * Added a commentGravatar wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d2015-12-16
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 20:31:36 +0000