| Commit message (Collapse) | Author | Age |
|---|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
| |
files and reading from checksum commands.
|
| |
|
|
| |
than moving to .git/annex/bad/
|
| | |
|
| |
|
|
| |
key for corrupt data.
|
| |
|
|
| |
too long (and use relative path to minimise path to the control socket).
|
| |
|
|
|
|
|
|
| |
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
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
environments that normally need git config to set names, etc. Closes: #682351 Thanks, gregor herrmann
|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
debian/changelog
Updated changelog for assistant and webapp
|
| | | |
|
| | |
| |
| |
| | |
extensions, as added in 3.20120721.
|
| | |
| |
| |
| | |
extensions, as added in 3.20120721.
|
| |\|
| |
| |
| |
| |
| | |
Conflicts:
Makefile
debian/copyright
|
| | |
| |
| |
| |
| | |
This is a simple application of inkscape's rather amazing tracing
capabilities.
|
| |\|
| |
| |
| |
| | |
Conflicts:
debian/changelog
|
| | | |
|
| |\|
| |
| |
| |
| | |
Conflicts:
debian/changelog
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
debian/changelog
|
| | |/ |
|
| | | |
|
| |\| |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |\|
| |
| |
| |
| | |
Conflicts:
Init.hs
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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..
|
| |\| |
|
| | |
| |
| |
| | |
automatically be generated, like "joey@gnu:~/foo"
|
| |\| |
|
| | |
| |
| |
| | |
config is valid.
|
| | |
| |
| |
| | |
This does fix some UI issues I was having.
|
| | |
| |
| |
| | |
another dependency cabal works without here, oddly
|
| | |
| |
| |
| | |
mocked up the main screen, and am actually pretty happy with it!
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| |
| | |
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.
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| | |
Conflicts:
git-annex.cabal
|
| | | |
|
| | |
| |
| |
| |
| | |
This is an unholy mashup, but it just might work. It works on Linux,
that's all I've tested. :)
|
| | |
| |
| |
| | |
Currently only prints mount points when mounts happen.
|
| |/
|
|
|
|
|
|
|
| |
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.
|
| | |
|
Joey Hess