This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8404

revset: import `unstable()` from the evolve extension
ClosedPublic

Authored by mharbison72 on Apr 13 2020, 1:25 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG48b99af7b4b3: revset: import `unstable()` from the evolve extension

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Apr 13 2020, 1:25 AM
pulkit added a subscriber: pulkit.Apr 13 2020, 10:00 AM
pulkit added inline comments.
mercurial/revset.py
2512

(EXPERIMENTAL) needs to be appended since the whole thing is experimental.

mharbison72 added inline comments.Apr 13 2020, 12:25 PM
mercurial/revset.py
2512

Good catch. There are a couple others like this too. I'll leave hidden() as not experimental, because --hidden is also not marked experimental (though it does require -v to display its help).

Alphare accepted this revision.Apr 14 2020, 5:17 AM
mharbison72 added a commit: rHG48b99af7b4b3: revset: import `unstable()` from the evolve extension.Apr 14 2020, 12:41 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG48b99af7b4b3: revset: import `unstable()` from the evolve extension (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21071

mercurial/revset.py

"""Non-obsolete changesets with obsolete ancestors. (EXPERIMENTAL) """Non-obsolete changesets with obsolete ancestors. (EXPERIMENTAL)
""" """
# i18n: "orphan" is a keyword # i18n: "orphan" is a keyword
getargs(x, 0, 0, _(b"orphan takes no arguments")) getargs(x, 0, 0, _(b"orphan takes no arguments"))
orphan = obsmod.getrevs(repo, b'orphan') orphan = obsmod.getrevs(repo, b'orphan')
return subset & orphan return subset & orphan
@predicate(b'unstable()', safe=True)
def unstable(repo, subset, x):
"""Changesets with instabilities. (EXPERIMENTAL)
pulkitUnsubmitted
Not Done

(EXPERIMENTAL) needs to be appended since the whole thing is experimental.

pulkit: `(EXPERIMENTAL)` needs to be appended since the whole thing is experimental.
mharbison72AuthorUnsubmitted
Done

Good catch. There are a couple others like this too. I'll leave hidden() as not experimental, because --hidden is also not marked experimental (though it does require -v to display its help).

mharbison72: Good catch. There are a couple others like this too. I'll leave `hidden()` as not…
"""
# i18n: "unstable" is a keyword
getargs(x, 0, 0, b'unstable takes no arguments')
_unstable = set()
_unstable.update(obsmod.getrevs(repo, b'orphan'))
_unstable.update(obsmod.getrevs(repo, b'phasedivergent'))
_unstable.update(obsmod.getrevs(repo, b'contentdivergent'))
_unstable = baseset(_unstable)
_unstable.sort() # set is non-ordered, enforce order
return subset & _unstable
@predicate(b'user(string)', safe=True, weight=10) @predicate(b'user(string)', safe=True, weight=10)
def user(repo, subset, x): def user(repo, subset, x):
"""User name contains string. The match is case-insensitive. """User name contains string. The match is case-insensitive.
Pattern matching is supported for `string`. See Pattern matching is supported for `string`. See
:hg:`help revisions.patterns`. :hg:`help revisions.patterns`.
""" """
return author(repo, subset, x) return author(repo, subset, x)

tests/test-obsolete-divergent.t

392fd25390da 392fd25390da
82623d38b9ba 82623d38b9ba
82623d38b9ba 82623d38b9ba
392fd25390da 392fd25390da
392fd25390da 392fd25390da
$ hg log -r 'contentdivergent()' $ hg log -r 'contentdivergent()'
2:82623d38b9ba A_1 2:82623d38b9ba A_1
3:392fd25390da A_2 3:392fd25390da A_2
$ hg log -r 'unstable()'
2:82623d38b9ba A_1
3:392fd25390da A_2
$ hg debugsuccessorssets 'all()' --closest $ hg debugsuccessorssets 'all()' --closest
d20a80d4def3 d20a80d4def3
d20a80d4def3 d20a80d4def3
82623d38b9ba 82623d38b9ba
82623d38b9ba 82623d38b9ba
392fd25390da 392fd25390da
392fd25390da 392fd25390da
$ hg debugsuccessorssets 'all()' --closest --hidden $ hg debugsuccessorssets 'all()' --closest --hidden

tests/test-obsolete.t

@ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
| |
| o 2:245bde4270cd (public) [ ] add original_c | o 2:245bde4270cd (public) [ ] add original_c
|/ |/
o 1:7c3bad9141dc (public) [ ] add b o 1:7c3bad9141dc (public) [ ] add b
| |
o 0:1f0dee641bb7 (public) [ ] add a o 0:1f0dee641bb7 (public) [ ] add a
$ hg log -r 'unstable()'
5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
And that bumped changeset are detected And that bumped changeset are detected
-------------------------------------- --------------------------------------
If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
note that the bumped changeset (5:5601fb93a350) is not a direct successor of note that the bumped changeset (5:5601fb93a350) is not a direct successor of
the public changeset the public changeset
$ hg up 'desc("n3w_3_c")' $ hg up 'desc("n3w_3_c")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit original_d $ mkcommit original_d
$ mkcommit original_e $ mkcommit original_e
$ hg debugobsolete --record-parents `getid original_d` -d '0 0' $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
1 new orphan changesets 1 new orphan changesets
$ hg log -r 'unstable()'
5:cda648ca50f5 (draft orphan) [tip ] add original_e
$ hg debugobsolete | grep `getid original_d` $ hg debugobsolete | grep `getid original_d`
94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg log -r 'obsolete()' $ hg log -r 'obsolete()'
4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned] 4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
$ hg summary $ hg summary
parent: 5:cda648ca50f5 tip (orphan) parent: 5:cda648ca50f5 tip (orphan)
add original_e add original_e
branch: default branch: default