D8041: revset: add a revset for parents in merge state

Closed by commit rHG8561ad49915d: revset: add a revset for parents in merge state (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8041?vs=20094=20133

D8041: revset: add a revset for parents in merge state

martinvonz updated this revision to Diff 20094. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8041?vs=19869=20094 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/ REVISION DETAIL

D8041: revset: add a revset for parents in merge state

martinvonz added inline comments. martinvonz marked an inline comment as done. INLINE COMMENTS > martinvonz wrote in next:3 > Those both sound like good ideas. I'll send an update later today. I've renamed them `conflictlocal()` and `conflictother()`. Hopefully that's clear enough and not too

D8041: revset: add a revset for parents in merge state

martinvonz updated this revision to Diff 19869. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8041?vs=19722=19869 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/ REVISION DETAIL

D8041: revset: add a revset for parents in merge state

martinvonz added a comment. In D8041#118684 , @yuja wrote: >> +@predicate(b'conflictparents()', safe=True) >> +def parents(repo, subset, x): > > ^^^ > > Nit: copy-paste error? Good catch. Done. INLINE COMMENTS > pulkit

D8041: revset: add a revset for parents in merge state

marmoute added inline comments. INLINE COMMENTS > next:3 > > + * New `conflictparents()` revset returns the commits that are being > + merged, when there are conflicts. Also works for conflicts caused Could we call this `conflict_sides`, using "parents" for things that are not actual

D8041: revset: add a revset for parents in merge state

martinvonz marked an inline comment as done. martinvonz updated this revision to Diff 19722. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8041?vs=19701=19722 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/

D8041: revset: add a revset for parents in merge state

yuja added a comment. > +@predicate(b'conflictparents()', safe=True) > +def parents(repo, subset, x): ^^^ Nit: copy-paste error? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/ REVISION DETAIL

Re: D8041: revset: add a revset for parents in merge state

> +@predicate(b'conflictparents()', safe=True) > +def parents(repo, subset, x): ^^^ Nit: copy-paste error? ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D8041: revset: add a revset for parents in merge state

pulkit added inline comments. INLINE COMMENTS > revset.py:1866 > + > +If "merge" here includes merge conflicts from e.g. 'hg rebase' or > +'hg graft'. The sentence looks incomplete. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8041/new/

D8041: revset: add a revset for parents in merge state

martinvonz created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This may be particularly useful soon, when I'm going to change how `hg rebase` sets its parents during conflict resolution. REPOSITORY rHG