* contrib/hook-scripts/CVE-2017-9800-pre-commit.py: Move from here...

* tools/hook-scripts/CVE-2017-9800-pre-commit.py: ...to here. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1804739 13f79535-47bb-0310-9956-ffa450edef68
assembla · Aug 10, 2017 · 43a08e7 · 43a08e7
1 parent 4e064cf
commit 43a08e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/subversion/svn/notify.c b/subversion/svn/notify.c
@@ -480,7 +480,11 @@ notify_body(struct notify_baton *nb,
       break;
 
     case svn_wc_notify_tree_conflict_details_progress:
-      SVN_ERR(svn_cmdline_printf(pool, _("\rChecking r%ld..."), n->revision));
+      /* First printf is to obliterate any previous progress printf,
+         assuming no more than 10 digit revisions.  Avoid i18n so the
+         text length is known. */
+      SVN_ERR(svn_cmdline_printf(pool, "\rChecking r             "));
+      SVN_ERR(svn_cmdline_printf(pool, "\rChecking r%ld...", n->revision));
       break;
 
     case svn_wc_notify_end_search_tree_conflict_details:

diff --git a/.../hook-scripts/CVE-2017-9800-pre-commit.py → .../hook-scripts/CVE-2017-9800-pre-commit.py b/.../hook-scripts/CVE-2017-9800-pre-commit.py → .../hook-scripts/CVE-2017-9800-pre-commit.py