summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * blog for the dayGravatar Joey Hess2012-06-12
| |
* | optimisation and memory leak fixGravatar Joey Hess2012-06-12
| |
* | tweakGravatar Joey Hess2012-06-12
| |
| * updateGravatar Joey Hess2012-06-12
| |
* | do fewer commits during long batch jobsGravatar Joey Hess2012-06-12
| | | | | | | | 10 thousand queue size does not use appreciable memory in my testing.
* | better optimisation of add checkGravatar Joey Hess2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | Now really only done in the startup scan. It turns out to be quite hard for event handlers to know when the startup scan is complete. I tried to make addWatch pass that info, but found threading the state very difficult. For now, a quick hack, using the fast flag. Note that it's actually possible for inotify events to come in while the startup scan is still ongoing. Due to my hack, the expensive check will be done for files added in such inotify events.
* | fix bug that turned files already in git into symlinksGravatar Joey Hess2012-06-12
| | | | | | | | | | | | This requires a relatively expensive test at file add time to see if it's in git already. But it can be optimised to only happen during the startup scan.
* | add a flag indicating if an event was synthesized during initial dir scanGravatar Joey Hess2012-06-12
| |
* | cleanupGravatar Joey Hess2012-06-12
| |
* | Merge branch 'master' into watchGravatar Joey Hess2012-06-12
|\| | | | | | | | | | | Conflicts: debian/changelog git-annex.cabal
| * remove xxx ... cabal test works for meGravatar Joey Hess2012-06-12
| |
| * tweakGravatar Joey Hess2012-06-12
| |
| * Install man page when run by cabal, in a location where man will find it, ↵Gravatar Joey Hess2012-06-12
| | | | | | | | even when installing under $HOME. Thanks, Nathan Collins
| * cleanupGravatar Joey Hess2012-06-12
| |
| * remove cabal fileGravatar Joey Hess2012-06-12
| |
* | hlintGravatar Joey Hess2012-06-12
| |
| * Merge branch 'master' into cabal-man-pagesGravatar Nathan Collins2012-06-12
| |\
| * | Clean up Setup.hs.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove post-copy hook 'myPostCopy': it's easy to write one based on 'myPostInst', so just wait until someone complains that it's missing. Remove most comments. Put long type sigs on one line like in the other source files.
| * | Generate sdist tarball name from git-annex.cabal 'Version:'.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | Instead of generating with `cabal sdist`.
| * | Simplify git-annex.cabal and generate sdist with make-sdist.sh.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cabal install` is happy as long as the files it needs are present, but `cabal sdist` will only package up files you tell it to. So, generate the source tarball ourselves. The source tarball is generated by make-sdist.sh, which uses cabal sdist to calculate the package name. Could also generate the name from the 'Version:' field in git-annex.cabal.
| * | Get ready for a simple git-annex.cabal.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | | | | | | | | | | I have a new idea: instead of the template-based approaches that work around cabals requirement that you list all files to put in the sdist, we can simply generate the sdist ourselves, with the files we want. Take that cabal!
| * | Remove .dir-locals.el and add doc/contributing.mdwn.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link CONTRIBUTING -> doc/contributing.mdwn, so that it's easy to find (many files in doc/). Add .dir-locals.el to .gitignore, now that it's no longer versioned. The CONTRIBUTING file gives a reference to a page on the Emacs wiki that shows how to set up a .dir-locals.el that sets up tabs for indentation. I updated the wiki page to include the `(highlight-regexp "^ *")` part, which had been the hardest to discover.
| * | Add link COPYRIGHT -> debian/copyright; add COPYRIGHT to sdist.Gravatar Nathan Collins2012-06-11
| | |
* | | Merge branch 'master' into watchGravatar Joey Hess2012-06-11
|\ \ \ | | |/ | |/|
| * | blog for the dayGravatar Joey Hess2012-06-11
| | |
* | | updateGravatar Joey Hess2012-06-11
| | |
* | | avoid using STM while the MVar is heldGravatar Joey Hess2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I thought this might be a lock conflict that explains the deadlock when built with -threaded, but it seems not.. it still locks! It even locks without the committer thread. Indeed, it locks when running "git annex add"! -threaded is exposing some other problem. Still, this seems conceptually cleaner and did not add any inneficiencies. Also added some high-level documentation about the threads used.
* | | tweakGravatar Joey Hess2012-06-11
| | |
* | | Revert "Build with ghc's threaded runtime, so threaded code does not busy-wait."Gravatar Joey Hess2012-06-11
| | | | | | | | | | | | | | | | | | This reverts commit 129f6123fe933310829986fd5a99a9fd6911ca0f. Saw hang during batch add with -threaded, so deferred for now.
* | | Build with ghc's threaded runtime, so threaded code does not busy-wait.Gravatar Joey Hess2012-06-11
| | | | | | | | | | | | Sort of a work around for http://bugs.debian.org/677096
* | | Merge branch 'master' into watchGravatar Joey Hess2012-06-11
|\| | | | | | | | | | | | | | Conflicts: debian/changelog
| * | add news item for git-annex 3.20120611Gravatar Joey Hess2012-06-11
| | |
| * | releasing version 3.201206113.20120611Gravatar Joey Hess2012-06-11
| | |
| * | uninit: Refuse to run in a subdirectory. Closes: #677076Gravatar Joey Hess2012-06-11
| | |
| | * Merge branch 'master' into cabal-man-pagesGravatar Nathan Collins2012-06-11
| | |\
| | * | Refactor generation of git-annex.cabal and incorporate man pages.Gravatar Nathan Collins2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing `sed | find | perl` hack in the Makefile was not including the man pages in the generated git-annex.cabal. I couldn't figure out why it didn't work; running the `find | perl` part of the command *did* list the man pages ... So, I set up a new hack. It produces a cleaner .cabal file and includes the man pages in the sdist. I changed git-annex.cabal and its generation as follows: - git-annex.cabal is now generated by a here document in git-annex.cabal.template.sh. The here document has inline file list insertion, whereas before the file lists were inserted with sed. - The 'Extra-Source-Files:' field now only includes the non-source files: the man pages, plain text documentation, and license. - The source dependencies are now listed in 'Other-Modules' sections in the 'Executable' and 'Test-Suite' sections. The list of dependencies is generated by `gen-other-modules.sh`. - The ./debian and ./doc are no longer included in the sdist package. These were not installed anywhere by `cabal install`. A user that wants them could clone the git repo. Running the tests with cabal is not yet working, i.e. cabal configure --enable-tests && cabal build && cabal test and cabal install --enable-tests fail to find Utility.Touch. However, I did not break this: it doesn't work for the git-annex package on Hackage either. Next step is to figure out how to deal with HSC in cabal ... or not bother, because `make test` works. I'm worried this is a cabal bug. To test building from sdist, I've been running cd ../.. ; cabal sdist ; cd dist ; tar xf git-annex-3.20120605.tar.gz && cd git-annex-3.20120605 && rm -fr /tmp/git-annex && cabal install --prefix=/tmp/git-annex && tree -A /tmp/git-annex in the dist directory. Using `cabal-dev install` is a better test, but is very slow.
| * | | noteGravatar Joey Hess2012-06-11
| | |/ | |/|
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-11
| |\ \
| * | | updateGravatar Joey Hess2012-06-11
| | | |
* | | | bugfixGravatar Joey Hess2012-06-11
| | | |
* | | | git annex watch --stopGravatar Joey Hess2012-06-11
| | | |
* | | | fix pid file lockingGravatar Joey Hess2012-06-11
| | | | | | | | | | | | | | | | | | | | Ok, that's odd.. opening it before fork breaks the locking. I don't understand why.
* | | | add a pid fileGravatar Joey Hess2012-06-11
| | | | | | | | | | | | | | | | | | | | Writes pid to a file. Is supposed to take an exclusive lock, but that's not working, and it's too late for me to understand why.
| | * | Added a comment: re: cloudGravatar http://joeyh.name/2012-06-11
| | | |
* | | | daemonize git annex watchGravatar Joey Hess2012-06-11
| | | |
| | | * Rename git-annex.cabal.Gravatar Nathan Collins2012-06-10
| | | |
| | * | Added a comment: Cloud Service LimitationsGravatar https://www.google.com/accounts/o8/id?id=AItOawkq0-zRhubO6kR9f85-5kALszIzxIokTUw2012-06-11
| |/ /
| | * Add cabal-dev to .gitignore.Gravatar Nathan Collins2012-06-10
| | |
| | * Fix Makefile dependencies for `make test`.Gravatar Nathan Collins2012-06-10
| | |
* | | crazy optimisationGravatar Joey Hess2012-06-10
| | | | | | | | | | | | Crazy like a fox..