You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2017/08/10 22:55:16 UTC

svn commit: r1804739 - in /subversion/trunk: contrib/hook-scripts/CVE-2017-9800-pre-commit.py subversion/svn/notify.c tools/hook-scripts/CVE-2017-9800-pre-commit.py

Author: philip
Date: Thu Aug 10 22:55:16 2017
New Revision: 1804739

URL: http://svn.apache.org/viewvc?rev=1804739&view=rev
Log:
* contrib/hook-scripts/CVE-2017-9800-pre-commit.py: Move from here...

* tools/hook-scripts/CVE-2017-9800-pre-commit.py: ...to here.

Added:
    subversion/trunk/tools/hook-scripts/CVE-2017-9800-pre-commit.py
      - copied unchanged from r1804737, subversion/trunk/contrib/hook-scripts/CVE-2017-9800-pre-commit.py
Removed:
    subversion/trunk/contrib/hook-scripts/CVE-2017-9800-pre-commit.py
Modified:
    subversion/trunk/subversion/svn/notify.c

Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1804739&r1=1804738&r2=1804739&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Thu Aug 10 22:55:16 2017
@@ -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: