summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* 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..
* | dead: Remove dead repository from all groups.Gravatar Joey Hess2012-10-10
| | | | | | | | This is less expensive than having inallgroup weed out dead repositories.
* | webapp: configure new repos to use the standard preferred content settingsGravatar Joey Hess2012-10-10
| |
* | rename --ingroup to --inallgroupGravatar Joey Hess2012-10-10
| |
* | releasing version 3.201210093.20121009Gravatar Joey Hess2012-10-09
| |
* | webapp automatic groupingGravatar Joey Hess2012-10-09
| | | | | | | | | | | | | | | | webapp: Adds newly created repositories to one of these groups: clients, drives, servers This is heuristic, but it's a pretty good heuristic, and can always be configured.
* | assistant: Now honors preferred content settings when deciding what to transfer.Gravatar Joey Hess2012-10-09
| | | | | | | | | | | | | | | | | | Both when queueing downloads, and uploads, consults the preferred content settings. I didn't make it check yet when requeing failed transfers or queuing deferred downloads; dealing with the preferred content settings (or indeed, other settings) changing while the assistant is running still needs work.
* | simplify changelogGravatar Joey Hess2012-10-08
| |
* | drop --auto --from with preferred contentGravatar Joey Hess2012-10-08
| | | | | | | | | | With --from, it needs to examine the preferred content of the repository being dropped from, instead of the local repository.
* | add --ingroup limitGravatar Joey Hess2012-10-08
| |
* | Added --smallerthan and --largerthan limitsGravatar Joey Hess2012-10-08
| |
* | wired preferred content up to get, copy, and drop --autoGravatar Joey Hess2012-10-08
| |
| * Merge branch 'master' into safesemaphoreGravatar Joey Hess2012-10-07
| |\ | |/ |/| | | | | Conflicts: debian/changelog
* | uninit: Unset annex.version. Closes: #689852Gravatar Joey Hess2012-10-07
| |
| * Depend on and use the Haskell SafeSemaphore library, which provides ↵Gravatar Joey Hess2012-10-05
|/ | | | exception-safe versions of SampleVar and QSemN. Thanks, Ben Gamari for an excellent patch set.
* Only build-depend on libghc-clientsession-dev on arches that will have the ↵Gravatar Joey Hess2012-10-04
| | | | webapp.
* vicfg: New command, allows editing (or simply viewing) most of the ↵Gravatar Joey Hess2012-10-03
| | | | | | | | | | | repository configuration settings stored in the git-annex branch. Incomplete; I need to finish parsing and saving. This will also be used for editing transfer control expresssions. Removed the group display from the status output, I didn't really like that format, and vicfg can be used to see as well as edit rempository group membership.
* always check with ls-files before adding new filesGravatar Joey Hess2012-10-02
| | | | | | | | | | | | | | | | | | | | | | | Makes it safe to use git annex unlock with the watcher/assistant. And also to mix use of the watcher/assistant with regular files stored in git. Long ago, I had avoided doing this check, except during the startup scan, because it would be slow to run ls-files repeatedly. But then I added the lsof check, and to make that fast, got it to detect batch file adds. So let's move the ls-files check to also occur when it'll have a batch, and can check them all with one call. This does slow down adding a single file by just a bit, but really only a little bit. (The lsof check is probably more expensive.) It also speeds up the startup scan, especially when there are lots of new files found by the scan. Also, fixed the sleep for annex.delayadd to not run while the threadstate lock is held, so it doesn't unnecessarily freeze everything else. Also, --force no longer makes it skip the lsof check, which was not documented, and seems never a good idea.
* A way to match files in repositories in a groupGravatar Joey Hess2012-10-01
| | | | | --copies=group:number can now be used to match files that are present in a specified number of repositories in a group.