The branch, master has been updated via b7fdc9ef Make sure that --read-batch doesn't try to check args. via 0d8cc260 Some md-convert doc tweaks. from 29558884 Fix typos in NEWS (#339)
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b7fdc9ef0e5fe2d179058c0ce326c9075f64443c Author: Wayne Davison <wa...@opencoder.net> Date: Sun Aug 7 08:56:39 2022 -0700 Make sure that --read-batch doesn't try to check args. commit 0d8cc26044fe5c543f69206642666bfa7ee053f7 Author: Wayne Davison <wa...@opencoder.net> Date: Wed Aug 3 08:55:26 2022 -0700 Some md-convert doc tweaks. ----------------------------------------------------------------------- Summary of changes: INSTALL.md | 2 +- exclude.c | 3 ++- md-convert | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/INSTALL.md b/INSTALL.md index 5b23ed0e..1605ab43 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -26,7 +26,7 @@ build user (after installing python3's pip package): You can test if you've got it fixed by running (from the rsync checkout): -> ./md2man --test rsync-ssl.1.md +> ./md-convert --test rsync-ssl.1.md Alternately, you can avoid generating the manpages by fetching the very latest versions (that match the latest git source) from the [generated-files][6] dir. diff --git a/exclude.c b/exclude.c index cd77c543..e5991009 100644 --- a/exclude.c +++ b/exclude.c @@ -40,6 +40,7 @@ extern int delete_excluded; extern int cvs_exclude; extern int sanitize_paths; extern int protocol_version; +extern int read_batch; extern int list_only; extern int module_id; @@ -310,7 +311,7 @@ void add_implied_include(const char *arg) int slash_cnt = 1; /* We know we're adding a leading slash. */ const char *cp; char *p; - if (am_server || old_style_args || list_only || filesfrom_host != NULL) + if (am_server || old_style_args || list_only || read_batch || filesfrom_host != NULL) return; if (relative_paths) { if ((cp = strstr(arg, "/./")) != NULL) diff --git a/md-convert b/md-convert index fb60b093..19709c8d 100755 --- a/md-convert +++ b/md-convert @@ -609,12 +609,12 @@ def die(*msg): if __name__ == '__main__': - parser = argparse.ArgumentParser(description="Output html and (optionally) nroff for markdown pages.", add_help=False) + parser = argparse.ArgumentParser(description="Convert markdown into html and (optionally) nroff. Each input filename must have a .md suffix, which is changed to .html for the output filename. If the input filename ends with .num.md (e.g. foo.1.md) then a nroff file is also output with the input filename's .md suffix removed (e.g. foo.1).", add_help=False) parser.add_argument('--test', action='store_true', help="Just test the parsing without outputting any files.") - parser.add_argument('--dest', metavar='DIR', help="Put files into DIR instead of the current directory.") + parser.add_argument('--dest', metavar='DIR', help="Create files in DIR instead of the current directory.") parser.add_argument('--debug', '-D', action='count', default=0, help='Output copious info on the html parsing. Repeat for even more.') parser.add_argument("--help", "-h", action="help", help="Output this help message and exit.") - parser.add_argument("mdfiles", nargs='+', help="The source .md files to convert.") + parser.add_argument("mdfiles", metavar='FILE.md', nargs='+', help="One or more .md files to convert.") args = parser.parse_args() try: -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs