Show More
@@ -5,10 +5,19 b'' | |||||
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 | from __future__ import absolute_import | |||
|
9 | ||||
8 | import collections |
|
10 | import collections | |
9 | from node import nullid, short |
|
11 | ||
10 | from i18n import _ |
|
12 | from .i18n import _ | |
11 | import util, error |
|
13 | from .node import ( | |
|
14 | nullid, | |||
|
15 | short, | |||
|
16 | ) | |||
|
17 | from . import ( | |||
|
18 | error, | |||
|
19 | util, | |||
|
20 | ) | |||
12 |
|
21 | |||
13 | def findcommonincoming(repo, remote, heads=None, force=False): |
|
22 | def findcommonincoming(repo, remote, heads=None, force=False): | |
14 | """Return a tuple (common, fetch, heads) used to identify the common |
|
23 | """Return a tuple (common, fetch, heads) used to identify the common |
General Comments 0
You need to be logged in to leave comments.
Login now