diff options
Diffstat (limited to 'hgsubversion/verify.py')
| -rw-r--r-- | hgsubversion/verify.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/hgsubversion/verify.py b/hgsubversion/verify.py index cc9f6b6..6c6b9f8 100644 --- a/hgsubversion/verify.py +++ b/hgsubversion/verify.py @@ -4,6 +4,7 @@ import posixpath from mercurial import error from mercurial import worker +import compathacks import svnwrap import svnrepo import util @@ -94,7 +95,7 @@ def verify(ui, repo, args=None, **opts): w = worker.worker(repo.ui, perarg, verifydata, (), tuple(svndata)) i = 0 for _, t in w: - ui.progress('verify', i, total=len(hgfiles)) + compathacks.progress(ui, 'verify', i, total=len(hgfiles)) i += 1 fn, ok = t.split('\0', 2) if not bool(ok): @@ -110,7 +111,7 @@ def verify(ui, repo, args=None, **opts): ui.write('missing file: %s\n' % f) result = 1 - ui.progress('verify', None, total=len(hgfiles)) + compathacks.progress(ui, 'verify', None, total=len(hgfiles)) else: class VerifyEditor(svnwrap.Editor): @@ -152,7 +153,7 @@ def verify(ui, repo, args=None, **opts): self.props = None self.seen += 1 - self.ui.progress('verify', self.seen, total=self.total) + compathacks.progress(self.ui, 'verify', self.seen, total=self.total) def open_file(self, path, base_revnum): raise NotImplementedError() @@ -175,19 +176,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 @@ -211,13 +212,13 @@ def verify(ui, repo, args=None, **opts): raise NotImplementedError() def check(self): - self.ui.progress('verify', None, total=self.total) + compathacks.progress(self.ui, '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 |