summaryrefslogtreecommitdiff
path: root/Command
Commit message (Collapse)AuthorAge
* 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!
| * get, move, copy: Now refuse to do anything when the requested file transfer ↵Gravatar Joey Hess2012-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is already in progress by another process. Note this is per-remote, so trying to get the same file from multiple remotes can still let duplicate downloads run. (And uploading the same file to multiple remotes is not duplicate at all of course.) get, move, and copy are the only git-annex subcommands that transfer files, but there's still git-annex-shell recvkey and sendkey to deal with too. I considered modifying retrieveKeyFile or getViaTmp, but they are called by other code that does not involve expensive file transfers (migrate) or that does file transfers that should not be checked by this (fsck --from).
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-27
|\|
| * typoGravatar Joey Hess2012-06-27
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-27
|\|
| * use "variant" rather than "version"Gravatar Joey Hess2012-06-27
| | | | | | | | | | | | While this word may be less familiar to some users, it avoids the connotation that version 2 is better than version 1, which is wrong when the two variants were conflicting.
| * better filenames for conflict resolution filesGravatar Joey Hess2012-06-27
| |
| * commit merge resolutionGravatar Joey Hess2012-06-27
| | | | | | | | this is necessary so the sync can continue successfully with its push phase
| * fix file nameGravatar Joey Hess2012-06-27
| |
| * don't automerge when the symlinks cannot be parsed as keysGravatar Joey Hess2012-06-27
| |
| * sync: Automatically resolves merge conflicts.Gravatar Joey Hess2012-06-27
| | | | | | | | untested, but it compiles :)
| * properly handle deleted files when processing ls-files --unmergedGravatar Joey Hess2012-06-27
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-23
|\|
| * sync: Avoid recent git's interactive merge.Gravatar Joey Hess2012-06-23
| |
* | the syncer now pushes out changes to remotes, in parallelGravatar Joey Hess2012-06-22
| | | | | | | | | | | | | | | | | | Note that, since this always pushes branch synced/master to the remote, it assumes that master has already gotten all the commits that are on the remote merged in. Otherwise, fast-forward prevention may prevent the push. That's probably ok, because the next stage is to automatically detect incoming pushes and merge.
* | add assistant commandGravatar Joey Hess2012-06-22
|/ | | | like watch, but more magic
* 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
| |