D215: evolution: rename divergent to content-divergent
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Fri Aug 4 21:44:36 UTC 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2194a8723138: evolution: rename divergent to content-divergent (authored by lothiraldan).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D215?vs=498&id=560
REVISION DETAIL
https://phab.mercurial-scm.org/D215
AFFECTED FILES
mercurial/commands.py
mercurial/context.py
mercurial/exchange.py
tests/test-obsmarker-template.t
tests/test-obsolete-divergent.t
tests/test-rebase-obsolete.t
CHANGE DETAILS
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -855,7 +855,7 @@
commit: (clean)
update: 1 new changesets, 2 branch heads (merge)
phases: 8 draft
- divergent: 2 changesets
+ content-divergent: 2 changesets
rebase --continue + skipped rev because their successors are in destination
we make a change in trunk and work on conflicting changes to make rebase abort.
diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t
--- a/tests/test-obsolete-divergent.t
+++ b/tests/test-obsolete-divergent.t
@@ -107,7 +107,7 @@
$ hg push ../other
pushing to ../other
searching for changes
- abort: push includes divergent changeset: 392fd25390da!
+ abort: push includes content-divergent changeset: 392fd25390da!
[255]
$ cd ..
@@ -671,9 +671,9 @@
$ rm .hg/localtags
$ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
$ hg log -G -T '{rev}:{node|short} {desc} {troubles}' -r 'sort(all(), topo)'
- @ 5:1a2a9b5b0030 B2 divergent
+ @ 5:1a2a9b5b0030 B2 content-divergent
|
- | o 4:70d5a63ca112 B4 divergent
+ | o 4:70d5a63ca112 B4 content-divergent
| |
| o 1:48b9aae0607f Z
|
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -442,14 +442,14 @@
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: divergent
+ | instability: content-divergent
| summary: A2
|
| o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: divergent
+ | instability: content-divergent
| summary: A1
|
| x changeset: 1:471f378eab4c
@@ -469,7 +469,7 @@
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: divergent
+ | instability: content-divergent
| summary: A3
|
| x changeset: 3:65b757b745b9
@@ -482,7 +482,7 @@
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: divergent
+ | instability: content-divergent
| summary: A1
|
| x changeset: 1:471f378eab4c
@@ -1086,20 +1086,20 @@
| parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: divergent
+ | instability: content-divergent
| summary: Add B only
|
| o changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: divergent
+ | instability: content-divergent
| summary: Add only B
|
| o changeset: 7:ba2ed02b0c9a
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan, divergent
+ | | instability: orphan, content-divergent
| | summary: Add A,B,C
| |
| x changeset: 6:4a004186e638
@@ -1111,7 +1111,7 @@
| parent: 3:f897c6137566
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: divergent
+ | instability: content-divergent
| summary: Add A,B,C
|
o changeset: 3:f897c6137566
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -677,9 +677,10 @@
if unfi.obsstore:
# this message are here for 80 char limit reason
mso = _("push includes obsolete changeset: %s!")
+ mscd = _("push includes content-divergent changeset: %s!")
mst = {"orphan": _("push includes orphan changeset: %s!"),
"bumped": _("push includes bumped changeset: %s!"),
- "divergent": _("push includes divergent changeset: %s!")}
+ "content-divergent": mscd}
# If we are to push if there is at least one
# obsolete or unstable changeset in missing, at
# least one of the missinghead will be obsolete or
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -231,15 +231,15 @@
Troubles are returned as strings. possible values are:
- orphan,
- bumped,
- - divergent.
+ - content-divergent.
"""
troubles = []
if self.unstable():
troubles.append('orphan')
if self.bumped():
troubles.append('bumped')
if self.divergent():
- troubles.append('divergent')
+ troubles.append('content-divergent')
return troubles
def parents(self):
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4942,7 +4942,7 @@
# We write all the possibilities to ease translation
troublemsg = {
"unstable": _("orphan: %d changesets"),
- "divergent": _("divergent: %d changesets"),
+ "divergent": _("content-divergent: %d changesets"),
"bumped": _("bumped: %d changesets"),
}
if numtrouble > 0:
To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list