summaryrefslogtreecommitdiff
path: root/Command
Commit message (Collapse)AuthorAge
* sync: Avoid recent git's interactive merge.Gravatar Joey Hess2012-06-23
|
* maintain set of files pendingAddGravatar Joey Hess2012-06-20
| | | | | | | | Kqueue needs to remember which files failed to be added due to being open, and retry them. This commit gets the data in place for such a retry thread. Broke KeySource out into its own file, and added Eq and Ord instances so it can be stored in a Set.
* Merge branch 'master' into watchGravatar Joey Hess2012-06-20
|\
| * unused: Fix crash when file names contain invalid utf8.Gravatar Joey Hess2012-06-20
| | | | | | | | | | | | Was decoding the git-cat-file of the symlink target as utf8, but that can't do, unix filenames are from the 70's and need this shiny disco fileSystemEncoding.
* | fix kevent symlink creationGravatar Joey Hess2012-06-19
|/
* remove newly created tmp file before linkingGravatar Joey Hess2012-06-15
|
* better temp file handlingGravatar Joey Hess2012-06-15
|
* tweakGravatar Joey Hess2012-06-15
|
* Merge branch 'master' into watchGravatar Joey Hess2012-06-15
|\
| * addurl: Was broken by a typo introduced 2 released ago, now fixed. Closes: ↵Gravatar Joey Hess2012-06-14
| | | | | | | | #677576
* | fishy commitGravatar Joey Hess2012-06-14
| |
* | reorganizeGravatar Joey Hess2012-06-13
| |
* | optimise link staging at startupGravatar Joey Hess2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it starts really, really fast! Down from 15 minutes or so on my big tree to around 1 minute. The trick is to remember the last time the daemon was running. Links with a ctime from before that point don't need to be restaged on startup (as long as they are correct), since the old daemon would have handled them already. We also assume that if the daemon has never run before, any links that already exist are good. The pre-commit hook fixes links, so this should be a safe assumption. Adds another MVar holding a DaemonStatus data structure. Also allowed getting rid of the Annex.Fast hack. This data structure will probably grow a lot of details about the daemon's status, that will later be used by the webapp's UI. The code to actually track when the daemon was last running is not written yet. It's 3 am.
* | plumb file status through to event handlersGravatar Joey Hess2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | The idea, not yet done, is to use this to detect when a file has an old change time, and avoid expensive restaging of the file. If git-annex watch keeps track of the last time it finished a full scan, then any symlink that is older than that time must have been scanned before, so need not be added. (Relying on moving, copying, etc of a file all updating its change time.) Anyway, this info is available for free since inotify already checks it, so it might as well make it available.
* | move commentGravatar Joey Hess2012-06-13
| |
* | tweakGravatar 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
| |
* | hlintGravatar Joey Hess2012-06-12
| |
* | 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
| |
* | Merge branch 'master' into watchGravatar Joey Hess2012-06-11
|\| | | | | | | | | Conflicts: debian/changelog
| * uninit: Refuse to run in a subdirectory. Closes: #677076Gravatar Joey Hess2012-06-11
| |
* | git annex watch --stopGravatar Joey Hess2012-06-11
| |
* | 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.
* | daemonize git annex watchGravatar Joey Hess2012-06-11
| |
* | crazy optimisationGravatar Joey Hess2012-06-10
| | | | | | | | Crazy like a fox..
* | run git add --update after inotify is startedGravatar Joey Hess2012-06-10
| | | | | | | | This way, there's no window where deleted files won't be noticed.
* | fixed the double commits problemGravatar Joey Hess2012-06-10
| |
* | avoid running pre-commit hook from watch commitsGravatar Joey Hess2012-06-10
| |
* | tweakGravatar Joey Hess2012-06-10
| |
* | smart commit threadGravatar Joey Hess2012-06-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit thread now has access to a channel containing the times of all uncommitted changes. This lets it be smart about detecting busy times when a batch job is running (such as rm -rf, or untarring something, etc), and avoid committing until it's done. While at the same time, instantly committing one-off changes that the user is going to expect to see immediately. I had to use STM to implement the channel, because of http://hackage.haskell.org/trac/ghc/ticket/4154 While this adds a dependency, I always wanted to use STM, so this actually makes me happy. ;) Also happy that shouldCommit is a pure function, so other commit smartness strategies can easily be played with. Although the current one seems pretty good. There is one bug, for some reason it does double commits, every time.
* | add a thread to commit changesGravatar Joey Hess2012-06-10
| | | | | | | | | | Currently the stupidest possible version, just wakes up every second, and may make empty commits sometimes.
* | generalize and improve state MVar codeGravatar Joey Hess2012-06-10
| |
* | stage deletions directly using update-indexGravatar Joey Hess2012-06-10
| | | | | | | | no need to run git-rm separately
* | fix non-linux buildGravatar Joey Hess2012-06-09
| |
* | refactor and function name cleanupGravatar Joey Hess2012-06-08
| | | | | | | | (oops, I had a calcMerge and a calc_merge!)
* | use git queue for rm tooGravatar Joey Hess2012-06-07
| |
* | make watch use the queueGravatar Joey Hess2012-06-07
| | | | | | | | | | May not work. Certianly needs to flush the queue from time to time when only symlink changes are being made.
* | extend Git.Queue to be able to queue more than simple git commandsGravatar Joey Hess2012-06-07
| | | | | | | | | | | | While I was in there, I noticed and fixed a bug in the queue size calculations. It was never encountered only because Queue.add was only ever run with 1 file in the list.
* | Merge branch 'master' into watchGravatar Joey Hess2012-06-07
|\|
| * initremote: Automatically describe a remote when creating it.Gravatar Joey Hess2012-06-07
| | | | | | | | | | | | | | This ensures that all special remotes show up in git annex status. Before, a special remote that was not manually described, and was not a current git remote, did not show up there, although initremote did list it.
* | tweakGravatar Joey Hess2012-06-06
| |
* | refactorGravatar Joey Hess2012-06-06
| |
* | build watch on non-linux, just don't do anythingGravatar Joey Hess2012-06-06
| |
* | handle running out of watch descriptorsGravatar Joey Hess2012-06-06
| |