Commit graph

9128 commits

Author SHA1 Message Date
Joey Hess
61c5e8736c detect renames during commit, and .. um, do nothing special because it's lunch time
But I'm well set up to fast-track direct mode adds for renames now.
2013-03-11 12:56:47 -04:00
Joey Hess
82b718e830 an (important) thought 2013-03-11 10:10:17 -04:00
Joey Hess
bff949baa8 tagging 2013-03-11 10:03:10 -04:00
Joey Hess
96d42ebe91 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-11 09:52:07 -04:00
Joey Hess
6d6aa13df5 Added remote.<name>.annex-gnupg-options setting. Thanks, guilhem for the patch. 2013-03-11 09:49:52 -04:00
guilhem
d2bc0e9f3e GnuPG options for symmetric encryption. 2013-03-11 09:48:38 -04:00
59.167.254.184
d72a46f48d poll vote (An Ubuntu PPA would be supercool! Thanks for your great work!!) 2013-03-11 11:55:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
c1e3053272 2013-03-11 11:40:06 +00:00
https://launchpad.net/~arand
d2e22d65a1 Added a comment 2013-03-11 10:34:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmeki7KlfJpAAN9CUmi9EdwhwBmIhDMYuE
ff2a32043f Added a comment 2013-03-11 09:40:43 +00:00
Joey Hess
d529b7807f Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-11 02:59:44 -04:00
Joey Hess
40df015d90 remove Eq instance for InodeCache
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.
2013-03-11 02:57:48 -04:00
http://joeyh.name/
7f99294cd4 Added a comment 2013-03-11 06:31:10 +00:00
Joey Hess
eef93fc0a5 fix links 2013-03-11 02:10:18 -04:00
Joey Hess
e08d1e8e2b note 2013-03-11 02:09:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmu416zAYgYzbXVZAe30MiXoOWO4z6nGX8
fd3ceb60e2 2013-03-11 06:08:23 +00:00
Joey Hess
dc19b2398d moved 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 themmoved all
wishlist stuff out of the forum; and closed a bunch of them
2013-03-11 02:07:04 -04:00
Joey Hess
e7da1dfd29 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-11 01:37:58 -04:00
Joey Hess
0deb0a9658 skip non-directories in status 2013-03-11 01:37:26 -04:00
http://joeyh.name/
dee1a9f1bf Added a comment 2013-03-11 05:33:09 +00:00
http://joeyh.name/
a687423565 Added a comment 2013-03-11 05:31:04 +00:00
http://joeyh.name/
926c299c56 Added a comment 2013-03-11 05:27:38 +00:00
Joey Hess
fdf098db31 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-11 01:25:55 -04:00
Joey Hess
baf226e313 status: Can now be run with a directory path to show only the status of that directory, rather than the whole annex. 2013-03-11 01:22:56 -04:00
http://joeyh.name/
4cc2b2136c Added a comment 2013-03-11 03:04:44 +00:00
Joey Hess
0ecd05c28d addurl url escaping foo
* addurl: Escape invalid characters in urls, rather than failing to
  use an invalid url.
* addurl: Properly handle url-escaped characters in file:// urls.
2013-03-10 23:00:33 -04:00
Joey Hess
eedd248371 avoid using curl for file:// urls since it's buggy 2013-03-10 22:34:44 -04:00
Joey Hess
74f723bb50 let's put type modules under the parent module, not in a Types directory 2013-03-10 22:24:13 -04:00
Joey Hess
82d28a7eb8 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-10 22:11:10 -04:00
Joey Hess
2762ab03b4 assistant: generate better commits for renames 2013-03-10 22:10:26 -04:00
Joey Hess
b2c7ee5551 tweak 2013-03-10 20:20:58 -04:00
Joey Hess
3816c6c82a add back cabal-install (for Makefile) 2013-03-10 20:16:57 -04:00
https://launchpad.net/~arand
7733dd2d97 Added a comment 2013-03-10 23:29:55 +00:00
Joey Hess
0633a33643 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-10 19:16:59 -04:00
Joey Hess
19b515fb9a blog for the day 2013-03-10 19:16:38 -04:00
Joey Hess
a3eac50fe9 bugfix: drop --from an unavailable remote no longer updates the location 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.
2013-03-10 19:15:53 -04:00
Joey Hess
f27c21eb0c avoid ugly alert caused by trying to push to unavailable removable drive 2013-03-10 18:42:28 -04:00
Joey Hess
65a4c7966f moved transfer queueing out of watcher and into committer
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.
2013-03-10 18:16:03 -04:00
https://launchpad.net/~arand
174b8682ef Added a comment 2013-03-10 21:56:04 +00:00
Joey Hess
69ab9701eb copyToRemote should return True when the remote already has the key
This got broken in commit e9238e9588.
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.
2013-03-10 17:54:27 -04:00
https://launchpad.net/~arand
56d86e2d4a rename 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 2013-03-10 21:54:14 +00:00
https://launchpad.net/~arand
23cf258da3 rename 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 2013-03-10 21:48:35 +00:00
Joey Hess
b889721afd switch CABAL to cabal
<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
2013-03-10 17:21:13 -04:00
https://launchpad.net/~arand
a085456c76 2013-03-10 21:18:47 +00:00
https://launchpad.net/~arand
a32f2af8bf 2013-03-10 21:01:34 +00:00
Joey Hess
14459a186f allow overriding CABAL 2013-03-10 16:44:03 -04:00
Joey Hess
01ce6849de use clientSessionBackend2 where available
avoids a warning, which says it's faster
2013-03-10 16:02:16 -04:00
Joey Hess
56830af8d8 simpler use of MIN_VERSION checks 2013-03-10 15:43:17 -04:00
https://launchpad.net/~arand
0e38c60c14 2013-03-10 17:20:38 +00:00
http://joeyh.name/
98a088412f Added a comment 2013-03-10 16:58:44 +00:00