Show More
@@ -7,12 +7,23 b'' | |||||
7 |
|
7 | |||
8 | '''pull, update and merge in one command (DEPRECATED)''' |
|
8 | '''pull, update and merge in one command (DEPRECATED)''' | |
9 |
|
9 | |||
|
10 | from __future__ import absolute_import | |||
|
11 | ||||
10 | from mercurial.i18n import _ |
|
12 | from mercurial.i18n import _ | |
11 |
from mercurial.node import |
|
13 | from mercurial.node import ( | |
12 | from mercurial import commands, cmdutil, hg, util, error |
|
14 | short, | |
13 | from mercurial.lock import release |
|
15 | ) | |
14 |
from mercurial import |
|
16 | from mercurial import ( | |
|
17 | cmdutil, | |||
|
18 | commands, | |||
|
19 | error, | |||
|
20 | exchange, | |||
|
21 | hg, | |||
|
22 | lock, | |||
|
23 | util, | |||
|
24 | ) | |||
15 |
|
25 | |||
|
26 | release = lock.release | |||
16 | cmdtable = {} |
|
27 | cmdtable = {} | |
17 | command = cmdutil.command(cmdtable) |
|
28 | command = cmdutil.command(cmdtable) | |
18 | # Note for extension authors: ONLY specify testedwith = 'internal' for |
|
29 | # Note for extension authors: ONLY specify testedwith = 'internal' for |
@@ -3,7 +3,6 b'' | |||||
3 | $ cd "$TESTDIR"/.. |
|
3 | $ cd "$TESTDIR"/.. | |
4 |
|
4 | |||
5 | $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python contrib/check-py3-compat.py |
|
5 | $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs python contrib/check-py3-compat.py | |
6 | hgext/fetch.py not using absolute_import |
|
|||
7 | hgext/fsmonitor/pywatchman/__init__.py not using absolute_import |
|
6 | hgext/fsmonitor/pywatchman/__init__.py not using absolute_import | |
8 | hgext/fsmonitor/pywatchman/__init__.py requires print_function |
|
7 | hgext/fsmonitor/pywatchman/__init__.py requires print_function | |
9 | hgext/fsmonitor/pywatchman/capabilities.py not using absolute_import |
|
8 | hgext/fsmonitor/pywatchman/capabilities.py not using absolute_import | |
@@ -72,7 +71,7 b'' | |||||
72 | hgext/eol.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
71 | hgext/eol.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
73 | hgext/extdiff.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob) |
|
72 | hgext/extdiff.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob) | |
74 | hgext/factotum.py: error importing: <ImportError> No module named 'cStringIO' (error at __init__.py:*) (glob) |
|
73 | hgext/factotum.py: error importing: <ImportError> No module named 'cStringIO' (error at __init__.py:*) (glob) | |
75 | hgext/fetch.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) |
|
74 | hgext/fetch.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
76 | hgext/fsmonitor/watchmanclient.py: error importing module: <SystemError> Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) (glob) |
|
75 | hgext/fsmonitor/watchmanclient.py: error importing module: <SystemError> Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) (glob) | |
77 | hgext/gpg.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) |
|
76 | hgext/gpg.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) | |
78 | hgext/graphlog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
77 | hgext/graphlog.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