summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* changelog and minor cleanup to fix mixed spaces/tabsGravatar Joey Hess2012-09-23
|
* changelog updatesGravatar Joey Hess2012-09-21
|
* sync: Pushes the git-annex branch to remote/synced/git-annex, rather than ↵Gravatar Joey Hess2012-09-16
| | | | | | | | | | | | | directly to remote/git-annex. This fixes a problem I was seeing in the assistant where two remotes would attempt to sync with one another at the same time, and both failed pushing the diverged git-annex branch. Then when both tried to resolve the failed push, they each modified their git-annex branch, which again each blocked the other from pushing into it. The result was that the git-annex branches were perpetually diverged (despite having the same content!) and once the assistant fell into this trap, it couldn't get out and always had to do the slow push/fail/pull/merge/push/fail cycle.
* Avoid crashing on encoding errors in filenames when writing transfer info ↵Gravatar Joey Hess2012-09-16
| | | | files and reading from checksum commands.
* reinject: When the provided file doesn't match, leave it where it is, rather ↵Gravatar Joey Hess2012-09-16
| | | | than moving to .git/annex/bad/
* Support repositories created with --separate-git-dir. Closes: #684405Gravatar Joey Hess2012-09-15
|
* migrate: Check content before generating the new key, to avoid generating a ↵Gravatar Joey Hess2012-09-14
| | | | key for corrupt data.
* Disable ssh connection caching if the path to the control socket would be ↵Gravatar Joey Hess2012-09-13
| | | | too long (and use relative path to minimise path to the control socket).
* SHA256E is new default backendGravatar Joey Hess2012-09-12
| | | | | | | | The default backend used when adding files to the annex is changed from SHA256 to SHA256E, to simplify interoperability with OSX, media players, and various programs that needlessly look at symlink targets. To get old behavior, add a .gitattributes containing: * annex.backend=SHA256
* update depsGravatar Joey Hess2012-09-11
|
* add build dep on network-infoGravatar Joey Hess2012-09-07
|
* add network-multicast to bulld dependsGravatar Joey Hess2012-09-07
|
* test: Set a lot of git environment variables so testing works in strange ↵Gravatar Joey Hess2012-09-06
| | | | environments that normally need git config to set names, etc. Closes: #682351 Thanks, gregor herrmann
* Merge branch 'master' into assistantGravatar Joey Hess2012-08-27
|\ | | | | | | | | | | | | Conflicts: debian/changelog Updated changelog for assistant and webapp
| * releasing version 3.201208253.20120825Gravatar Joey Hess2012-08-25
| |
| * Bugfix: Fix fsck in SHA*E backends, when the key contains composite ↵Gravatar Joey Hess2012-08-24
| | | | | | | | extensions, as added in 3.20120721.
* | 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
|