summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* update tags on dev buildGravatar Joey Hess2013-03-11
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-11
|\
* | finish fast direct mode rename handling. wow, it's fastGravatar Joey Hess2013-03-11
| |
| * (no commit message)Gravatar https://launchpad.net/~arand2013-03-11
|/
* fix changeFile to not be partialGravatar Joey Hess2013-03-11
| | | | That led to runtime crashes, without even a warning from -Wall. Yipes!
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-11
|\
* | detect renames during commit, and .. um, do nothing special because it's ↵Gravatar Joey Hess2013-03-11
| | | | | | | | | | | | lunch time But I'm well set up to fast-track direct mode adds for renames now.
| * Added a commentGravatar http://joeyh.name/2013-03-11
| |
* | an (important) thoughtGravatar Joey Hess2013-03-11
| |
* | taggingGravatar Joey Hess2013-03-11
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-11
|\
* | Added remote.<name>.annex-gnupg-options setting. Thanks, guilhem for the patch.Gravatar Joey Hess2013-03-11
| |
* | GnuPG options for symmetric encryption.Gravatar guilhem2013-03-11
| |
| * poll vote (An Ubuntu PPA would be supercool! Thanks for your great work!!)Gravatar 59.167.254.1842013-03-11
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82013-03-11
| |
| * Added a commentGravatar https://launchpad.net/~arand2013-03-11
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmeki7KlfJpAAN9CUmi9EdwhwBmIhDMYuE2013-03-11
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-11
|\
* | remove Eq instance for InodeCacheGravatar Joey Hess2013-03-11
| | | | | | | | | | | | | | | | | | There are two types of equality here, and which one is right varies, so this forces me to consider and choose between them. Based on this, I learned that the commit in git anex sync was always doing a strong comparison, even when in a repository where the inodes had changed. Fixed that.
| * Added a commentGravatar http://joeyh.name/2013-03-11
| |
* | fix linksGravatar Joey Hess2013-03-11
| |
* | noteGravatar Joey Hess2013-03-11
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmu416zAYgYzbXVZAe30MiXoOWO4z6nGX82013-03-11
|/
* moved all wishlist stuff out of the forum; and closed a bunch of themmovedGravatar Joey Hess2013-03-11
| | | | | | | | | | | all wishlist stuff out of the forum; and closed a bunch of themmoved all wishlist stuff out of the forum; and closed a bunch of themmoved all wishlist stuff out of the forum; and closed a bunch of themmoved all wishlist stuff out of the forum; and closed a bunch of themmoved all wishlist stuff out of the forum; and closed a bunch of themmoved all wishlist stuff out of the forum; and closed a bunch of themmoved all wishlist stuff out of the forum; and closed a bunch of themmoved all wishlist stuff out of the forum; and closed a bunch of them
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-11
|\
* | skip non-directories in statusGravatar Joey Hess2013-03-11
| |
| * Added a commentGravatar http://joeyh.name/2013-03-11
| |
| * Added a commentGravatar http://joeyh.name/2013-03-11
| |
| * Added a commentGravatar http://joeyh.name/2013-03-11
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-11
|\
* | status: Can now be run with a directory path to show only the status of that ↵Gravatar Joey Hess2013-03-11
| | | | | | | | directory, rather than the whole annex.
| * Added a commentGravatar http://joeyh.name/2013-03-11
|/
* addurl url escaping fooGravatar Joey Hess2013-03-10
| | | | | | * addurl: Escape invalid characters in urls, rather than failing to use an invalid url. * addurl: Properly handle url-escaped characters in file:// urls.
* avoid using curl for file:// urls since it's buggyGravatar Joey Hess2013-03-10
|
* let's put type modules under the parent module, not in a Types directoryGravatar Joey Hess2013-03-10
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-10
|\
* | assistant: generate better commits for renamesGravatar Joey Hess2013-03-10
| |
* | tweakGravatar Joey Hess2013-03-10
| |
* | add back cabal-install (for Makefile)Gravatar Joey Hess2013-03-10
| |
| * Added a commentGravatar https://launchpad.net/~arand2013-03-10
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-03-10
|\|
* | blog for the dayGravatar Joey Hess2013-03-10
| |
* | bugfix: drop --from an unavailable remote no longer updates the location ↵Gravatar Joey Hess2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log, incorrectly, to say the remote does not have the key. The comments correctly noted that the remote could drop the key and yet False be returned due to some problem that occurred afterwards. For example, if it's a network remote, it could drop the key just as the network goes down, and so things timeout and a nonzero exit from ssh is propigated through and False returned. However... Most of the time, this scenario will not have happened. False will mean the remote was not available or could not drop the key at all. So, instead of assuming the worst, just trust the status we have. If we get it wrong, and the scenario above happened, our location log will think the remote has the key. But the remote's location log (assuming it has one) will know it dropped it, and the next sync will regain consistency. For a special remote, with no location log, our location log will be wrong, but this is no different than the situation where someone else dropped the key from the remote and we've not synced with them. The standard paranoia about not trusting the location log to be the last word about whether a remote has a key will save us from these situations. Ie, if we try to drop the file, we'll actively check the remote, and determine the inconsistency then.
* | avoid ugly alert caused by trying to push to unavailable removable driveGravatar Joey Hess2013-03-10
| |
* | moved transfer queueing out of watcher and into committerGravatar Joey Hess2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | This cleaned up the code quite a bit; now the committer just looks at the Change to see if it's a change that needs to have a transfer queued for it. If I later want to add dropping keys for files that were removed, or something like that, this should make it straightforward. This also fixes a bug. In direct mode, moving a file out of an archive directory failed to start a transfer to get its content. The problem was that the file had not been committed to git yet, and so the transfer code didn't want to touch it, since fileKey failed to get its key. Only starting transfers after a commit avoids this problem.
| * Added a commentGravatar https://launchpad.net/~arand2013-03-10
| |
* | copyToRemote should return True when the remote already has the keyGravatar Joey Hess2013-03-10
| | | | | | | | | | | | | | | | This got broken in commit e9238e958877dff9d12a5a0ed396e93931de95ce. I observed a key that had been copied to a remote, but the location log was out of date, and due to this bug, git annex transferkey failed and so the file could not be dropped when it was moved to an archive directory.
| * rename ↵Gravatar https://launchpad.net/~arand2013-03-10
| | | | | | | | bugs/addurl_file:/_doesn__39__t_work_with_spaces_in_filenames_and_--fast.mdwn to bugs/addurl_file_doesn__39__t_work_with_spaces_in_filenames_and_--fast.mdwn
| * rename ↵Gravatar https://launchpad.net/~arand2013-03-10
| | | | | | | | bugs/addurl_file:__47____47___doesn__39__t_work_with_spaces_in_filenames.mdwn to bugs/addurl_file://_doesn__39__t_work_with_spaces_in_filenames_and_--fast.mdwn
* | switch CABAL to cabalGravatar Joey Hess2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | <joeyh> anyone know why runghc Setup.hs is behaving differently than cabal configure for me? <joeyh> I'm getting different flags selected <geekosaur> joeyh, runghc Setup.hs uses --global by default <geekosaur> cabal uses --local <nomeata> joeyh: I don’t know the reasons, but I have made similar observations as well <geekosaur> and if that means different libraries/versions visible, that can affect flag solving <joeyh> aha! <monochrom> it is because Cabal authors expect normal people to use cabal-install and linux distro creators to use Setup <monochrom> the expectation is documented nowhere