comparison hgext/obsolete.py @ 1757:86e71a0b3319 stable

errors: add missing imports of mercurial.error
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 28 Oct 2016 17:25:06 -0700
parents 11d72083883a
children
comparison
equal deleted inserted replaced
1756:a7dcfff8c4a9 1757:86e71a0b3319
11 Some code remains in this extensions to detect and convert prehistoric format 11 Some code remains in this extensions to detect and convert prehistoric format
12 of obsolete marker than early user may have create. Keep it enabled if you 12 of obsolete marker than early user may have create. Keep it enabled if you
13 were such user. 13 were such user.
14 """ 14 """
15 15
16 from mercurial import util 16 from mercurial import error
17 17
18 try: 18 try:
19 from mercurial import obsolete 19 from mercurial import obsolete
20 except ImportError: 20 except ImportError:
21 raise error.Abort('Obsolete extension requires Mercurial 2.3 (or later)') 21 raise error.Abort('Obsolete extension requires Mercurial 2.3 (or later)')
22 22
23 import sys 23 import sys
24 import json 24 import json
25 25
26 from mercurial import cmdutil 26 from mercurial import cmdutil
27 from mercurial import error
28 from mercurial.i18n import _ 27 from mercurial.i18n import _
29 from mercurial.node import bin, nullid 28 from mercurial.node import bin, nullid
29 from mercurial import util
30 30
31 31
32 ##################################################################### 32 #####################################################################
33 ### Older format management ### 33 ### Older format management ###
34 ##################################################################### 34 #####################################################################