Show More
@@ -1,154 +1,165 b'' | |||||
1 | # fetch.py - pull and merge remote changes |
|
1 | # fetch.py - pull and merge remote changes | |
2 | # |
|
2 | # | |
3 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
|
3 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
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 | |
19 | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
|
30 | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | |
20 | # be specifying the version(s) of Mercurial they are tested with, or |
|
31 | # be specifying the version(s) of Mercurial they are tested with, or | |
21 | # leave the attribute unspecified. |
|
32 | # leave the attribute unspecified. | |
22 | testedwith = 'internal' |
|
33 | testedwith = 'internal' | |
23 |
|
34 | |||
24 | @command('fetch', |
|
35 | @command('fetch', | |
25 | [('r', 'rev', [], |
|
36 | [('r', 'rev', [], | |
26 | _('a specific revision you would like to pull'), _('REV')), |
|
37 | _('a specific revision you would like to pull'), _('REV')), | |
27 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
38 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
28 | ('', 'force-editor', None, _('edit commit message (DEPRECATED)')), |
|
39 | ('', 'force-editor', None, _('edit commit message (DEPRECATED)')), | |
29 | ('', 'switch-parent', None, _('switch parents when merging')), |
|
40 | ('', 'switch-parent', None, _('switch parents when merging')), | |
30 | ] + commands.commitopts + commands.commitopts2 + commands.remoteopts, |
|
41 | ] + commands.commitopts + commands.commitopts2 + commands.remoteopts, | |
31 | _('hg fetch [SOURCE]')) |
|
42 | _('hg fetch [SOURCE]')) | |
32 | def fetch(ui, repo, source='default', **opts): |
|
43 | def fetch(ui, repo, source='default', **opts): | |
33 | '''pull changes from a remote repository, merge new changes if needed. |
|
44 | '''pull changes from a remote repository, merge new changes if needed. | |
34 |
|
45 | |||
35 | This finds all changes from the repository at the specified path |
|
46 | This finds all changes from the repository at the specified path | |
36 | or URL and adds them to the local repository. |
|
47 | or URL and adds them to the local repository. | |
37 |
|
48 | |||
38 | If the pulled changes add a new branch head, the head is |
|
49 | If the pulled changes add a new branch head, the head is | |
39 | automatically merged, and the result of the merge is committed. |
|
50 | automatically merged, and the result of the merge is committed. | |
40 | Otherwise, the working directory is updated to include the new |
|
51 | Otherwise, the working directory is updated to include the new | |
41 | changes. |
|
52 | changes. | |
42 |
|
53 | |||
43 | When a merge is needed, the working directory is first updated to |
|
54 | When a merge is needed, the working directory is first updated to | |
44 | the newly pulled changes. Local changes are then merged into the |
|
55 | the newly pulled changes. Local changes are then merged into the | |
45 | pulled changes. To switch the merge order, use --switch-parent. |
|
56 | pulled changes. To switch the merge order, use --switch-parent. | |
46 |
|
57 | |||
47 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
58 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
48 |
|
59 | |||
49 | Returns 0 on success. |
|
60 | Returns 0 on success. | |
50 | ''' |
|
61 | ''' | |
51 |
|
62 | |||
52 | date = opts.get('date') |
|
63 | date = opts.get('date') | |
53 | if date: |
|
64 | if date: | |
54 | opts['date'] = util.parsedate(date) |
|
65 | opts['date'] = util.parsedate(date) | |
55 |
|
66 | |||
56 | parent, _p2 = repo.dirstate.parents() |
|
67 | parent, _p2 = repo.dirstate.parents() | |
57 | branch = repo.dirstate.branch() |
|
68 | branch = repo.dirstate.branch() | |
58 | try: |
|
69 | try: | |
59 | branchnode = repo.branchtip(branch) |
|
70 | branchnode = repo.branchtip(branch) | |
60 | except error.RepoLookupError: |
|
71 | except error.RepoLookupError: | |
61 | branchnode = None |
|
72 | branchnode = None | |
62 | if parent != branchnode: |
|
73 | if parent != branchnode: | |
63 | raise error.Abort(_('working directory not at branch tip'), |
|
74 | raise error.Abort(_('working directory not at branch tip'), | |
64 | hint=_("use 'hg update' to check out branch tip")) |
|
75 | hint=_("use 'hg update' to check out branch tip")) | |
65 |
|
76 | |||
66 | wlock = lock = None |
|
77 | wlock = lock = None | |
67 | try: |
|
78 | try: | |
68 | wlock = repo.wlock() |
|
79 | wlock = repo.wlock() | |
69 | lock = repo.lock() |
|
80 | lock = repo.lock() | |
70 |
|
81 | |||
71 | cmdutil.bailifchanged(repo) |
|
82 | cmdutil.bailifchanged(repo) | |
72 |
|
83 | |||
73 | bheads = repo.branchheads(branch) |
|
84 | bheads = repo.branchheads(branch) | |
74 | bheads = [head for head in bheads if len(repo[head].children()) == 0] |
|
85 | bheads = [head for head in bheads if len(repo[head].children()) == 0] | |
75 | if len(bheads) > 1: |
|
86 | if len(bheads) > 1: | |
76 | raise error.Abort(_('multiple heads in this branch ' |
|
87 | raise error.Abort(_('multiple heads in this branch ' | |
77 | '(use "hg heads ." and "hg merge" to merge)')) |
|
88 | '(use "hg heads ." and "hg merge" to merge)')) | |
78 |
|
89 | |||
79 | other = hg.peer(repo, opts, ui.expandpath(source)) |
|
90 | other = hg.peer(repo, opts, ui.expandpath(source)) | |
80 | ui.status(_('pulling from %s\n') % |
|
91 | ui.status(_('pulling from %s\n') % | |
81 | util.hidepassword(ui.expandpath(source))) |
|
92 | util.hidepassword(ui.expandpath(source))) | |
82 | revs = None |
|
93 | revs = None | |
83 | if opts['rev']: |
|
94 | if opts['rev']: | |
84 | try: |
|
95 | try: | |
85 | revs = [other.lookup(rev) for rev in opts['rev']] |
|
96 | revs = [other.lookup(rev) for rev in opts['rev']] | |
86 | except error.CapabilityError: |
|
97 | except error.CapabilityError: | |
87 | err = _("other repository doesn't support revision lookup, " |
|
98 | err = _("other repository doesn't support revision lookup, " | |
88 | "so a rev cannot be specified.") |
|
99 | "so a rev cannot be specified.") | |
89 | raise error.Abort(err) |
|
100 | raise error.Abort(err) | |
90 |
|
101 | |||
91 | # Are there any changes at all? |
|
102 | # Are there any changes at all? | |
92 | modheads = exchange.pull(repo, other, heads=revs).cgresult |
|
103 | modheads = exchange.pull(repo, other, heads=revs).cgresult | |
93 | if modheads == 0: |
|
104 | if modheads == 0: | |
94 | return 0 |
|
105 | return 0 | |
95 |
|
106 | |||
96 | # Is this a simple fast-forward along the current branch? |
|
107 | # Is this a simple fast-forward along the current branch? | |
97 | newheads = repo.branchheads(branch) |
|
108 | newheads = repo.branchheads(branch) | |
98 | newchildren = repo.changelog.nodesbetween([parent], newheads)[2] |
|
109 | newchildren = repo.changelog.nodesbetween([parent], newheads)[2] | |
99 | if len(newheads) == 1 and len(newchildren): |
|
110 | if len(newheads) == 1 and len(newchildren): | |
100 | if newchildren[0] != parent: |
|
111 | if newchildren[0] != parent: | |
101 | return hg.update(repo, newchildren[0]) |
|
112 | return hg.update(repo, newchildren[0]) | |
102 | else: |
|
113 | else: | |
103 | return 0 |
|
114 | return 0 | |
104 |
|
115 | |||
105 | # Are there more than one additional branch heads? |
|
116 | # Are there more than one additional branch heads? | |
106 | newchildren = [n for n in newchildren if n != parent] |
|
117 | newchildren = [n for n in newchildren if n != parent] | |
107 | newparent = parent |
|
118 | newparent = parent | |
108 | if newchildren: |
|
119 | if newchildren: | |
109 | newparent = newchildren[0] |
|
120 | newparent = newchildren[0] | |
110 | hg.clean(repo, newparent) |
|
121 | hg.clean(repo, newparent) | |
111 | newheads = [n for n in newheads if n != newparent] |
|
122 | newheads = [n for n in newheads if n != newparent] | |
112 | if len(newheads) > 1: |
|
123 | if len(newheads) > 1: | |
113 | ui.status(_('not merging with %d other new branch heads ' |
|
124 | ui.status(_('not merging with %d other new branch heads ' | |
114 | '(use "hg heads ." and "hg merge" to merge them)\n') % |
|
125 | '(use "hg heads ." and "hg merge" to merge them)\n') % | |
115 | (len(newheads) - 1)) |
|
126 | (len(newheads) - 1)) | |
116 | return 1 |
|
127 | return 1 | |
117 |
|
128 | |||
118 | if not newheads: |
|
129 | if not newheads: | |
119 | return 0 |
|
130 | return 0 | |
120 |
|
131 | |||
121 | # Otherwise, let's merge. |
|
132 | # Otherwise, let's merge. | |
122 | err = False |
|
133 | err = False | |
123 | if newheads: |
|
134 | if newheads: | |
124 | # By default, we consider the repository we're pulling |
|
135 | # By default, we consider the repository we're pulling | |
125 | # *from* as authoritative, so we merge our changes into |
|
136 | # *from* as authoritative, so we merge our changes into | |
126 | # theirs. |
|
137 | # theirs. | |
127 | if opts['switch_parent']: |
|
138 | if opts['switch_parent']: | |
128 | firstparent, secondparent = newparent, newheads[0] |
|
139 | firstparent, secondparent = newparent, newheads[0] | |
129 | else: |
|
140 | else: | |
130 | firstparent, secondparent = newheads[0], newparent |
|
141 | firstparent, secondparent = newheads[0], newparent | |
131 | ui.status(_('updating to %d:%s\n') % |
|
142 | ui.status(_('updating to %d:%s\n') % | |
132 | (repo.changelog.rev(firstparent), |
|
143 | (repo.changelog.rev(firstparent), | |
133 | short(firstparent))) |
|
144 | short(firstparent))) | |
134 | hg.clean(repo, firstparent) |
|
145 | hg.clean(repo, firstparent) | |
135 | ui.status(_('merging with %d:%s\n') % |
|
146 | ui.status(_('merging with %d:%s\n') % | |
136 | (repo.changelog.rev(secondparent), short(secondparent))) |
|
147 | (repo.changelog.rev(secondparent), short(secondparent))) | |
137 | err = hg.merge(repo, secondparent, remind=False) |
|
148 | err = hg.merge(repo, secondparent, remind=False) | |
138 |
|
149 | |||
139 | if not err: |
|
150 | if not err: | |
140 | # we don't translate commit messages |
|
151 | # we don't translate commit messages | |
141 | message = (cmdutil.logmessage(ui, opts) or |
|
152 | message = (cmdutil.logmessage(ui, opts) or | |
142 | ('Automated merge with %s' % |
|
153 | ('Automated merge with %s' % | |
143 | util.removeauth(other.url()))) |
|
154 | util.removeauth(other.url()))) | |
144 | editopt = opts.get('edit') or opts.get('force_editor') |
|
155 | editopt = opts.get('edit') or opts.get('force_editor') | |
145 | editor = cmdutil.getcommiteditor(edit=editopt, editform='fetch') |
|
156 | editor = cmdutil.getcommiteditor(edit=editopt, editform='fetch') | |
146 | n = repo.commit(message, opts['user'], opts['date'], editor=editor) |
|
157 | n = repo.commit(message, opts['user'], opts['date'], editor=editor) | |
147 | ui.status(_('new changeset %d:%s merges remote changes ' |
|
158 | ui.status(_('new changeset %d:%s merges remote changes ' | |
148 | 'with local\n') % (repo.changelog.rev(n), |
|
159 | 'with local\n') % (repo.changelog.rev(n), | |
149 | short(n))) |
|
160 | short(n))) | |
150 |
|
161 | |||
151 | return err |
|
162 | return err | |
152 |
|
163 | |||
153 | finally: |
|
164 | finally: | |
154 | release(lock, wlock) |
|
165 | release(lock, wlock) |
@@ -1,176 +1,175 b'' | |||||
1 | #require test-repo |
|
1 | #require test-repo | |
2 |
|
2 | |||
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 | |
10 | hgext/fsmonitor/pywatchman/pybser.py not using absolute_import |
|
9 | hgext/fsmonitor/pywatchman/pybser.py not using absolute_import | |
11 | hgext/gpg.py not using absolute_import |
|
10 | hgext/gpg.py not using absolute_import | |
12 | hgext/graphlog.py not using absolute_import |
|
11 | hgext/graphlog.py not using absolute_import | |
13 | hgext/hgcia.py not using absolute_import |
|
12 | hgext/hgcia.py not using absolute_import | |
14 | hgext/hgk.py not using absolute_import |
|
13 | hgext/hgk.py not using absolute_import | |
15 | hgext/highlight/__init__.py not using absolute_import |
|
14 | hgext/highlight/__init__.py not using absolute_import | |
16 | hgext/highlight/highlight.py not using absolute_import |
|
15 | hgext/highlight/highlight.py not using absolute_import | |
17 | hgext/histedit.py not using absolute_import |
|
16 | hgext/histedit.py not using absolute_import | |
18 | hgext/largefiles/__init__.py not using absolute_import |
|
17 | hgext/largefiles/__init__.py not using absolute_import | |
19 | hgext/largefiles/basestore.py not using absolute_import |
|
18 | hgext/largefiles/basestore.py not using absolute_import | |
20 | hgext/largefiles/lfcommands.py not using absolute_import |
|
19 | hgext/largefiles/lfcommands.py not using absolute_import | |
21 | hgext/largefiles/lfutil.py not using absolute_import |
|
20 | hgext/largefiles/lfutil.py not using absolute_import | |
22 | hgext/largefiles/localstore.py not using absolute_import |
|
21 | hgext/largefiles/localstore.py not using absolute_import | |
23 | hgext/largefiles/overrides.py not using absolute_import |
|
22 | hgext/largefiles/overrides.py not using absolute_import | |
24 | hgext/largefiles/proto.py not using absolute_import |
|
23 | hgext/largefiles/proto.py not using absolute_import | |
25 | hgext/largefiles/remotestore.py not using absolute_import |
|
24 | hgext/largefiles/remotestore.py not using absolute_import | |
26 | hgext/largefiles/reposetup.py not using absolute_import |
|
25 | hgext/largefiles/reposetup.py not using absolute_import | |
27 | hgext/largefiles/uisetup.py not using absolute_import |
|
26 | hgext/largefiles/uisetup.py not using absolute_import | |
28 | hgext/largefiles/wirestore.py not using absolute_import |
|
27 | hgext/largefiles/wirestore.py not using absolute_import | |
29 | hgext/mq.py not using absolute_import |
|
28 | hgext/mq.py not using absolute_import | |
30 | hgext/rebase.py not using absolute_import |
|
29 | hgext/rebase.py not using absolute_import | |
31 | hgext/share.py not using absolute_import |
|
30 | hgext/share.py not using absolute_import | |
32 | hgext/win32text.py not using absolute_import |
|
31 | hgext/win32text.py not using absolute_import | |
33 | i18n/check-translation.py not using absolute_import |
|
32 | i18n/check-translation.py not using absolute_import | |
34 | i18n/polib.py not using absolute_import |
|
33 | i18n/polib.py not using absolute_import | |
35 | setup.py not using absolute_import |
|
34 | setup.py not using absolute_import | |
36 | tests/heredoctest.py requires print_function |
|
35 | tests/heredoctest.py requires print_function | |
37 | tests/md5sum.py not using absolute_import |
|
36 | tests/md5sum.py not using absolute_import | |
38 | tests/readlink.py not using absolute_import |
|
37 | tests/readlink.py not using absolute_import | |
39 | tests/readlink.py requires print_function |
|
38 | tests/readlink.py requires print_function | |
40 | tests/run-tests.py not using absolute_import |
|
39 | tests/run-tests.py not using absolute_import | |
41 | tests/svn-safe-append.py not using absolute_import |
|
40 | tests/svn-safe-append.py not using absolute_import | |
42 | tests/test-atomictempfile.py not using absolute_import |
|
41 | tests/test-atomictempfile.py not using absolute_import | |
43 | tests/test-demandimport.py not using absolute_import |
|
42 | tests/test-demandimport.py not using absolute_import | |
44 |
|
43 | |||
45 | #if py3exe |
|
44 | #if py3exe | |
46 | $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py |
|
45 | $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py | |
47 | contrib/check-code.py: invalid syntax: (unicode error) 'unicodeescape' codec can't decode bytes in position *-*: malformed \N character escape (<unknown>, line *) (glob) |
|
46 | contrib/check-code.py: invalid syntax: (unicode error) 'unicodeescape' codec can't decode bytes in position *-*: malformed \N character escape (<unknown>, line *) (glob) | |
48 | doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) |
|
47 | doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) | |
49 | hgext/automv.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) |
|
48 | hgext/automv.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) | |
50 | hgext/blackbox.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
49 | hgext/blackbox.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
51 | hgext/bugzilla.py: error importing module: <ImportError> No module named 'urlparse' (line *) (glob) |
|
50 | hgext/bugzilla.py: error importing module: <ImportError> No module named 'urlparse' (line *) (glob) | |
52 | hgext/censor.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
51 | hgext/censor.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
53 | hgext/chgserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob) |
|
52 | hgext/chgserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob) | |
54 | hgext/children.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
53 | hgext/children.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
55 | hgext/churn.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
54 | hgext/churn.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
56 | hgext/clonebundles.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
55 | hgext/clonebundles.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
57 | hgext/color.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) |
|
56 | hgext/color.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) | |
58 | hgext/convert/bzr.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
57 | hgext/convert/bzr.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
59 | hgext/convert/common.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) |
|
58 | hgext/convert/common.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) | |
60 | hgext/convert/convcmd.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) |
|
59 | hgext/convert/convcmd.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) | |
61 | hgext/convert/cvs.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
60 | hgext/convert/cvs.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
62 | hgext/convert/cvsps.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) |
|
61 | hgext/convert/cvsps.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) | |
63 | hgext/convert/darcs.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
62 | hgext/convert/darcs.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
64 | hgext/convert/filemap.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
63 | hgext/convert/filemap.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
65 | hgext/convert/git.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
64 | hgext/convert/git.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
66 | hgext/convert/gnuarch.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
65 | hgext/convert/gnuarch.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
67 | hgext/convert/hg.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
66 | hgext/convert/hg.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
68 | hgext/convert/monotone.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
67 | hgext/convert/monotone.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
69 | hgext/convert/p*.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) |
|
68 | hgext/convert/p*.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob) | |
70 | hgext/convert/subversion.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) |
|
69 | hgext/convert/subversion.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) | |
71 | hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) (glob) |
|
70 | hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) (glob) | |
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) | |
79 | hgext/hgcia.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
78 | hgext/hgcia.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
80 | hgext/hgk.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
79 | hgext/hgk.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
81 | hgext/histedit.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) |
|
80 | hgext/histedit.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) | |
82 | hgext/keyword.py: error importing: <ImportError> No module named 'BaseHTTPServer' (error at common.py:*) (glob) |
|
81 | hgext/keyword.py: error importing: <ImportError> No module named 'BaseHTTPServer' (error at common.py:*) (glob) | |
83 | hgext/largefiles/basestore.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) |
|
82 | hgext/largefiles/basestore.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) | |
84 | hgext/largefiles/lfcommands.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) |
|
83 | hgext/largefiles/lfcommands.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) | |
85 | hgext/largefiles/lfutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
84 | hgext/largefiles/lfutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
86 | hgext/largefiles/localstore.py: error importing module: <ImportError> No module named 'lfutil' (line *) (glob) |
|
85 | hgext/largefiles/localstore.py: error importing module: <ImportError> No module named 'lfutil' (line *) (glob) | |
87 | hgext/largefiles/overrides.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) |
|
86 | hgext/largefiles/overrides.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) | |
88 | hgext/largefiles/proto.py: error importing: <ImportError> No module named 'httplib' (error at httppeer.py:*) (glob) |
|
87 | hgext/largefiles/proto.py: error importing: <ImportError> No module named 'httplib' (error at httppeer.py:*) (glob) | |
89 | hgext/largefiles/remotestore.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at wireproto.py:*) (glob) |
|
88 | hgext/largefiles/remotestore.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at wireproto.py:*) (glob) | |
90 | hgext/largefiles/reposetup.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
89 | hgext/largefiles/reposetup.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
91 | hgext/largefiles/uisetup.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob) |
|
90 | hgext/largefiles/uisetup.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob) | |
92 | hgext/largefiles/wirestore.py: error importing module: <ImportError> No module named 'lfutil' (line *) (glob) |
|
91 | hgext/largefiles/wirestore.py: error importing module: <ImportError> No module named 'lfutil' (line *) (glob) | |
93 | hgext/mq.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) |
|
92 | hgext/mq.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob) | |
94 | hgext/notify.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
93 | hgext/notify.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
95 | hgext/pager.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
94 | hgext/pager.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
96 | hgext/patchbomb.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
95 | hgext/patchbomb.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
97 | hgext/purge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
96 | hgext/purge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
98 | hgext/rebase.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) |
|
97 | hgext/rebase.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) | |
99 | hgext/record.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
98 | hgext/record.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
100 | hgext/relink.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
99 | hgext/relink.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
101 | hgext/schemes.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
100 | hgext/schemes.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
102 | hgext/share.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
101 | hgext/share.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
103 | hgext/shelve.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) |
|
102 | hgext/shelve.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) | |
104 | hgext/strip.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
103 | hgext/strip.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
105 | hgext/transplant.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) |
|
104 | hgext/transplant.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) | |
106 | mercurial/archival.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) |
|
105 | mercurial/archival.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) | |
107 | mercurial/branchmap.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
106 | mercurial/branchmap.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
108 | mercurial/bundle*.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) |
|
107 | mercurial/bundle*.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) | |
109 | mercurial/bundlerepo.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) |
|
108 | mercurial/bundlerepo.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) | |
110 | mercurial/changegroup.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
109 | mercurial/changegroup.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
111 | mercurial/changelog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
110 | mercurial/changelog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
112 | mercurial/cmdutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
111 | mercurial/cmdutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
113 | mercurial/commands.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) |
|
112 | mercurial/commands.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) | |
114 | mercurial/commandserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob) |
|
113 | mercurial/commandserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob) | |
115 | mercurial/context.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
114 | mercurial/context.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
116 | mercurial/copies.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
115 | mercurial/copies.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
117 | mercurial/crecord.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
116 | mercurial/crecord.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
118 | mercurial/dirstate.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
117 | mercurial/dirstate.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
119 | mercurial/discovery.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
118 | mercurial/discovery.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
120 | mercurial/dispatch.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
119 | mercurial/dispatch.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
121 | mercurial/exchange.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) |
|
120 | mercurial/exchange.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) | |
122 | mercurial/extensions.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
121 | mercurial/extensions.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
123 | mercurial/filelog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
122 | mercurial/filelog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
124 | mercurial/filemerge.py: error importing: <ImportError> No module named 'cPickle' (error at formatter.py:*) (glob) |
|
123 | mercurial/filemerge.py: error importing: <ImportError> No module named 'cPickle' (error at formatter.py:*) (glob) | |
125 | mercurial/fileset.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
124 | mercurial/fileset.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
126 | mercurial/formatter.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) |
|
125 | mercurial/formatter.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob) | |
127 | mercurial/graphmod.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
126 | mercurial/graphmod.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
128 | mercurial/help.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
127 | mercurial/help.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
129 | mercurial/hg.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) |
|
128 | mercurial/hg.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob) | |
130 | mercurial/hgweb/common.py: error importing module: <ImportError> No module named 'BaseHTTPServer' (line *) (glob) |
|
129 | mercurial/hgweb/common.py: error importing module: <ImportError> No module named 'BaseHTTPServer' (line *) (glob) | |
131 | mercurial/hgweb/hgweb_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) |
|
130 | mercurial/hgweb/hgweb_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) | |
132 | mercurial/hgweb/hgwebdir_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) |
|
131 | mercurial/hgweb/hgwebdir_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) | |
133 | mercurial/hgweb/protocol.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) |
|
132 | mercurial/hgweb/protocol.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) | |
134 | mercurial/hgweb/request.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) |
|
133 | mercurial/hgweb/request.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) | |
135 | mercurial/hgweb/server.py: error importing module: <ImportError> No module named 'BaseHTTPServer' (line *) (glob) |
|
134 | mercurial/hgweb/server.py: error importing module: <ImportError> No module named 'BaseHTTPServer' (line *) (glob) | |
136 | mercurial/hgweb/webcommands.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) |
|
135 | mercurial/hgweb/webcommands.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) | |
137 | mercurial/hgweb/webutil.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) |
|
136 | mercurial/hgweb/webutil.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) | |
138 | mercurial/hgweb/wsgicgi.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) |
|
137 | mercurial/hgweb/wsgicgi.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob) | |
139 | mercurial/hook.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
138 | mercurial/hook.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
140 | mercurial/httpclient/_readers.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) |
|
139 | mercurial/httpclient/_readers.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) | |
141 | mercurial/httpconnection.py: error importing: <ImportError> No module named 'cStringIO' (error at __init__.py:*) (glob) |
|
140 | mercurial/httpconnection.py: error importing: <ImportError> No module named 'cStringIO' (error at __init__.py:*) (glob) | |
142 | mercurial/httppeer.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) |
|
141 | mercurial/httppeer.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) | |
143 | mercurial/keepalive.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) |
|
142 | mercurial/keepalive.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) | |
144 | mercurial/localrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
143 | mercurial/localrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
145 | mercurial/mail.py: error importing module: <AttributeError> module 'email' has no attribute 'Header' (line *) (glob) |
|
144 | mercurial/mail.py: error importing module: <AttributeError> module 'email' has no attribute 'Header' (line *) (glob) | |
146 | mercurial/manifest.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
145 | mercurial/manifest.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
147 | mercurial/merge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
146 | mercurial/merge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
148 | mercurial/namespaces.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
147 | mercurial/namespaces.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
149 | mercurial/patch.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
148 | mercurial/patch.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
150 | mercurial/pure/mpatch.py: error importing module: <ImportError> cannot import name 'pycompat' (line *) (glob) |
|
149 | mercurial/pure/mpatch.py: error importing module: <ImportError> cannot import name 'pycompat' (line *) (glob) | |
151 | mercurial/pure/parsers.py: error importing module: <ImportError> No module named 'mercurial.pure.node' (line *) (glob) |
|
150 | mercurial/pure/parsers.py: error importing module: <ImportError> No module named 'mercurial.pure.node' (line *) (glob) | |
152 | mercurial/repair.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) |
|
151 | mercurial/repair.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) | |
153 | mercurial/revlog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
152 | mercurial/revlog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
154 | mercurial/revset.py: error importing module: <AttributeError> 'dict' object has no attribute 'iteritems' (line *) (glob) |
|
153 | mercurial/revset.py: error importing module: <AttributeError> 'dict' object has no attribute 'iteritems' (line *) (glob) | |
155 | mercurial/scmutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
154 | mercurial/scmutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
156 | mercurial/scmwindows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob) |
|
155 | mercurial/scmwindows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob) | |
157 | mercurial/simplemerge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
156 | mercurial/simplemerge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
158 | mercurial/sshpeer.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at wireproto.py:*) (glob) |
|
157 | mercurial/sshpeer.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at wireproto.py:*) (glob) | |
159 | mercurial/sshserver.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
158 | mercurial/sshserver.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
160 | mercurial/statichttprepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
159 | mercurial/statichttprepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
161 | mercurial/store.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
160 | mercurial/store.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
162 | mercurial/streamclone.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
161 | mercurial/streamclone.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
163 | mercurial/subrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
162 | mercurial/subrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
164 | mercurial/templatefilters.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
163 | mercurial/templatefilters.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
165 | mercurial/templatekw.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
164 | mercurial/templatekw.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
166 | mercurial/templater.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
165 | mercurial/templater.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
167 | mercurial/ui.py: error importing: <ImportError> No module named 'cPickle' (error at formatter.py:*) (glob) |
|
166 | mercurial/ui.py: error importing: <ImportError> No module named 'cPickle' (error at formatter.py:*) (glob) | |
168 | mercurial/unionrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
167 | mercurial/unionrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
169 | mercurial/url.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) |
|
168 | mercurial/url.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob) | |
170 | mercurial/verify.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) |
|
169 | mercurial/verify.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob) | |
171 | mercurial/win*.py: error importing module: <ImportError> No module named 'msvcrt' (line *) (glob) |
|
170 | mercurial/win*.py: error importing module: <ImportError> No module named 'msvcrt' (line *) (glob) | |
172 | mercurial/windows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob) |
|
171 | mercurial/windows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob) | |
173 | mercurial/wireproto.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) |
|
172 | mercurial/wireproto.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob) | |
174 | tests/readlink.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) |
|
173 | tests/readlink.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) | |
175 |
|
174 | |||
176 | #endif |
|
175 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now