summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Support GIT_SSH and GIT_SSH_COMMANDGravatar Joey Hess2017-03-17
| | | | | | | | | | | | | | | | | | | | They are handled close the same as they are by git. However, unlike git, git-annex sometimes needs to pass the -n parameter when using these. So, this has the potential for breaking some setup, and perhaps there ought to be a ANNEX_USE_GIT_SSH=1 needed to use these. But I'd rather avoid that if possible, so let's see if anyone complains. Almost all places where "ssh" was run have been changed to support the env vars. Anything still calling sshOptions does not support them. In particular, rsync special remotes don't. Seems that annex-rsync-transport already gives sufficient control there. (Fixed in passing: Remote.Helper.Ssh.toRepo used to extract remoteAnnexSshOptions and pass them to sshOptions, which was redundant since sshOptions also extracts those.) This commit was sponsored by Jeff Goeke-Smith on Patreon.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-17
|\
* | git-annex-shell: run all commands with noMessagesGravatar Joey Hess2017-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when used with a recently cloned repository, where "merging" messages were included in the output of configlist (and perhaps other commands) and caused a "Failed to get annex.uuid configuration" error. This does not seem to have been a reversion. I saw this with configlist, but it seems possible for other commands to be effected, and it might not always happen only after a fresh clone. Eg, if a foo/git-annex branch is pushed to the remote, the next git-annex-shell will auto-merge it and display the message. Decided to run all git-annex-shell commands with noMessages, even ones that don't currently use stdout for structured communication. Better to keep open the possibility for using stdout in the future. This commit was supported by the NSF-funded DataLad project
| * fixing benGravatar yarikoptic2017-03-17
| |
| * added BenGravatar yarikoptic2017-03-17
| |
* | bug reportGravatar Joey Hess2017-03-17
| |
| * (no commit message)Gravatar yarikoptic2017-03-17
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-16
|\|
| * Added a comment: v6 default behaviorGravatar rok2017-03-16
| |
| * Added a commentGravatar kubaello@d561f15ff5c07a78b706b096375cd89d6d7060662017-03-16
| |
| * (no commit message)Gravatar kubaello@d561f15ff5c07a78b706b096375cd89d6d7060662017-03-16
| |
| * tuned up rushed reportGravatar yarikoptic2017-03-16
| |
| * (no commit message)Gravatar yarikoptic2017-03-15
| |
* | commentGravatar Joey Hess2017-03-14
|/
* Added a comment: Isn't this procedure assuming that lost+found contains only ↵Gravatar https://launchpad.net/~stephane-gourichon-lpad2017-03-14
| | | | uncorrupted previously annexed files?
* Added a commentGravatar Horus2017-03-14
|
* (no commit message)Gravatar ryan@d4f0c2d3daacb5ec3a2945bca06f66decad4bfb52017-03-14
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-13
|\
* | close; not a bug in git-annexGravatar Joey Hess2017-03-13
| |
* | Windows: Fix bug in shell script shebang lookup code that caused a "delayed ↵Gravatar Joey Hess2017-03-13
| | | | | | | | | | | | | | | | | | read on closed handle" error. The bug was that withFile closes the handle afterwards, but the content of the file was not read due to laziness. Using readFile avoids it. This commit was sponsored by Nick Daly on Patreon.
| * Added a comment: windows passwordGravatar hobbie1232017-03-13
| |
| * initial postGravatar lee@7614f42c1a6cc84dbc813df25d2f75ed54948e172017-03-12
| |
| * Added a comment: SolutionGravatar Michel2017-03-11
| |
* | Drop support for building with old versions of directory, feed, and http-types.Gravatar Joey Hess2017-03-10
| |
* | Revert "Drop support for building without network-uri."Gravatar Joey Hess2017-03-10
| | | | | | | | | | | | This reverts commit bfad6f5a7d156d5ddf0e5cf3840d8d22f82a2377. Need it in stable w/o backports for the ancient autobuilder.
* | Drop support for building with old versions of dns and http-conduit.Gravatar Joey Hess2017-03-10
| |
* | Drop support for building without network-uri.Gravatar Joey Hess2017-03-10
| | | | | | | | | | network-uri is available in Debian stable (backports) and testing, so no need to complicate the cabal file anymore
* | relicense Utility/GPG.hs BSD as the rest of Utility isGravatar Joey Hess2017-03-10
| | | | | | | | | | | | | | | | | | | | The COPYRIGHT had Utility/DirWatcher* listed as GPL, but they were actually BSD licensed. No idea why I put the GPL on Utility/GPG.hs file originally. I wrote all of it, except for guilhem's small changes to it in a7f50205bb1ccd41d4a9ab4e11d984e643be755f, which seem too small to be independently copyrightable. I'm relicencing it BSD.
* | minor cleanupGravatar Joey Hess2017-03-10
|/
* use ActionItem rather than StringGravatar Joey Hess2017-03-10
| | | | | This changes fsck -A warnings to include the name of the key, which is a bit redundant in one case, but was missing in another case.
* AssociatedFile newtypeGravatar Joey Hess2017-03-10
| | | | | | To prevent any further mistakes like 1a497cefb47557f0b4788c606f9071be422b2511 This commit was sponsored by Francois Marier on Patreon.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-10
|\
* | fix fsck bug introduced in 1a497cefb47557f0b4788c606f9071be422b2511Gravatar Joey Hess2017-03-10
| | | | | | | | | | Got two Maybe FilePaths crossed. Test suite caught it. Slightly improved types to avoid this mistake.
| * Added a commentGravatar CandyAngel2017-03-10
| |
| * Added a comment: Issue still presentGravatar Alan2017-03-10
| |
| * (no commit message)Gravatar alanr2017-03-10
|/
* Added a comment: Work-in-progress, yet already usable, solutionGravatar https://launchpad.net/~stephane-gourichon-lpad2017-03-09
|
* (no commit message)Gravatar jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac02017-03-09
|
* Added a comment: ThanksGravatar Michel2017-03-09
|
* Added a commentGravatar archimedes2017-03-08
|
* Added a commentGravatar archimedes2017-03-08
|
* Added a comment: re: comment 3Gravatar jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac02017-03-08
|
* remove unused importGravatar Joey Hess2017-03-08
|
* Windows: Improve handling of shebang in external special remote program, ↵Gravatar Joey Hess2017-03-08
| | | | | | | | | | | | | | | | | | | searching for the program in the PATH. findShellCommand needs a full path to a file in order to check it for a shebang on Windows. It was being run with only the base name of the external special remote program, which would only work when it was in the current directory. This is why users in https://github.com/DanielDent/git-annex-remote-rclone/pull/10 and elsewhere were complaining that the previous improvements to git-annex didn't make git-remote-rclone work on Windows. Also, reworked checkearlytermination, which while it worked, seemed to rely on a race condition. And, improved its error messages. This commit was sponsored by Shane-o on Patreon.
* commentGravatar Joey Hess2017-03-08
|
* commentGravatar Joey Hess2017-03-08
|
* fsck -q: When a file has bad content, include the name of the file in the ↵Gravatar Joey Hess2017-03-08
| | | | | | warning message. This commit was sponsored by Alexander Thompson on Patreon.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-03-08
|\
* | get -J: Improve distribution of jobs amoung remotes when there are more jobs ↵Gravatar Joey Hess2017-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than remotes. It was distributing jobs to remotes that were not being used by any other job. But, suppose that there are only 2 remotes, and -J10. In such a case, the first 2 downloads would be distributed amoung the 2 remotes, but the other 8 would all go to remote #1. Improved by keeping a counter of how many jobs are assigned to a remote, and prefer remotes with fewer jobs. Note use of Data.Map.Strict to avoid blowing up space. I kept the bang-patterns as-is, although probably not needed with Data.Map.Strict. This commit was sponsored by Jack Hill on Patreon.
* | document get -J's behavior of spreading load amoung same-cost remotesGravatar Joey Hess2017-03-08
| | | | | | | | I implemented this last fall, but forgot to document it anywhere.