Mercurial > hgsubversion

changeset 1600:6f5b296c01dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
verify: use ui.write() instead of ui.warn() Looks like ui.warn() is being written to output directly and it's not pushed to buffer which ui objects maintain. Let's use ui.write() instead which is used in the other instance of same error messages too. This fixes test_utility_commands.py which was failing for me on tip of default branch.
author Pulkit Goyal <pulkit@yandex-team.ru>
date Wed, 26 Dec 2018 18:40:12 +0300
parents 7bb6562feb85
children 5d8603f080c5
files hgsubversion/verify.py
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/verify.py
+++ b/hgsubversion/verify.py
@@ -175,19 +175,19 @@ def verify(ui, repo, args=None, **opts):
 
                     if 'svn:executable' in self.props:
                         if fctx.flags() != 'x':
-                            self.ui.warn('wrong flags for: %s\n' % self.file)
+                            self.ui.write('wrong flags for: %s\n' % self.file)
                             self.failed = True
                     elif 'svn:special' in self.props:
                         hgdata = 'link ' + hgdata
                         if fctx.flags() != 'l':
-                            self.ui.warn('wrong flags for: %s\n' % self.file)
+                            self.ui.write('wrong flags for: %s\n' % self.file)
                             self.failed = True
                     elif fctx.flags():
-                        self.ui.warn('wrong flags for: %s\n' % self.file)
+                        self.ui.write('wrong flags for: %s\n' % self.file)
                         self.failed = True
 
                     if hgdata != svndata:
-                        self.ui.warn('difference in: %s\n' % self.file)
+                        self.ui.write('difference in: %s\n' % self.file)
                         diff_file(self.file, svndata)
                         self.failed = True
 
@@ -214,10 +214,10 @@ def verify(ui, repo, args=None, **opts):
                 self.ui.progress('verify', None, total=self.total)
 
                 for f in self.unexpected:
-                    self.ui.warn('unexpected file: %s\n' % f)
+                    self.ui.write('unexpected file: %s\n' % f)
                     self.failed = True
                 for f in self.missing:
-                    self.ui.warn('missing file: %s\n' % f)
+                    self.ui.write('missing file: %s\n' % f)
                     self.failed = True
                 return not self.failed