| Commit message (Collapse) | Author | Age |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
debian/changelog
Updated changelog for assistant and webapp
|
| | | |
|
| | |
| |
| |
| | |
extensions, as added in 3.20120721.
|
| | |
| |
| |
| | |
extensions, as added in 3.20120721.
|
| |\|
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
| |
|
|
| |
Closes: #680450
|
| |
|
|
| |
faster than forking the more optimised external program.
|
| |
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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!
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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).
|
| | |
|
| |
|
|
| |
untested, but it compiles :)
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
| |
Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/
although I don't know how to reproduce that bug.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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".
|
| |
|
|
| |
disables the watch command.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | |
| |
| |
| |
| |
| | |
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.
|
| |/
|
|
|
| |
Kqueue code for dispatching events is not tested and probably doesn't
build.
|
| |
|
|
|
|
| |
Could not reproduce the build failure I had seen related to this,
but the numbers were wrong with statfs64. Probably pulling from the wrong
place in the structure. statvfs seems to work..
|
| |\ |
|
| | | |
|
| | |
| |
| |
| | |
#677576
|
| |\|
| |
| |
| |
| |
| | |
Conflicts:
debian/changelog
git-annex.cabal
|
| | |
| |
| |
| | |
even when installing under $HOME. Thanks, Nathan Collins
|
| | |
| |
| |
| |
| |
| | |
This reverts commit 129f6123fe933310829986fd5a99a9fd6911ca0f.
Saw hang during batch add with -threaded, so deferred for now.
|
| | |
| |
| |
| | |
Sort of a work around for http://bugs.debian.org/677096
|
| |\|
| |
| |
| |
| | |
Conflicts:
debian/changelog
|
| | | |
|
| |\| |
|
| | |
| |
| |
| |
| |
| |
| | |
This ensures that all special remotes show up in git annex status.
Before, a special remote that was not manually described, and was not
a current git remote, did not show up there, although initremote did list
it.
|
Joey Hess