summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* assistant: Fix syncing local drives.Gravatar Joey Hess2012-10-30
| | | | | Amoung other things, this makes it immediately sync files from a removable drive when it's added.
* webapp: Make an initial, empty commit so there is a master branchGravatar Joey Hess2012-10-30
| | | | Several things only happen when on a branch, so make sure we're on one.
* add build-dep on blaze-markupGravatar Joey Hess2012-10-30
| | | | which blaze-html depends on, so not a significant new dep
* The standalone tarball's runshell now takes care of installing a ↵Gravatar Joey Hess2012-10-29
| | | | ~/.ssh/git-annex-shell wrapper the first time it's run.
* rsync special remote: Include annex-rsync-options when running rsync to test ↵Gravatar Joey Hess2012-10-28
| | | | | | | a key's presence. Also, use the new withQuietOutput function to avoid running the shell to /dev/null stderr in two other places.
* recommend bind9-hostGravatar Joey Hess2012-10-27
|
* updateGravatar Joey Hess2012-10-27
|
* Merge branch 'xmpp'Gravatar Joey Hess2012-10-27
|\
| * gnutls segfault fixedGravatar Joey Hess2012-10-26
| | | | | | | | | | | | | | | | Adjust build deps to ensure that only a fixed version of the library will be used. Also, removed the bound thread stuff, which I now think was (probably) a red herring.
* | fix syntaxGravatar Joey Hess2012-10-26
| |
| * Merge branch 'master' into xmppGravatar Joey Hess2012-10-26
| |\ | |/ |/| | | | | Conflicts: Assistant/Threads/NetWatcher.hs
* | NetWatcher: When dbus connection is lost, try to reconnect.Gravatar Joey Hess2012-10-26
| | | | | | | | | | | | | | | | MountWatcher can't do this, because it uses the session dbus, and won't have access to the new DBUS_SESSION_BUS_ADDRESS if a new session is started. Bumped dbus library version, FD leak in it is fixed.
| * Merge branch 'master' into xmppGravatar Joey Hess2012-10-26
| |\ | |/ |/| | | | | | | Conflicts: Assistant/Threads/MountWatcher.hs Assistant/Threads/NetWatcher.hs
* | Use USER and HOME environment when set, and only fall back to getpwent, ↵Gravatar Joey Hess2012-10-25
| | | | | | | | which doesn't work with LDAP or NIS.
| * Merge branch 'master' into xmppGravatar Joey Hess2012-10-25
| |\ | |/ |/|
* | Re-enable dbus, using a new version of the library that fixes the memory leak.Gravatar Joey Hess2012-10-25
| | | | | | | | | | | | | | For now, when dbus goes away, the assistant keeps running but does not fall back or reconnect. To do so needs more changes to the DBus library; in particular a connectSessionWith and connectSystemWith to let me specify my own clientThreadRunner.
| * Merge remote-tracking branch 'origin/master' into xmppGravatar Joey Hess2012-10-25
| |\ | |/ |/| | | | | Conflicts: doc/design/assistant/cloud.mdwn
* | configure: Check that checksum programs produce correct checksums. + bitter rantGravatar Joey Hess2012-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So, it might be called sha1sum, or on some other OS, it might be called sha1. It might be hidden away off of PATH on that OS. That's just expected insanity; UNIX has been this way since 1980's. And these days, nobody even gives the flying flip about standards that we briefly did in the 90's after the first round of unix wars. But it's the 2010's now, and we've certainly learned something. So, let's make it so sometimes sha1 is a crazy program that wants to run as root so it can lock memory while prompting for a passphrase, and outputting binary garbage. Yes, that'd be wise. Let's package that in major Linux distros, too, so users can stumble over it.
| * Merge branch 'master' into xmppGravatar Joey Hess2012-10-24
| |\ | |/ |/|
* | bugfix: Don't fail transferring content from read-only repos. Closes: #691341Gravatar Joey Hess2012-10-24
| | | | | | | | | | This used to work, but got broken when the transfer info files were added, as it failed writing them on the readonly filesystem.
| * added network-protocol-xmpp and -DWITH_XMPPGravatar Joey Hess2012-10-23
|/
* bup: Don't pass - to bup-split to make it read stdinGravatar Joey Hess2012-10-23
| | | | | | | bup 0.25 does not accept that; and bup split reads from stdin by default if no file is given. I'm not sure what version of bup changed this. This only affected bup special remotes that were encrypted.
* webapp: Switched to using the same multicast IP address that avahi uses.Gravatar Joey Hess2012-10-22
|
* uninit: Check and abort if there are symlinks to annexed content that are ↵Gravatar Joey Hess2012-10-22
| | | | not checked into git.
* webapp: Allow dashes in ssh key comments when pairing.Gravatar Joey Hess2012-10-22
|
* OSX: Stop installing non-self-contained webapp into Desktop directory.Gravatar Joey Hess2012-10-21
| | | | This was a stopgap, and we have the self-contained webapp now.
* file:/// URLs can now be used with the web special remote.Gravatar Joey Hess2012-10-21
|
* add ConfigMonitor threadGravatar Joey Hess2012-10-20
| | | | | | | | | | | | | | | | | | | | Monitors git-annex branch for changes, which are noticed by the Merger thread whenever the branch ref is changed (either due to an incoming push, or a local change), and refreshes cached config values for modified config files. Rate limited to run no more often than once per minute. This is important because frequent git-annex branch changes happen when files are being added, or transferred, etc. A primary use case is that, when preferred content changes are made, and get pushed to remotes, the remotes start honoring those settings. Other use cases include propigating repository description and trust changes to remotes, and learning when a remote has added a new special remote, so the webapp can present the GUI to enable that special remote locally. Also added a uuid.log cache. All other config files already had caches.
* updateGravatar Joey Hess2012-10-20
|
* Merge branch 'safesemaphore'Gravatar Joey Hess2012-10-20
|\ | | | | | | | | | | Conflicts: debian/changelog git-annex.cabal
* | Replace "in=" with "present" in preferred content expressionsGravatar Joey Hess2012-10-19
| | | | | | | | | | | | | | | | | | | | | | | | in= was problimatic in two ways. First, it referred to a remote by name, but preferred content expressions can be evaluated elsewhere, where that remote doesn't exist, or a different remote has the same name. This name lookup code could error out at runtime. Secondly, in= seemed pretty useless. in=here did not cause content to be gotten, but it did let present content be dropped. present is more useful, although "not present" is unstable and should be avoided.
* | Preferred content path matching bugfix.Gravatar Joey Hess2012-10-17
| | | | | | | | | | | | | | When in a subdir, both the normal filepath, and the filepath relative to the top of the git repo are needed for matching. The former for key lookup, and the latter for include/exclude to match against. Previously, key lookup didn't work in this situation.
* | Fix handling of GIT_DIR when it refers to a git submodule.Gravatar Joey Hess2012-10-17
| | | | | | | | | | | | The old code was just wrong in taking fromPath of GIT_DIR -- that made an localUnknown location with the GIT_DIR in it, which only worked by accident, and failed in submodules.
* | releasing version 3.201210173.20121017Gravatar Joey Hess2012-10-16
| |
* | Fix zombie cleanup reversion introduced in 3.20121009.Gravatar Joey Hess2012-10-16
| |
* | releasing version 3.201210163.20121016Gravatar Joey Hess2012-10-16
| |
* | Temporarily disable use of dbus, as the haskell dbus library blows up when ↵Gravatar Joey Hess2012-10-16
| | | | | | | | losing connection, which will need to be fixed upstream.
* | A relative core.worktree is relative to the gitdir.Gravatar Joey Hess2012-10-16
| | | | | | | | | | | | | | | | Now that this is handled correctly, git-annex can be used in git submodules. Also, fixed infelicity where Git.CurrentRepo and Git.Config.updateLocation were both dealing with core.worktree. Now updateLocation handles it for Local as well as for LocalUnknown repos.
* | changelogGravatar Joey Hess2012-10-15
| |
* | Bug fix: A recent change caused git-annex-shell to crash.Gravatar Joey Hess2012-10-15
| |
* | vicfg: New file format, avoids ambiguity with repos that have the same ↵Gravatar Joey Hess2012-10-12
| | | | | | | | | | | | | | | | | | description, or no description. This is also nice in that uuids are all the same length, so the values of each line, line up. Also a great deal of boilerplate elimination.
* | releasing version 3.201210103.20121010Gravatar Joey Hess2012-10-12
| |
* | Automatically detect when a ssh remote does not have git-annex-shell ↵Gravatar Joey Hess2012-10-12
| | | | | | | | | | | | | | | | | | | | | | installed, and set annex-ignore. Aka solve the github problem. Note that it's possible the initial configlist will fail for some network reason etc, and then the fetch succeeds. In this case, a usable remote gets disabled. But it does print a message, and this only happens once per remote, so that seems ok.
* | Fix a crash when merging files in the git-annex branch that contain invalid ↵Gravatar Joey Hess2012-10-12
| | | | | | | | | | | | | | utf8. The crash actually occurred when writing out the file, which was done to a handle that had not had fileSystemEncoding applied to it.
* | git config remote.name.annex-sync can be used to control whether a remote ↵Gravatar Joey Hess2012-10-11
| | | | | | | | gets synced.
* | allow disabling syncing to a repo on its edit formGravatar Joey Hess2012-10-11
| | | | | | | | | | This is not quite right yet, since it disables it so hard it doesn't show up in the repo list anymore!
* | webapp: Improve wording of intro display. Closes: #689848Gravatar Joey Hess2012-10-11
| |
* | Makefile: Avoid building with -threaded if the ghc threaded runtime does not ↵Gravatar Joey Hess2012-10-11
| | | | | | | | | | | | | | | | exist. This should fix build on mips, mipsel, s390, s390x, and sparc. cabal doesn't test this yet.
* | test: Fix threaded runtime hang.Gravatar Joey Hess2012-10-11
| | | | | | | | | | | | | | | | | | There was one forkProcess lurking in test.hs, and that seems to be responsible for recent buildd failures on amd64 and armhf. I was able to reproduce it pretty easily on amd64, and even once on i386, and it was clearly that same bad old threaded runtime hang. So removing this forkProcess should fix it. Odd that it lurked for some months before popping up.
* | Avoid unsetting HOME when running certian git commands. Closes: #690193Gravatar Joey Hess2012-10-11
| | | | | | | | | | | | | | | | | | | | | | | | Setting GIT_INDEX_FILE clobbers the rest of the environment, making git not read ~/.gitconfig, and blow up if GECOS didn't have a name for the user. I'm not entirely happy with getEnvironment being run every time now, that's somewhat expensive. It may make sense to just set GIT_COMMITTER_* and GIT_AUTHOR_*, but I worry that clobbering the rest could break PATH, or GIT_PATH, or something else that might be used by a command run in here. And caching the environment is not a good idea either; it can change..