equal
deleted
inserted
replaced
13 from . import ( |
13 from . import ( |
14 diffutil, |
14 diffutil, |
15 encoding, |
15 encoding, |
16 node as nodemod, |
16 node as nodemod, |
17 phases, |
17 phases, |
|
18 pycompat, |
18 util, |
19 util, |
19 ) |
20 ) |
20 from .utils import dateutil |
21 from .utils import dateutil |
21 |
22 |
22 ### obsolescence marker flag |
23 ### obsolescence marker flag |
981 # we already know the latest base for this divergency |
982 # we already know the latest base for this divergency |
982 continue |
983 continue |
983 base[tuple(nsuccset)] = n |
984 base[tuple(nsuccset)] = n |
984 return [ |
985 return [ |
985 {b'divergentnodes': divset, b'commonpredecessor': b} |
986 {b'divergentnodes': divset, b'commonpredecessor': b} |
986 for divset, b in base.iteritems() |
987 for divset, b in pycompat.iteritems(base) |
987 ] |
988 ] |
988 |
989 |
989 |
990 |
990 def whyunstable(repo, ctx): |
991 def whyunstable(repo, ctx): |
991 result = [] |
992 result = [] |