This is an archive of the discontinued Mercurial Phabricator instance.

Differential D215

evolution: rename divergent to content-divergent
ClosedPublic

Authored by lothiraldan on Aug 2 2017, 4:23 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2194a8723138: evolution: rename divergent to content-divergent
Summary

Rename divergent to content-divergent in all external user-facing output. Only
update user-facing output for the moment, variables names, templates keyword
and potentially configuration would be done in later series.

The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 580

mercurial/commands.py

ui.status(_('phases: %s\n') % ', '.join(t)) ui.status(_('phases: %s\n') % ', '.join(t))
if obsolete.isenabled(repo, obsolete.createmarkersopt): if obsolete.isenabled(repo, obsolete.createmarkersopt):
for trouble in ("unstable", "divergent", "bumped"): for trouble in ("unstable", "divergent", "bumped"):
numtrouble = len(repo.revs(trouble + "()")) numtrouble = len(repo.revs(trouble + "()"))
# We write all the possibilities to ease translation # We write all the possibilities to ease translation
troublemsg = { troublemsg = {
"unstable": _("orphan: %d changesets"), "unstable": _("orphan: %d changesets"),
"divergent": _("divergent: %d changesets"), "divergent": _("content-divergent: %d changesets"),
"bumped": _("bumped: %d changesets"), "bumped": _("bumped: %d changesets"),
} }
if numtrouble > 0: if numtrouble > 0:
ui.status(troublemsg[trouble] % numtrouble + "\n") ui.status(troublemsg[trouble] % numtrouble + "\n")
cmdutil.summaryhooks(ui, repo) cmdutil.summaryhooks(ui, repo)
if opts.get('remote'): if opts.get('remote'):

mercurial/context.py

return self.unstable() or self.bumped() or self.divergent() return self.unstable() or self.bumped() or self.divergent()
def troubles(self): def troubles(self):
"""return the list of troubles affecting this changesets. """return the list of troubles affecting this changesets.
Troubles are returned as strings. possible values are: Troubles are returned as strings. possible values are:
- orphan, - orphan,
- bumped, - bumped,
- divergent. - content-divergent.
""" """
troubles = [] troubles = []
if self.unstable(): if self.unstable():
troubles.append('orphan') troubles.append('orphan')
if self.bumped(): if self.bumped():
troubles.append('bumped') troubles.append('bumped')
if self.divergent(): if self.divergent():
troubles.append('divergent') troubles.append('content-divergent')
return troubles return troubles
def parents(self): def parents(self):
"""return contexts for each parent changeset""" """return contexts for each parent changeset"""
return self._parents return self._parents
def p1(self): def p1(self):
return self._parents[0] return self._parents[0]

mercurial/exchange.py

return False return False
# something to push # something to push
if not pushop.force: if not pushop.force:
# if repo.obsstore == False --> no obsolete # if repo.obsstore == False --> no obsolete
# then, save the iteration # then, save the iteration
if unfi.obsstore: if unfi.obsstore:
# this message are here for 80 char limit reason # this message are here for 80 char limit reason
mso = _("push includes obsolete changeset: %s!") mso = _("push includes obsolete changeset: %s!")
mscd = _("push includes content-divergent changeset: %s!")
mst = {"orphan": _("push includes orphan changeset: %s!"), mst = {"orphan": _("push includes orphan changeset: %s!"),
"bumped": _("push includes bumped 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 # If we are to push if there is at least one
# obsolete or unstable changeset in missing, at # obsolete or unstable changeset in missing, at
# least one of the missinghead will be obsolete or # least one of the missinghead will be obsolete or
# unstable. So checking heads only is ok # unstable. So checking heads only is ok
for node in outgoing.missingheads: for node in outgoing.missingheads:
ctx = unfi[node] ctx = unfi[node]
if ctx.obsolete(): if ctx.obsolete():
raise error.Abort(mso % ctx) raise error.Abort(mso % ctx)

tests/test-obsmarker-template.t

0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m "A2" $ hg commit --amend -m "A2"
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:65b757b745b9 @ changeset: 3:65b757b745b9
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: divergent | instability: content-divergent
| summary: A2 | summary: A2
| |
| o changeset: 2:fdf9bde5129a | o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e |/ parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: divergent | instability: content-divergent
| summary: A1 | summary: A1
| |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg commit --amend -m 'A3' $ hg commit --amend -m 'A3'
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 4:019fadeab383 @ changeset: 4:019fadeab383
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: divergent | instability: content-divergent
| summary: A3 | summary: A3
| |
| x changeset: 3:65b757b745b9 | x changeset: 3:65b757b745b9
|/ parent: 0:ea207398892e |/ parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2 | summary: A2
| |
| o changeset: 2:fdf9bde5129a | o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e |/ parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: divergent | instability: content-divergent
| summary: A1 | summary: A1
| |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
$ hg commit --amend -m "Add B only" $ hg commit --amend -m "Add B only"
$ hg log -G $ hg log -G
@ changeset: 9:0b997eb7ceee @ changeset: 9:0b997eb7ceee
| tag: tip | tag: tip
| parent: 5:dd800401bd8c | parent: 5:dd800401bd8c
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: divergent | instability: content-divergent
| summary: Add B only | summary: Add B only
| |
| o changeset: 8:b18bc8331526 | o changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c |/ parent: 5:dd800401bd8c
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: divergent | instability: content-divergent
| summary: Add only B | summary: Add only B
| |
| o changeset: 7:ba2ed02b0c9a | o changeset: 7:ba2ed02b0c9a
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan, divergent | | instability: orphan, content-divergent
| | summary: Add A,B,C | | summary: Add A,B,C
| | | |
| x changeset: 6:4a004186e638 | x changeset: 6:4a004186e638
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: Add A,B,C | summary: Add A,B,C
| |
o changeset: 5:dd800401bd8c o changeset: 5:dd800401bd8c
| parent: 3:f897c6137566 | parent: 3:f897c6137566
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: divergent | instability: content-divergent
| summary: Add A,B,C | summary: Add A,B,C
| |
o changeset: 3:f897c6137566 o changeset: 3:f897c6137566
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: C0 | summary: C0
| |

tests/test-obsolete-divergent.t

392fd25390da 392fd25390da
check that mercurial refuse to push check that mercurial refuse to push
$ hg init ../other $ hg init ../other
$ hg push ../other $ hg push ../other
pushing to ../other pushing to ../other
searching for changes searching for changes
abort: push includes divergent changeset: 392fd25390da! abort: push includes content-divergent changeset: 392fd25390da!
[255] [255]
$ cd .. $ cd ..
indirect divergence with known changeset indirect divergence with known changeset
------------------------------------------- -------------------------------------------
> mapping = {node('desc(B1)'): [node('desc(B3)')], > mapping = {node('desc(B1)'): [node('desc(B3)')],
> node('desc(B3)'): [node('desc(B4)')]} > node('desc(B3)'): [node('desc(B4)')]}
> scmutil.cleanupnodes(repo, mapping, 'test') > scmutil.cleanupnodes(repo, mapping, 'test')
> EOF > EOF
$ rm .hg/localtags $ rm .hg/localtags
$ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
$ hg log -G -T '{rev}:{node|short} {desc} {troubles}' -r 'sort(all(), topo)' $ 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 | o 1:48b9aae0607f Z
| |
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg debugobsolete $ hg debugobsolete
a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

tests/test-rebase-obsolete.t

rebasing 15:73568ab6879d "bar foo" (tip) rebasing 15:73568ab6879d "bar foo" (tip)
$ hg summary $ hg summary
parent: 17:61bd55f69bc4 tip parent: 17:61bd55f69bc4 tip
bar foo bar foo
branch: default branch: default
commit: (clean) commit: (clean)
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 8 draft phases: 8 draft
divergent: 2 changesets content-divergent: 2 changesets
rebase --continue + skipped rev because their successors are in destination 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. we make a change in trunk and work on conflicting changes to make rebase abort.
$ hg log -G -r 17:: $ hg log -G -r 17::
@ 17:61bd55f69bc4 bar foo @ 17:61bd55f69bc4 bar foo
| |
~ ~