Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'
add news item for git-annex 5.20140529
Added a comment
Added a comment
webapp: When adding a new local repository, fix bug that caused its group and preferred content to be set in the current repository, even when not combining.

There was a tricky bit here, when it does combine, the edit form is shown,
and so the info needs to be committed to the new repository, but then
pulled into the current one. And caches need to be invalidated for it
to be visible in the edit form.
lazy bytestring fromStrict is not available in stable; use fromChunks instead
Merge branch 'master' of ssh://git-annex.branchable.com
Added a comment
bug
Added a comment
webapp: Avoid stomping on existing group and preferred content settings when adding a local repository (or removable drive repository) that already exists.

This does mean that if the webapp is asked to add a git repository on
a removable drive that already exists, but is not yet a git-annex
repository, it will avoid putting it in any group. That unlikely edge case
is ok; the next step is the edit repository screen, which will show it's
not in any group and the user can pick one.
fetch from removable drive when adding

When adding a repo from a removable drive that already exists, fetch
from it before showing the edit form, so it will have the existing
configuration of that repo.
webapp: avoid overwriting remote configs when enabling it

Avoid stomping on existing group and preferred content settings
when enabling or combining with an already existing remote.

Two level fix. First, use defaultStandardGroup rather than
setStandardGroup, so if there is an existing configuration in the git-annex
branch, it's not overwritten.

To handle pre-existing ssh remotes (including gcrypt), a second level is
needed, because before syncing with the remote, it's configuration won't be
available locally. (And syncing could take a long time.) So, in this case,
keep track of whether the remote is being created or enabled, and only set
configs when creating it.

This commit was sponsored by Anders Lannerback.
don't show edit form after enabling ssh remote

Just after enabing a ssh remote, we've not synced with it yet, so its
description and group are not known. So, avoid showing edit form so user
doesn't see blank info. Instead, redirect to dashboard.
also normalize /~/
avoid stomping on existing description when enabling a special remote

Happened with eg, gcrypt remotes.
fix UI when enabling existing gcrypt repo

avoid editing repo for same reasons as in
52601eb6067037e197b5c0b56c257482d968b465

avoid stomping on its description, even though no description exists until
after syncing is complete
Merge branch 'master' of ssh://git-annex.branchable.com