aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* info: Support being passed a treeish, and show info about the annexed files ↵Gravatar Joey Hess2016-09-15
| | | | in it similar to how a directory is handled.
* commentGravatar Joey Hess2016-09-15
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-15
|\
* | stack.yaml: Update to lts-7.0 (ghc 8)Gravatar Joey Hess2016-09-15
| | | | | | | | | | A few of these extra-deps are setting versions to work around various library dep issues with ghc 8.
* | remove redundant constraintGravatar Joey Hess2016-09-15
| |
* | remove workaround for ghc 8.0; that is mostly sorted out upstream nowGravatar Joey Hess2016-09-14
| |
| * (no commit message)Gravatar Adam0002016-09-15
| |
| * (no commit message)Gravatar Adam0002016-09-15
|/
* Improve gpg secret key list parser to deal with changes in gpg 2.1.15. Fixes ↵Gravatar Joey Hess2016-09-14
| | | | | | | | | | | key name display in webapp. gpg 2.1.15 (or so) seems to have added some new fields to the --with-colons --list-secret-keys output. These include "fpr" and "grp", and come before the "uid" line. So, the parser was giving up before it saw the name. Fix by continuing to look for the uid line until the next "sec" line. This commit was sponsored by Ole-Morten,Duesund on Patreon.
* commentGravatar Joey Hess2016-09-14
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-14
|\
* | commentGravatar Joey Hess2016-09-14
| |
| * Added a comment: clarificationGravatar git-starter2016-09-13
| |
| * (no commit message)Gravatar git-starter2016-09-13
| |
| * Added a commentGravatar jk@3f2b4ce16bbac41470815333505aa47b91b7a9a62016-09-13
| |
| * Added a commentGravatar jk@3f2b4ce16bbac41470815333505aa47b91b7a9a62016-09-12
|/
* Added a comment: Any thoughts Joey?Gravatar Aaron2016-09-10
|
* fix markupGravatar anarcat2016-09-10
|
* sign this so i follow its changesGravatar anarcat2016-09-10
|
* two more ideasGravatar anarcat2016-09-10
|
* Added a comment: Never mindGravatar Gus2016-09-10
|
* (no commit message)Gravatar atrent2016-09-10
|
* drop incremental json object display; clean up codeGravatar Joey Hess2016-09-09
| | | | | | | | | | | | | This gets rid of quite a lot of ugly hacks around json generation. I doubt that any real-world json parsers can parse incomplete objects, so while it's not as nice to need to wait for the complete object, especially for commands like `git annex info` that take a while, it doesn't seem worth the added complexity. This also causes the order of fields within the json objects to be reordered. Since any real json parser shouldn't care, the only possible problem would be with ad-hoc parsers of the old json output.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-09
|\
* | refactorGravatar Joey Hess2016-09-09
| |
* | copy, move, mirror: Support --json and --json-progress.Gravatar Joey Hess2016-09-09
| |
* | doneGravatar Joey Hess2016-09-09
| |
* | make --json-progress work for url downloadsGravatar Joey Hess2016-09-09
| |
* | make --json-progress update meter when getting from git remote with rsyncGravatar Joey Hess2016-09-09
| |
* | better locking for json with -JGravatar Joey Hess2016-09-09
| | | | | | | | | | | | | | Avoid threads emitting json at the same time and scrambling, which was still possible even with the buffering, just less likely. Converted json IO actions to JSONChunk data too.
* | addurl, get: Added --json-progress option, which adds progress objects to ↵Gravatar Joey Hess2016-09-09
| | | | | | | | | | | | | | the json output. This doesn't work right when used with -J yet, and there is some really ugly hand-crafting of part of the json output.
| * initial whiningGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-09-09
| |
* | Remove key:null from git-annex add --json output.Gravatar Joey Hess2016-09-09
| |
* | make maybeShowJSON also add to the bufferGravatar Joey Hess2016-09-09
| |
| * (no commit message)Gravatar interfect@b151490178830f44348aa57b77ad58c7d18e8fe72016-09-09
| |
* | buffer json output until done when in concurrent modeGravatar Joey Hess2016-09-09
| |
* | disentangle concurrency and message typeGravatar Joey Hess2016-09-09
| | | | | | | | | | | | | | | | This makes -Jn work with --json and --quiet, where before setting -Jn disabled those options. Concurrent json output is currently a mess though since threads output chunks over top of one-another.
| * Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-09-09
| |
| * Added a commentGravatar https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd2016-09-09
| |
| * Added a comment: Similar issue on Debian machineGravatar dave@2ab82f485adf7e2ce787066e35f5f9789bff430b2016-09-08
| |
| * removedGravatar dave@2ab82f485adf7e2ce787066e35f5f9789bff430b2016-09-08
| |
| * Added a comment: Tried on another machine, same problemGravatar dave@2ab82f485adf7e2ce787066e35f5f9789bff430b2016-09-08
| |
| * Added a comment: output of git annex versionGravatar dave@2ab82f485adf7e2ce787066e35f5f9789bff430b2016-09-08
| |
| * (no commit message)Gravatar Gus2016-09-08
| |
| * (no commit message)Gravatar Gus2016-09-08
| |
| * (no commit message)Gravatar dave@2ab82f485adf7e2ce787066e35f5f9789bff430b2016-09-08
| |
| * Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-09-08
| |
| * Added a comment: concurrent-output-1.7.7Gravatar dave@2ab82f485adf7e2ce787066e35f5f9789bff430b2016-09-08
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-08
|\
* | still update othermeter when not displaying progress at consoleGravatar Joey Hess2016-09-08
| | | | | | | | | | See no reason not to do this; the othermeter will be updating a transfer info file or the like.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 06:23:30 +0000