Mercurial > hgsubversion
comparison hgsubversion/verify.py @ 1555:cff81f35b31e
cleanup: reference Abort from mercurial.error instead of mercurial.util
It's been there since hg 1.7 or so, which lets us avoid any need for
compat shims.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sat, 24 Mar 2018 16:39:30 -0400 |
parents | 691078c03ed9 |
children | ae572c9be4e6 |
comparison
equal
deleted
inserted
replaced
1554:258fb67fb956 | 1555:cff81f35b31e |
---|---|
22 if 'close' in ctx.extra(): | 22 if 'close' in ctx.extra(): |
23 ui.write('cannot verify closed branch') | 23 ui.write('cannot verify closed branch') |
24 return 0 | 24 return 0 |
25 convert_revision = ctx.extra().get('convert_revision') | 25 convert_revision = ctx.extra().get('convert_revision') |
26 if convert_revision is None or not convert_revision.startswith('svn:'): | 26 if convert_revision is None or not convert_revision.startswith('svn:'): |
27 raise hgutil.Abort('revision %s not from SVN' % ctx) | 27 raise error.Abort('revision %s not from SVN' % ctx) |
28 | 28 |
29 if args: | 29 if args: |
30 url = repo.ui.expandpath(args[0]) | 30 url = repo.ui.expandpath(args[0]) |
31 else: | 31 else: |
32 url = repo.ui.expandpath('default') | 32 url = repo.ui.expandpath('default') |
161 | 161 |
162 def apply_textdelta(self, file_baton, base_checksum, pool=None): | 162 def apply_textdelta(self, file_baton, base_checksum, pool=None): |
163 stream = svnwrap.SimpleStringIO(closing=False) | 163 stream = svnwrap.SimpleStringIO(closing=False) |
164 handler = svnwrap.apply_txdelta('', stream) | 164 handler = svnwrap.apply_txdelta('', stream) |
165 if not callable(handler): | 165 if not callable(handler): |
166 raise hgutil.Abort('Error in Subversion bindings: ' | 166 raise error.Abort('Error in Subversion bindings: ' |
167 'cannot call handler!') | 167 'cannot call handler!') |
168 def txdelt_window(window): | 168 def txdelt_window(window): |
169 handler(window) | 169 handler(window) |
170 # window being None means we're done | 170 # window being None means we're done |
171 if window: | 171 if window: |
172 return | 172 return |