equal
deleted
inserted
replaced
3 # Copyright 2010 Matt Mackall <mpm@selenic.com> |
3 # Copyright 2010 Matt Mackall <mpm@selenic.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 from node import nullid, short |
8 from __future__ import absolute_import |
9 from i18n import _ |
9 |
10 import util, setdiscovery, treediscovery, phases, obsolete, bookmarks |
10 from .i18n import _ |
11 import branchmap |
11 from .node import ( |
|
12 nullid, |
|
13 short, |
|
14 ) |
|
15 |
|
16 from . import ( |
|
17 bookmarks, |
|
18 branchmap, |
|
19 obsolete, |
|
20 phases, |
|
21 setdiscovery, |
|
22 treediscovery, |
|
23 util, |
|
24 ) |
12 |
25 |
13 def findcommonincoming(repo, remote, heads=None, force=False): |
26 def findcommonincoming(repo, remote, heads=None, force=False): |
14 """Return a tuple (common, anyincoming, heads) used to identify the common |
27 """Return a tuple (common, anyincoming, heads) used to identify the common |
15 subset of nodes between repo and remote. |
28 subset of nodes between repo and remote. |
16 |
29 |