Mercurial > hgsubversion

comparison hgsubversion/stupid.py @ 1555:cff81f35b31e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8410a978c650
children ae572c9be4e6
comparison
equal deleted inserted replaced
1554:258fb67fb956 1555:cff81f35b31e
1 import cStringIO 1 import cStringIO
2 import errno 2 import errno
3 import re 3 import re
4 4
5 from mercurial import context 5 from mercurial import context
6 from mercurial import error as hgerror
6 from mercurial import node 7 from mercurial import node
7 from mercurial import patch 8 from mercurial import patch
8 from mercurial import revlog 9 from mercurial import revlog
9 from mercurial import util as hgutil 10 from mercurial import util as hgutil
10 11
631 632
632 return branches 633 return branches
633 634
634 def convert_rev(ui, meta, svn, r, tbdelta, firstrun): 635 def convert_rev(ui, meta, svn, r, tbdelta, firstrun):
635 if svnwrap.subversion_version >= (1, 9, 0): 636 if svnwrap.subversion_version >= (1, 9, 0):
636 raise hgutil.Abort( 637 raise hgerror.Abort(
637 "hgsubversion doesn't support stupid mode with Subversion 1.9." 638 "hgsubversion doesn't support stupid mode with Subversion 1.9."
638 ' Please email hgsubversion@googlegroups.com and let us know you' 639 ' Please email hgsubversion@googlegroups.com and let us know you'
639 ' saw this, otherwise we may remove stupid mode entirely.') 640 ' saw this, otherwise we may remove stupid mode entirely.')
640 # this server fails at replay 641 # this server fails at replay
641 642
642 if meta.filemap: 643 if meta.filemap:
643 raise hgutil.Abort('filemaps currently unsupported with stupid replay.') 644 raise hgerror.Abort('filemaps currently unsupported with stupid replay.')
644 645
645 branches = branches_in_paths(meta, tbdelta, r.paths, r.revnum, 646 branches = branches_in_paths(meta, tbdelta, r.paths, r.revnum,
646 svn.checkpath, svn.list_files, firstrun) 647 svn.checkpath, svn.list_files, firstrun)
647 brpaths = branches.values() 648 brpaths = branches.values()
648 bad_branch_paths = {} 649 bad_branch_paths = {}