summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* Merge branch 'master' into no-xmppGravatar Joey Hess2016-12-24
|\
| * Debian: Suggest tor and magic-wormhole.Gravatar Joey Hess2016-12-20
| | | | | | | | Suggests, not recommends, because tor is not for everyone.
| * p2p --pair with magic wormhole (untested)Gravatar Joey Hess2016-12-18
| | | | | | | | | | | | It builds. I have not tried to run it yet. :) This commit was sponsored by Jake Vosloo on Patreon.
| * Debian: Build webapp on armel.Gravatar Joey Hess2016-12-11
| |
| * fix typoGravatar Joey Hess2016-12-10
| |
| * refactor ref change watchingGravatar Joey Hess2016-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added to change notification to P2P protocol. Switched to a TBChan so that a single long-running thread can be started, and serve perhaps intermittent requests for change notifications, without buffering all changes in memory. The P2P runner currently starts up a new thread each times it waits for a change, but that should allow later reusing a thread. Although each connection from a peer will still need a new watcher thread to run. The dependency on stm-chans is more or less free; some stuff in yesod uses it, so it was already indirectly pulled in when building with the webapp. This commit was sponsored by Francois Marier on Patreon.
| * Merge branch 'master' into torGravatar Joey Hess2016-11-30
| |\
| | * prefer xdot over dotGravatar Joey Hess2016-11-30
| | | | | | | | | | | | | | | | | | | | | * map: Run xdot if it's available in PATH. On OSX, the dot command does not support graphical display, while xdot does. * Debian: xdot is a better interactive viewer than dot, so Suggest xdot, rather than graphviz.
| * | Added git-remote-tor-annex, which allows git pull and push to the tor hidden ↵Gravatar Joey Hess2016-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service. Almost working, but there's a bug in the relaying. Also, made tor hidden service setup pick a random port, to make it harder to port scan. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
| * | implementation of peer-to-peer protocolGravatar Joey Hess2016-11-17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For use with tor hidden services, and perhaps other transports later. Based on Utility.SimpleProtocol, it's a line-based protocol, interspersed with transfers of bytestrings of a specified size. Implementation of the local and remote sides of the protocol is done using a free monad. This lets monadic code be included here, without tying it to any particular way to get bytes peer-to-peer. This adds a dependency on the haskell package "free", although that was probably pulled in transitively from other dependencies already. This commit was sponsored by Jeff Goeke-Smith on Patreon.
* / remove xmpp supportGravatar Joey Hess2016-11-14
|/ | | | | | | | | | | | I've long considered the XMPP support in git-annex a wart. It's nice to remove it. (This also removes the NetMessager, which was only used for XMPP, and the daemonstatus's desynced list (likewise).) Existing XMPP remotes should be ignored by git-annex. This commit was sponsored by Brock Spratlen on Patreon.
* ENH: refreshed standalone-build patch and added locales into its build-dependsGravatar Yaroslav Halchenko2016-10-21
|
* Removed dependency on json library; all JSON is now handled by aeson.Gravatar Joey Hess2016-07-26
| | | | | I've eyeballed all --json commands, and the only difference should be that some fields are re-ordered.
* saner format for metadata --jsonGravatar Joey Hess2016-07-26
| | | | | | | | | | | | | metadata --json output format has changed, adding a inner json object named "fields" which contains only the fields and their values. This should be easier to parse than the old format, which mixed up metadata fields with other keys in the json object. Any consumers of the old format will need to be updated. This adds a dependency on unordered-containers for parsing MetaData from JSON, but it's a free dependency; aeson pulls in that library.
* Remove unnecessary rpaths in the git-annex binary, but only when it's built ↵Gravatar Joey Hess2016-07-06
| | | | using make, not cabal. This speeds up git-annex statup time by around 50%.
* Updated cabal file explictly lists source files.Gravatar Joey Hess2016-05-24
| | | | | | | | | | | | | | | | | | | The tarball on hackage will include only the files needed for cabal install; it is NOT the full git-annex source tree. While it's totally obnoxious that cabal files need every file listed out when basic wildcard support could avoid hundreds of lines, and have to be maintained when files are added, this does get the tarball size back down to 1 mb. This also stops stack from complaining that it found modules not listed in the cabal file. debian/changelog, debian/NEWS, debian/copyright: Converted to symlinks to CHANGELOG, NEWS, and COPYRIGHT, which used to symlink to these instead. This avoids needing to include debian/ in the hackage tarball. Setup.hs: Build man pages at install time using make and mdwn2man. If it fails, which it probably will on windows, just skip installing them.
* plumb RemoteGitConfig through to decryptCipherGravatar Joey Hess2016-05-23
|
* Pass the various gnupg-options configs to gpg in several cases where they ↵Gravatar Joey Hess2016-05-23
| | | | | | | | | | | | were not before. Removed the instance LensGpgEncParams RemoteConfig because it encouraged code that does not take the RemoteGitConfig into account. RemoteType's setup was changed to take a RemoteGitConfig, although the only place that is able to provide a non-empty one is enableremote, when it's changing an existing remote. This led to several folow-on changes, and got RemoteGitConfig plumbed through.
* Support building with ghc 8.0.1.Gravatar Joey Hess2016-05-23
|
* bump standards-versionGravatar Joey Hess2016-05-22
|
* unify handling of unusual GIT_INDEX_FILE relative pathGravatar Joey Hess2016-05-17
| | | | This is probably a git bug that stuck in its interface.
* Fix crash when entering/changing view in a subdirectory of a repo that has a ↵Gravatar Joey Hess2016-05-17
| | | | dotfile in its root.
* Work around git bug in handling of relative path to GIT_INDEX_FILE when in a ↵Gravatar Joey Hess2016-05-17
| | | | | | | | subdirectory of the repository. This affected git annex view. It turns out that some other places that use GIT_INDEX_FILE were already working around the bug. I removed the workaround from Annex.Branch since the new workaround will do.
* adjust: Add --fix adjustment, which is useful when the git directory is in a ↵Gravatar Joey Hess2016-05-16
| | | | nonstandard place.
* add: Adding a v6 pointer file used to annex it; now the pointer file is ↵Gravatar Joey Hess2016-05-16
| | | | | | added to git as-is. (git add of a pointer file already did the right thing)
* assistant: Fix race in v6 mode that caused downloaded file content to ↵Gravatar Joey Hess2016-05-16
| | | | | | | | | | | | sometimes not replace pointer files. The keys database handle needs to be closed after merging, because the smudge filter, in another process, updates the database. Old cached info can be read for a while from the open database handle; closing it ensures that the info written by the smudge filter is available. This is pretty horribly ad-hoc, and it's especially nasty that the transferrer closes the database every time.
* assistant: Fix bug that caused v6 pointer files to be annexed by the assistant.Gravatar Joey Hess2016-05-16
|
* adjust: If the adjusted branch already exists, avoid overwriting it, since ↵Gravatar Joey Hess2016-05-13
| | | | | | | | | | | | | | | | | it might contain changes that have not yet been propigated to the original branch. Could not think of a foolproof way to detect if the old adjusted branch was just behind the current branch. It's possible that the user amended the adjusting commit at the head of the adjusted branch, for example. I decided to bail in this situation, instead of just entering the old branch, so that if git annex adjust succeeds the user is always in a *current* adjusted branch, not some old and out of date one. What could perhaps be done is enter the old branch and then update it. But that seems too magical; the user may have rebased master or something or may not want to propigate the changes from the old branch. Best to error out.
* webapp: Avoid confusing display of dead remotes.Gravatar Joey Hess2016-05-12
|
* Change git annex info remote encryption description to use wording closer to ↵Gravatar Joey Hess2016-05-11
| | | | what's used in initremote.
* prep release6.20160511Gravatar Joey Hess2016-05-11
|
* Added new encryption=sharedpubkey mode for special remotes.Gravatar Joey Hess2016-05-10
| | | | | | This is useful for makking a special remote that anyone with a clone of the repo and your public keys can upload files to, but only you can decrypt the files stored in it.
* In the unusual configuration where annex.crippledfilesystem=true but ↵Gravatar Joey Hess2016-05-10
| | | | | | | core.symlinks=true, store object contents in mixed case hash directories so that symlinks will point to them. Contents are searched for in both locations, same as before, so this does not add any overhead.
* fsck: When a key is not previously known in the location log, record ↵Gravatar Joey Hess2016-05-10
| | | | something so that reinject --known will work.
* Added annex.gnupg-decrypt-options and ↵Gravatar Joey Hess2016-05-10
| | | | | | | | | | | remote.<name>.annex-gnupg-decrypt-options, which are passed to gpg when it's decrypting data. The naming is unofrtunately not consistent, but the gnupg-options were only used for encrypting, and it's too late to change that. It would be nice to have a third setting that is always passed to gnupg, but ~/.gnupg/options can be used to specify such global options when really needed.
* Windows: Fix an over-long temp directory name.Gravatar Joey Hess2016-05-06
|
* Propigate GIT_DIR and GIT_WORK_TREE environment to external special remotes.Gravatar Joey Hess2016-05-06
| | | | | | | | | Since git-annex unsets these when started, they have to be explicitly propigated. Also, this makes --git-dir and --work-tree settings be reflected in the environment. The need for this came up in https://github.com/DanielDent/git-annex-remote-rclone/issues/3
* version: Display OS version and architecture too.Gravatar Joey Hess2016-05-05
|
* new simpler windows build environment using stack and git for windows and no ↵Gravatar Joey Hess2016-05-05
| | | | cygwin
* map: Hide dead repositories that are not connected to the graph.Gravatar Joey Hess2016-05-04
| | | | | | * map: Hide dead repositories that are not connected to the graph. * map: Changed colors; red is used for untrusted repositories and grey for dead.
* Windows: Fix several bugs in propigation of changes from the adjusted branch ↵Gravatar Joey Hess2016-05-04
| | | | back to the master branch.
* git-annex.cabal: Add Setup-Depends.Gravatar Joey Hess2016-05-04
|
* use DIRHASH-LOWER for consistencyGravatar Joey Hess2016-05-03
|
* Added DIRHASH_LOWER to external special remote protocol.Gravatar Joey Hess2016-05-03
|
* Android: Icon refresh. Thanks, freewheelinfranks.Gravatar Joey Hess2016-05-03
|
* Improve behavior when a just added http remote is not available during uuid ↵Gravatar Joey Hess2016-05-03
| | | | probe. Do not mark it as annex-ignore, so it will be tried again later.
* Fix bug that sometimes prevented git-annex smudge --clean from consuming all ↵Gravatar Joey Hess2016-05-02
| | | | its input, which resulted in git add bypassing git-annex.
* correction of scope of security problemGravatar Joey Hess2016-04-28
| | | | | AFAICS, it's not only affecting resumes, but any upload to a special remote with chunking enabled.
* Fix build with directory-1.2.6.2.Gravatar Joey Hess2016-04-28
| | | | | | It started exporting a isSymbolicLink which supports windows. But, git-annex does no use symlinks on windows yet and this conflicts with the function by the same name from unix-compat, so hide it.
* releasing package git-annex version 6.201604196.20160419Gravatar Joey Hess2016-04-28
|