diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-13 14:25:30 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-13 14:25:30 -0400 |
| commit | c747c8e423afe272dcf045abf3f1e8c1f6985e5c (patch) | |
| tree | 2521170766eeee800de45895cd1df6bb73d3afcd | |
| parent | 0271693312df2134693562396bd6dd77b32c5e63 (diff) | |
addurl: Support --json, particularly useful in --batch mode.
| -rw-r--r-- | Command/AddUrl.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/inconsistent_output_upon_addurl_--batch_complicates_if_not_forbids_reliable_parsing_of_output.mdwn | 3 | ||||
| -rw-r--r-- | doc/git-annex-addurl.mdwn | 5 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 746a6725c..516d50a75 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -41,7 +41,7 @@ import qualified Utility.Quvi as Quvi #endif cmd :: Command -cmd = notBareRepo $ withGlobalOptions [jobsOption] $ +cmd = notBareRepo $ withGlobalOptions [jobsOption, jsonOption] $ command "addurl" SectionCommon "add urls to annex" (paramRepeating paramUrl) (seek <$$> optParser) diff --git a/debian/changelog b/debian/changelog index 46aae45a6..68544bcfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ git-annex (6.20151219) UNRELEASED; urgency=medium displays in this situation. Fixed by treating files git thinks are modified the same as typechanged files. * addurl: Added --batch and --with-files options. + * addurl: Support --json, particularly useful in --batch mode. * Debian: Adjust build dependencies for webapp, DAV. Now available on mips, mipsel, but temporarily removed armel since build is failing there. diff --git a/doc/bugs/inconsistent_output_upon_addurl_--batch_complicates_if_not_forbids_reliable_parsing_of_output.mdwn b/doc/bugs/inconsistent_output_upon_addurl_--batch_complicates_if_not_forbids_reliable_parsing_of_output.mdwn index a0019456c..6601e9ba5 100644 --- a/doc/bugs/inconsistent_output_upon_addurl_--batch_complicates_if_not_forbids_reliable_parsing_of_output.mdwn +++ b/doc/bugs/inconsistent_output_upon_addurl_--batch_complicates_if_not_forbids_reliable_parsing_of_output.mdwn @@ -19,3 +19,6 @@ failed """]] [[!meta author=yoh]] + +> I've made --json work for addurl; I feel that's the way to go for parsing +> its output. [[done]] --[[Joey]] diff --git a/doc/git-annex-addurl.mdwn b/doc/git-annex-addurl.mdwn index 20cec9259..991dc5f99 100644 --- a/doc/git-annex-addurl.mdwn +++ b/doc/git-annex-addurl.mdwn @@ -83,6 +83,11 @@ be used to get better filenames. content if the file does not yet exist; the same as `git annex addurl $url --file $file` +* `--json` + + Enable JSON output. This is intended to be parsed by programs that use + git-annex. Each line of output is a JSON object. + # SEE ALSO [[git-annex]](1) |