[SVN-3341] interactive diff-full fails in windows console

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.5.x
• Fix Version/s: 1.5.5
• Component/s: cmdline client

Environment

Windows 2000

• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 05/Dec/08 14:48
• Updated: 27/Oct/18 16:30
• Resolved: 21/Jan/13 17:03

Description

Interactive conflict resolution in windows console fails with unicode error when
invoking diff-full. Usual "svn diff" command works as expected.


D:\SDK\.tmp-src\0.11dev>svn up
Conflict discovered in 'trac/wiki/web_ui.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: df
svn: Valid UTF-8 data
(hex: 62 61 73 65 2f 77 65 62 5f 75 69 2e 70 79 2e 73 76 6e 2d 62 61 73 65 09)
followed by invalid UTF-8 sequence
(hex: d7 f2 20 ee)


D:\SDK\.tmp-src\0.11dev>svn diff -r BASE:HEAD trac/wiki/web_ui.py
Index: trac/wiki/web_ui.py
===================================================================
--- trac/wiki/web_ui.py (working copy)
+++ trac/wiki/web_ui.py (revision 7748)
@@ -41,7 +41,7 @@
                             INavigationContributor, ITemplateProvider
 from trac.web import IRequestHandler
 from trac.wiki.api import IWikiPageManipulator, WikiSystem
-from trac.wiki.formatter import format_to_oneliner
+from trac.wiki.formatter import format_to
 from trac.wiki.model import WikiPage

 class InvalidWikiPage(TracError):
@@ -276,9 +276,8 @@
             page.save(get_reporter_id(req, 'author'),
                             req.args.get('comment'),
                             req.remote_addr)
-            not_modified = False
             req.redirect(get_resource_url(self.env, page.resource, req.href,
-                                          version=page.version))
+                                          version=None))
         except TracError:
             add_warning(req, _("Page not modified, showing latest version."))
             return self._render_view(req, page)
@@ -600,10 +599,8 @@
             return tag(tag.em(get_resource_name(self.env, wiki_page)),
                        wiki_page.version > 1 and ' edited' or ' created')
         elif field == 'description':
-            if self.config['timeline'].getbool('abbreviated_messages'):
-                comment = shorten_line(comment)
-            markup = format_to_oneliner(self.env, context(resource=wiki_page),
-                                        comment)
+            markup = format_to(self.env, None, context(resource=wiki_page),
+                               comment)
             if wiki_page.version > 1:
                 diff_href = context.href.wiki(
                     wiki_page.id, version=wiki_page.version, action='diff')


D:\SDK\.tmp-src\0.11dev>svn st -v trac/wiki/web_ui.py
M            7607     7549 rblank       trac\wiki\web_ui.py


D:\SDK\.tmp-src\0.11dev>svn diff trac/wiki/web_ui.py
Index: trac/wiki/web_ui.py
===================================================================
--- trac/wiki/web_ui.py (revision 7607)
+++ trac/wiki/web_ui.py (working copy)
@@ -600,10 +600,9 @@
             return tag(tag.em(get_resource_name(self.env, wiki_page)),
                        wiki_page.version > 1 and ' edited' or ' created')
         elif field == 'description':
-            if self.config['timeline'].getbool('abbreviated_messages'):
-                comment = shorten_line(comment)
+            shorten = self.config['timeline'].getbool('abbreviated_messages')
             markup = format_to_oneliner(self.env, context(resource=wiki_page),
-                                        comment)
+                                        comment, shorten=shorten)
             if wiki_page.version > 1:
                 diff_href = context.href.wiki(
                     wiki_page.id, version=wiki_page.version, action='diff')


D:\SDK\.tmp-src\0.11dev>svn --version
svn, version 1.5.4 (r33841)
   compiled Oct 24 2008, 16:12:55

Copyright (C) 2000-2008 CollabNet.
...

Original issue reported by techtonik