Show More
@@ -5,25 +5,75 b'' | |||
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | from node import hex, bin, nullhex, nullid, nullrev, short | |
|
9 | from lock import release | |
|
10 | from i18n import _ | |
|
11 | import os, re, difflib, time, tempfile, errno, shlex | |
|
12 |
import |
|
|
13 | import hg, scmutil, util, revlog, copies, error, bookmarks | |
|
14 | import patch, help, encoding, templatekw, discovery | |
|
15 | import archival, changegroup, cmdutil, hbisect | |
|
16 | import sshserver, hgweb | |
|
17 |
import |
|
|
18 | import merge as mergemod | |
|
19 | import minirst, revset, fileset | |
|
20 | import dagparser, context, simplemerge, graphmod, copies | |
|
21 | import random, operator | |
|
22 | import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil | |
|
23 | import phases, obsolete, exchange, bundle2, repair, lock as lockmod | |
|
24 | import ui as uimod | |
|
25 | import streamclone | |
|
26 | import commandserver | |
|
8 | from __future__ import absolute_import | |
|
9 | ||
|
10 | import difflib | |
|
11 | import errno | |
|
12 | import operator | |
|
13 | import os | |
|
14 | import random | |
|
15 | import re | |
|
16 | import shlex | |
|
17 | import socket | |
|
18 | import sys | |
|
19 | import tempfile | |
|
20 | import time | |
|
21 | ||
|
22 | from .i18n import _ | |
|
23 | from .node import ( | |
|
24 | bin, | |
|
25 | hex, | |
|
26 | nullhex, | |
|
27 | nullid, | |
|
28 | nullrev, | |
|
29 | short, | |
|
30 | ) | |
|
31 | from . import ( | |
|
32 | archival, | |
|
33 | bookmarks, | |
|
34 | bundle2, | |
|
35 | changegroup, | |
|
36 | cmdutil, | |
|
37 | commandserver, | |
|
38 | context, | |
|
39 | copies, | |
|
40 | dagparser, | |
|
41 | dagutil, | |
|
42 | destutil, | |
|
43 | discovery, | |
|
44 | encoding, | |
|
45 | error, | |
|
46 | exchange, | |
|
47 | extensions, | |
|
48 | fileset, | |
|
49 | graphmod, | |
|
50 | hbisect, | |
|
51 | help, | |
|
52 | hg, | |
|
53 | hgweb, | |
|
54 | localrepo, | |
|
55 | lock as lockmod, | |
|
56 | merge as mergemod, | |
|
57 | minirst, | |
|
58 | obsolete, | |
|
59 | patch, | |
|
60 | phases, | |
|
61 | pvec, | |
|
62 | repair, | |
|
63 | revlog, | |
|
64 | revset, | |
|
65 | scmutil, | |
|
66 | setdiscovery, | |
|
67 | simplemerge, | |
|
68 | sshserver, | |
|
69 | streamclone, | |
|
70 | templatekw, | |
|
71 | treediscovery, | |
|
72 | ui as uimod, | |
|
73 | util, | |
|
74 | ) | |
|
75 | ||
|
76 | release = lockmod.release | |
|
27 | 77 | |
|
28 | 78 | table = {} |
|
29 | 79 | |
@@ -2677,7 +2727,12 b' def debuginstall(ui):' | |||
|
2677 | 2727 | ui.status(_("checking installed modules (%s)...\n") |
|
2678 | 2728 | % os.path.dirname(__file__)) |
|
2679 | 2729 | try: |
|
2680 | import bdiff, mpatch, base85, osutil | |
|
2730 | from . import ( | |
|
2731 | base85, | |
|
2732 | bdiff, | |
|
2733 | mpatch, | |
|
2734 | osutil, | |
|
2735 | ) | |
|
2681 | 2736 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
|
2682 | 2737 | except Exception as inst: |
|
2683 | 2738 | ui.write(" %s\n" % inst) |
@@ -2686,7 +2741,7 b' def debuginstall(ui):' | |||
|
2686 | 2741 | problems += 1 |
|
2687 | 2742 | |
|
2688 | 2743 | # templates |
|
2689 | import templater | |
|
2744 | from . import templater | |
|
2690 | 2745 | p = templater.templatepaths() |
|
2691 | 2746 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) |
|
2692 | 2747 | if p: |
@@ -86,7 +86,6 b'' | |||
|
86 | 86 | hgext/win32text.py not using absolute_import |
|
87 | 87 | i18n/check-translation.py not using absolute_import |
|
88 | 88 | i18n/polib.py not using absolute_import |
|
89 | mercurial/commands.py not using absolute_import | |
|
90 | 89 | setup.py not using absolute_import |
|
91 | 90 | tests/filterpyflakes.py requires print_function |
|
92 | 91 | tests/generate-working-copy-states.py requires print_function |
General Comments 0
You need to be logged in to leave comments.
Login now