summaryrefslogtreecommitdiff
path: root/Command
Commit message (Collapse)AuthorAge
* display errors when any named thread crashesGravatar Joey Hess2012-09-06
|
* use the ~/.config/git-annex/program file to find command when running transfersGravatar Joey Hess2012-08-27
|
* refactorGravatar Joey Hess2012-08-26
|
* refactorGravatar Joey Hess2012-08-26
|
* add transferkey commandGravatar Joey Hess2012-08-24
| | | | | | | Used by the assistant, rather than copy, this is faster because it avoids using git ls-files, avoids checking the location log redundantly, and runs in oneshot mode, avoiding making a commit to the git-annex branch for every file transferred.
* keep logs of failed transfers, and requeue them when doing a non-full scanGravatar Joey Hess2012-08-23
| | | | of a remote
* avoid unnecessary transfer scans when syncing a disconnected remoteGravatar Joey Hess2012-08-22
| | | | | | | | | | | | | | | | | | | | Found a very cheap way to determine when a disconnected remote has diverged, and has new content that needs to be transferred: Piggyback on the git-annex branch update, which already checks for divergence. However, this does not check if new content has appeared locally while disconnected, that should be transferred to the remote. Also, this does not handle cases where the two git repos are in sync, but their content syncing has not caught up yet. This code could have its efficiency improved: * When multiple remotes are synced, if any one has diverged, they're all queued for transfer scans. * The transfer scanner could be told whether the remote has new content, the local repo has new content, or both, and could optimise its scan accordingly.
* implement resuming of paused transfersGravatar Joey Hess2012-08-12
| | | | | Currently waits for a new transfer slot to open up, which probably needs to change..
* add routes to pause/start/cancel transfersGravatar Joey Hess2012-08-08
| | | | | | | | | | | | | | | | This commit includes a paydown on technical debt incurred two years ago, when I didn't know that it was bad to make custom Read and Show instances for types. As the routes need Read and Show for Transfer, which includes a Key, and deriving my own Read instance of key was not practical, I had to finally clean that up. So the compact Key read and show functions are now file2key and key2file, and Read and Show are now derived instances. Changed all code that used the old instances, compiler checked. (There were a few places, particularly in Command.Unused, and the test suite where the Show instance continue to be used for legitimate comparisons; ie show key_x == show key_y (though really in a bloom filter))
* make the webapp honor the web.browser git configGravatar Joey Hess2012-08-08
|
* Merge branch 'master' into assistantGravatar Joey Hess2012-08-07
|\
| * fix transfer log cleanup crashGravatar Joey Hess2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid crashing when "git annex get" fails to download from one location, and falls back to downloading from a second location. The problem is that git annex get calls download recursively from within itself if the first download attempt fails. So the first time through, it writes a transfer info file, which is then overwritten on the second, recursive call. Then on cleanup, it tries to delete the file twice, which of course doesn't work. Fixed both by not crashing if the transfer file is removed, and by changing Get to not run download recursively like that. It's the only thing that did so, and it just seems like a bad idea.
* | handle case of adding populated drive to just created repoGravatar Joey Hess2012-08-05
| | | | | | | | | | The just created repo has no master branch commits yet. This is now handled, merging in the master branch from the populated drive.
* | fix crashes when run in a git repo that has been initted but has no master ↵Gravatar Joey Hess2012-08-05
| | | | | | | | branch yet
* | Merge remote-tracking branch 'origin/master' into assistantGravatar Joey Hess2012-08-05
|\| | | | | | | | | Conflicts: Init.hs
| * unused, status: Avoid crashing when ran in bare repo.Gravatar Joey Hess2012-08-05
| |
* | wire up scan and transfer to newly added removable driveGravatar Joey Hess2012-08-04
| | | | | | | | remote setup still todo
* | full autostart supportGravatar Joey Hess2012-08-02
| | | | | | | | | | | | | | | | git annex assistant --autostart will start separate daemons in each listed autostart repo running the webapp outside any git-annex repo will open it on the first listed autostart repo
* | webapp is no longer a daemonGravatar Joey Hess2012-08-01
| | | | | | | | Remove --foreground and --stop options from it.
* | always run webapp in foregroundGravatar Joey Hess2012-08-01
| |
* | write pid file even when running in foregroundGravatar Joey Hess2012-08-01
| | | | | | | | | | | | | | | | This prevents multiple runs of the assistant in the foreground, and lets --stop stop foregrounded runs too. The webapp firstrun case also now writes a pid file, once it's made the git repo to put it in.
* | implemented firstrun repository creation and redirection to full webappGravatar Joey Hess2012-08-01
| | | | | | | | Some of the trickiest code I've possibly ever written.
* | when run in uninitialized git repo, do firstrunGravatar Joey Hess2012-07-31
| | | | | | | | My $HOME is in git, let's make it work :)
* | don't start webapp when in a git repo that has not been git-annex inittedGravatar Joey Hess2012-07-31
| | | | | | | | | | Maybe later it can prompt if they want to use the repo with git-annex, but for now this is a sane easy choice.
* | webapp now starts up when run not in a git repoGravatar Joey Hess2012-07-31
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-27
|\|
| * initremote: Avoid recording remote's description before checking that its ↵Gravatar Joey Hess2012-07-27
| | | | | | | | config is valid.
* | now the webapp has the same options as the assistantGravatar Joey Hess2012-07-27
| |
* | much better webapp startup of the assistantGravatar Joey Hess2012-07-27
| | | | | | | | | | | | This avoids forking another process, avoids polling, fixes a race, and avoids a rare forkProcess thread hang that I saw once time when starting the webapp.
* | increase timeout from 10 to 100 secondsGravatar Joey Hess2012-07-26
| | | | | | | | I've seen 10 be too short under load.
* | when starting the assistant, wait for it to create the shim file, as well as ↵Gravatar Joey Hess2012-07-26
| | | | | | | | | | | | the pid file fixes a possible race
* | webapp: check that the shim exists, and restart the assistant if notGravatar Joey Hess2012-07-26
| |
* | on second thought, let's use --restart rather than --forceGravatar Joey Hess2012-07-26
| | | | | | | | --force could enable other, unwanted behavior
* | git annex webapp --force forces a restart of the daemonGravatar Joey Hess2012-07-26
| | | | | | | | Useful for testing..
* | fix editor damageGravatar Joey Hess2012-07-25
| |
* | git annex webapp now opens a browser to the webappGravatar Joey Hess2012-07-25
| | | | | | | | Also, starts the assistant if it wasn't already running.
* | add back debug loggingGravatar Joey Hess2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | Make Utility.Process wrap the parts of System.Process that I use, and add debug logging to them. Also wrote some higher-level code that allows running an action with handles to a processes stdin or stdout (or both), and checking its exit status, all in a single function call. As a bonus, the debug logging now indicates whether the process is being run to read from it, feed it data, chat with it (writing and reading), or just call it for its side effect.
| * pull in transfer log code from assistant branchGravatar Joey Hess2012-07-18
| | | | | | | | New log file format.
* | Merge branch 'threaded' into assistantGravatar Joey Hess2012-07-18
|\ \
| * | switch from System.Cmd.Utils to System.ProcessGravatar Joey Hess2012-07-18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test suite now passes with -threaded! I traced back all the hangs with -threaded to System.Cmd.Utils. It seems it's just crappy/unsafe/outdated, and should not be used. System.Process seems to be the cool new thing, so converted all the code to use it instead. In the process, --debug stopped printing commands it runs. I may try to bring that back later. Note that even SafeSystem was switched to use System.Process. Since that was a modified version of code from System.Cmd.Utils, it needed to be converted too. I also got rid of nearly all calls to forkProcess, and all calls to executeFile, which I'm also doubtful about working well with -threaded.
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-17
|\|
| * map: Write map.dot to .git/annex, which avoids watch trying to annex it.Gravatar Joey Hess2012-07-17
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-16
|\|
| * copy, drop: Avoid checking numcopies attribute unnecessarilyGravatar Joey Hess2012-07-10
| |
* | wrote transfer threadGravatar Joey Hess2012-07-05
| | | | | | | | finally!
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-02
|\|
| * pass associatedfile and remoteuuid to git-annex-shellGravatar Joey Hess2012-07-02
| | | | | | | | | | | | | | | | This *almost* works. Along the way, I noticed that the --uuid parameter was being accidentially passed after the --, so that has never been actually used by git-annex-shell to verify it's running in the expected repository. Oops. Fixed.
| * record transfers for git-annex-shellGravatar Joey Hess2012-07-02
| | | | | | | | | | | | | | | | | | Not yet tested and places git-annex-shell is run need to be modified to pass the new field settings. Note that rsyncServerSend was changed to fork, rather than directly exec rsync, because it needs to keep the transfer lock held, and clean up the transfer log when done.
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-01
|\|
| * record transfer information on local git remotesGravatar Joey Hess2012-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to record a semi-useful filename associated with the key, this required plumbing the filename all the way through to the remotes' storeKey and retrieveKeyFile. Note that there is potential for deadlock here, narrowly avoided. Suppose the repos are A and B. A sends file foo to B, and at the same time, B gets file foo from A. So, A locks its upload transfer info file, and then locks B's download transfer info file. At the same time, B is taking the two locks in the opposite order. This is only not a deadlock because the lock code does not wait, and aborts. So one of A or B's transfers will be aborted and the other transfer will continue. Whew!