Mercurial > hgsubversion

comparison hgsubversion/verify.py @ 1601:5d8603f080c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compathacks: add compat code for ui.makeprogress() deprecation ui.makeprogress() is deprecated and will be dropped in 5.1. This patch adds compat code for that. The compat code is plain copy of compat code available in evolve extension.
author Pulkit Goyal <pulkit@yandex-team.ru>
date Mon, 04 Feb 2019 20:56:39 +0300
parents 6f5b296c01dd
children
comparison
equal deleted inserted replaced
1600:6f5b296c01dd 1601:5d8603f080c5
2 import posixpath 2 import posixpath
3 3
4 from mercurial import error 4 from mercurial import error
5 from mercurial import worker 5 from mercurial import worker
6 6
7 import compathacks
7 import svnwrap 8 import svnwrap
8 import svnrepo 9 import svnrepo
9 import util 10 import util
10 11
11 def verify(ui, repo, args=None, **opts): 12 def verify(ui, repo, args=None, **opts):
92 93
93 svndata = svn.list_files(branchpath, srev) 94 svndata = svn.list_files(branchpath, srev)
94 w = worker.worker(repo.ui, perarg, verifydata, (), tuple(svndata)) 95 w = worker.worker(repo.ui, perarg, verifydata, (), tuple(svndata))
95 i = 0 96 i = 0
96 for _, t in w: 97 for _, t in w:
97 ui.progress('verify', i, total=len(hgfiles)) 98 compathacks.progress(ui, 'verify', i, total=len(hgfiles))
98 i += 1 99 i += 1
99 fn, ok = t.split('\0', 2) 100 fn, ok = t.split('\0', 2)
100 if not bool(ok): 101 if not bool(ok):
101 result = 1 102 result = 1
102 svnfiles.add(fn) 103 svnfiles.add(fn)
108 missing = svnfiles - hgfiles 109 missing = svnfiles - hgfiles
109 for f in sorted(missing): 110 for f in sorted(missing):
110 ui.write('missing file: %s\n' % f) 111 ui.write('missing file: %s\n' % f)
111 result = 1 112 result = 1
112 113
113 ui.progress('verify', None, total=len(hgfiles)) 114 compathacks.progress(ui, 'verify', None, total=len(hgfiles))
114 115
115 else: 116 else:
116 class VerifyEditor(svnwrap.Editor): 117 class VerifyEditor(svnwrap.Editor):
117 """editor that verifies a repository against the given context.""" 118 """editor that verifies a repository against the given context."""
118 def __init__(self, ui, ctx): 119 def __init__(self, ui, ctx):
150 self.failed = True 151 self.failed = True
151 self.file = None 152 self.file = None
152 self.props = None 153 self.props = None
153 154
154 self.seen += 1 155 self.seen += 1
155 self.ui.progress('verify', self.seen, total=self.total) 156 compathacks.progress(self.ui, 'verify', self.seen, total=self.total)
156 157
157 def open_file(self, path, base_revnum): 158 def open_file(self, path, base_revnum):
158 raise NotImplementedError() 159 raise NotImplementedError()
159 160
160 def apply_textdelta(self, file_baton, base_checksum, pool=None): 161 def apply_textdelta(self, file_baton, base_checksum, pool=None):
209 210
210 def delete_entry(self, path, revnum, pool=None): 211 def delete_entry(self, path, revnum, pool=None):
211 raise NotImplementedError() 212 raise NotImplementedError()
212 213
213 def check(self): 214 def check(self):
214 self.ui.progress('verify', None, total=self.total) 215 compathacks.progress(self.ui, 'verify', None, total=self.total)
215 216
216 for f in self.unexpected: 217 for f in self.unexpected:
217 self.ui.write('unexpected file: %s\n' % f) 218 self.ui.write('unexpected file: %s\n' % f)
218 self.failed = True 219 self.failed = True
219 for f in self.missing: 220 for f in self.missing: