equal
deleted
inserted
replaced
3 # Copyright 2017 Boris Feld <boris.feld@octobus.net> |
3 # Copyright 2017 Boris Feld <boris.feld@octobus.net> |
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 __future__ import absolute_import |
|
9 |
8 |
10 import re |
9 import re |
11 |
10 |
12 from .i18n import _ |
11 from .i18n import _ |
13 from .node import ( |
12 from .node import ( |
17 from . import ( |
16 from . import ( |
18 diffutil, |
17 diffutil, |
19 encoding, |
18 encoding, |
20 error, |
19 error, |
21 phases, |
20 phases, |
22 pycompat, |
|
23 util, |
21 util, |
24 ) |
22 ) |
25 from .utils import dateutil |
23 from .utils import dateutil |
26 |
24 |
27 ### obsolescence marker flag |
25 ### obsolescence marker flag |
56 # "bumped" here. |
54 # "bumped" here. |
57 bumpedfix = 1 |
55 bumpedfix = 1 |
58 usingsha256 = 2 |
56 usingsha256 = 2 |
59 |
57 |
60 |
58 |
61 class marker(object): |
59 class marker: |
62 """Wrap obsolete marker raw data""" |
60 """Wrap obsolete marker raw data""" |
63 |
61 |
64 def __init__(self, repo, data): |
62 def __init__(self, repo, data): |
65 # the repo argument will be used to create changectx in later version |
63 # the repo argument will be used to create changectx in later version |
66 self._repo = repo |
64 self._repo = repo |
996 # we already know the latest base for this divergency |
994 # we already know the latest base for this divergency |
997 continue |
995 continue |
998 base[tuple(nsuccset)] = n |
996 base[tuple(nsuccset)] = n |
999 return [ |
997 return [ |
1000 {b'divergentnodes': divset, b'commonpredecessor': b} |
998 {b'divergentnodes': divset, b'commonpredecessor': b} |
1001 for divset, b in pycompat.iteritems(base) |
999 for divset, b in base.items() |
1002 ] |
1000 ] |
1003 |
1001 |
1004 |
1002 |
1005 def whyunstable(repo, ctx): |
1003 def whyunstable(repo, ctx): |
1006 result = [] |
1004 result = [] |