summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* Bugfix: Fix fsck in SHA*E backends, when the key contains composite ↵Gravatar Joey Hess2012-08-24
| | | | extensions, as added in 3.20120721.
* Merge branch 'master' into assistantGravatar Joey Hess2012-08-20
|\ | | | | | | | | | | Conflicts: Makefile debian/copyright
| * add svg versions of the git-annex logo, in color and black and whiteGravatar Joey Hess2012-08-19
| | | | | | | | | | This is a simple application of inkscape's rather amazing tracing capabilities.
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-17
|\| | | | | | | | | Conflicts: debian/changelog
| * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.Gravatar Joey Hess2012-08-17
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-16
|\| | | | | | | | | Conflicts: debian/changelog
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-09
|\ \ | | | | | | | | | | | | Conflicts: debian/changelog
| | * S3: Add fileprefix setting.Gravatar Joey Hess2012-08-09
| |/
| * releasing version 3.201208073.20120807Gravatar Joey Hess2012-08-07
| |
* | 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.
* | 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
| |
| * Revert "init: If no description is provided for a new repository, one will ↵Gravatar Joey Hess2012-08-03
| | | | | | | | | | | | | | | | | | | | automatically be generated, like "joey@gnu:~/foo"" This reverts commit abde98cda21d5deeb16ed3baf736b06fdc2fce2f. Temporarily dropping from master, since this actually uses stuff that's only currently availble in the assistant branch. Will come back when I merge that, and can wait..
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-03
|\|
| * init: If no description is provided for a new repository, one will ↵Gravatar Joey Hess2012-08-03
| | | | | | | | automatically be generated, like "joey@gnu:~/foo"
* | 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.
* | update to newer version of BootstrapGravatar Joey Hess2012-07-27
| | | | | | | | This does fix some UI issues I was having.
* | add yesod-defaultGravatar Joey Hess2012-07-27
| | | | | | | | another dependency cabal works without here, oddly
* | webapp now uses twitter bootstrapGravatar Joey Hess2012-07-27
| | | | | | | | mocked up the main screen, and am actually pretty happy with it!
* | add bootstrapGravatar Joey Hess2012-07-27
| |
* | updateGravatar Joey Hess2012-07-27
| |
* | added jquery to static siteGravatar Joey Hess2012-07-26
| | | | | | | | | | | | | | | | | | | | | | | | | | Had to switch to toWaiAppPlain to avoid a seeming bug in toWaiApp; chromium only received a partial copy of jquery. Always the same length each time, which makes me think it's a bug in the compression, although a bug in the autohead middleware is also a possibility. Anyway, there's little need for compression for a local webapp. Not wasting time compressing things is probably a net gain. Similarly, I've not worried about minifying this yet. Although that would avoid bloating the git-annex binary quite so much.
* | update depsGravatar Joey Hess2012-07-26
| | | | | | | | | | | | Note that here I don't need blaze-markup for cabal to succeed, but Jimmy reports he does. Seems like Text.Blaze.Renderer.String moved from blaze to blaze-markup in some version.
* | update build depsGravatar Joey Hess2012-07-26
| |
* | build fixesGravatar Joey Hess2012-07-25
| |
* | run yesod, and launch webapp on startupGravatar Joey Hess2012-07-25
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-22
|\| | | | | | | | | Conflicts: git-annex.cabal
| * releasing version 3.201207213.20120721Gravatar Joey Hess2012-07-21
| |
* | try to make Utility.Mounts portableGravatar Joey Hess2012-07-19
| | | | | | | | | | This is an unholy mashup, but it just might work. It works on Linux, that's all I've tested. :)
* | MountWatcher threadGravatar Joey Hess2012-07-19
| | | | | | | | Currently only prints mount points when mounts happen.
* | extacted Mounts.hsc from hsshellscriptGravatar Joey Hess2012-07-19
|/ | | | | | | | | Converted from using c2hs to using hsc2hs, just because other code in git-annex uses hsc2hs. Various cleanups. This code is LGPLed, so I had to include that licence.
* map: Write map.dot to .git/annex, which avoids watch trying to annex it.Gravatar Joey Hess2012-07-17
|
* SHAnE backends are now smarter about composite extensions, such as .tar.gz ↵Gravatar Joey Hess2012-07-05
| | | | Closes: #680450
* Use SHA library for files less than 50 kb in size, at which point it's ↵Gravatar Joey Hess2012-07-04
| | | | faster than forking the more optimised external program.
* When shaNsum commands cannot be found, use the Haskell SHA library (already ↵Gravatar Joey Hess2012-07-04
| | | | | | | | a dependency) to do the checksumming. This may be slower, but avoids portability problems. Using Crypto's version of the hashes would be another option. I need to benchmark it. The SHA2 library (which provides SHA1 also, confusing name) may be the fastest option, but is not currently in Debian.
* 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 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).
* releasing version 3.201206293.20120629Gravatar Joey Hess2012-06-29
|
* sync: Automatically resolves merge conflicts.Gravatar Joey Hess2012-06-27
| | | | untested, but it compiles :)
* git-config fileEncodingGravatar Joey Hess2012-06-26
| | | | | | | | | | | | Accept arbitrarily encoded repository filepaths etc when reading git config output. This fixes support for remotes with unusual characters in their names. For example, a remote with a url of /tmp/çüş was previously skipped, because the filename wasn't encoded right so it didn't think it was available. And when setting the annex-uuid of a remote named "çüş", it used to add it under a mis-encoded form of the remote's name. Both these cases now work ok in my testing.
* Got rid of the last place that did utf8 decoding.Gravatar Joey Hess2012-06-26
| | | | | Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/ although I don't know how to reproduce that bug.
* Avoid ugly failure mode when moving content from a local repository that is ↵Gravatar Joey Hess2012-06-26
| | | | | | | | | | | | | | | | | | | not available. Prelude.undefined error message was introduced by bb4f31a0ee496ffb83d31cc56f8827e47605d763. It seems best to filter out local repositories that cannot be accessed from the list of remotes, rather than keeping them in and making every thing that uses the list have to deal with remotes that may have an unknown location. Besides fixing the error message, this also makes unavailable local remotes' names not be shown in various messages, including in git annex status output. Also, move --to an unavailable local repository now avoids some ugly errors like "changeWorkingDirectory: does not exist".
* Version build dependency on STM, and allow building without it, which ↵Gravatar Joey Hess2012-06-26
| | | | disables the watch command.
* cabal: Only try to use inotify on Linux.Gravatar Joey Hess2012-06-25
|
* releasing version 3.201206243.20120624Gravatar Joey Hess2012-06-24
|
* sync: Avoid recent git's interactive merge.Gravatar Joey Hess2012-06-23
|
* demote lsofGravatar Joey Hess2012-06-21
| | | | not available on kfreebsd, and only used by watch