Show More
@@ -14,14 +14,41 b' For more information:' | |||||
14 | https://mercurial-scm.org/wiki/RebaseExtension |
|
14 | https://mercurial-scm.org/wiki/RebaseExtension | |
15 | ''' |
|
15 | ''' | |
16 |
|
16 | |||
17 | from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks |
|
17 | from __future__ import absolute_import | |
18 | from mercurial import extensions, patch, scmutil, phases, obsolete, error |
|
18 | ||
19 | from mercurial import copies, destutil, repoview, registrar, revset |
|
19 | import errno | |
20 | from mercurial.commands import templateopts |
|
20 | import os | |
21 | from mercurial.node import nullrev, nullid, hex, short |
|
21 | from mercurial import ( | |
22 | from mercurial.lock import release |
|
22 | bookmarks, | |
|
23 | cmdutil, | |||
|
24 | commands, | |||
|
25 | copies, | |||
|
26 | destutil, | |||
|
27 | error, | |||
|
28 | extensions, | |||
|
29 | hg, | |||
|
30 | lock, | |||
|
31 | merge, | |||
|
32 | obsolete, | |||
|
33 | patch, | |||
|
34 | phases, | |||
|
35 | registrar, | |||
|
36 | repair, | |||
|
37 | repoview, | |||
|
38 | revset, | |||
|
39 | scmutil, | |||
|
40 | util, | |||
|
41 | ) | |||
|
42 | from mercurial.node import ( | |||
|
43 | hex, | |||
|
44 | nullid, | |||
|
45 | nullrev, | |||
|
46 | short, | |||
|
47 | ) | |||
23 | from mercurial.i18n import _ |
|
48 | from mercurial.i18n import _ | |
24 | import os, errno |
|
49 | ||
|
50 | release = lock.release | |||
|
51 | templateopts = commands.templateopts | |||
25 |
|
52 | |||
26 | # The following constants are used throughout the rebase module. The ordering of |
|
53 | # The following constants are used throughout the rebase module. The ordering of | |
27 | # their values must be maintained. |
|
54 | # their values must be maintained. |
@@ -21,7 +21,6 b'' | |||||
21 | hgext/largefiles/reposetup.py not using absolute_import |
|
21 | hgext/largefiles/reposetup.py not using absolute_import | |
22 | hgext/largefiles/uisetup.py not using absolute_import |
|
22 | hgext/largefiles/uisetup.py not using absolute_import | |
23 | hgext/largefiles/wirestore.py not using absolute_import |
|
23 | hgext/largefiles/wirestore.py not using absolute_import | |
24 | hgext/rebase.py not using absolute_import |
|
|||
25 | hgext/share.py not using absolute_import |
|
24 | hgext/share.py not using absolute_import | |
26 | hgext/win32text.py not using absolute_import |
|
25 | hgext/win32text.py not using absolute_import | |
27 | i18n/check-translation.py not using absolute_import |
|
26 | i18n/check-translation.py not using absolute_import | |
@@ -89,7 +88,7 b'' | |||||
89 | hgext/pager.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
88 | hgext/pager.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
90 | hgext/patchbomb.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
89 | hgext/patchbomb.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
91 | hgext/purge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
90 | hgext/purge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
92 |
hgext/rebase.py: error importing: < |
|
91 | hgext/rebase.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
93 | hgext/record.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
92 | hgext/record.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
94 | hgext/relink.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
93 | hgext/relink.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
95 | hgext/schemes.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
94 | hgext/schemes.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now