This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8041

revset: add a revset for parents in merge state
ClosedPublic

Authored by martinvonz on Jan 29 2020, 7:56 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8561ad49915d: revset: add a revset for parents in merge state
Summary

This may be particularly useful soon, when I'm going to change how `hg
rebase` sets its parents during conflict resolution.

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

martinvonz created this revision.Jan 29 2020, 7:56 PM
pulkit added a subscriber: pulkit.Jan 30 2020, 9:47 AM
pulkit added inline comments.
mercurial/revset.py
1898

The sentence looks incomplete.

yuja added a subscriber: yuja.Jan 30 2020, 10:25 AM

+@predicate(b'conflictparents()', safe=True)
+def parents(repo, subset, x):

^^^^^^^

Nit: copy-paste error?

marmoute added a subscriber: marmoute.Feb 3 2020, 2:30 PM
marmoute added inline comments.
relnotes/next
3

Could we call this conflict_sides, using "parents" for things that are not actual parent might be confusing.

What about having a local_conflict_side and other_conflict_side conflict_base revsets ?

martinvonz added a comment.Feb 3 2020, 2:32 PM
In D8041#118684, @yuja wrote:

+@predicate(b'conflictparents()', safe=True)
+def parents(repo, subset, x):

^^^^^^^

Nit: copy-paste error?

Good catch. Done.

mercurial/revset.py
1898

It was actually just an extra "If". Fixed.

relnotes/next
3

Those both sound like good ideas. I'll send an update later today.

martinvonz updated this revision to Diff 19869.Feb 4 2020, 12:13 PM
martinvonz marked an inline comment as done.Feb 4 2020, 12:14 PM
martinvonz added inline comments.
relnotes/next
3

I've renamed them conflictlocal() and conflictother(). Hopefully that's clear enough and not too long.

martinvonz updated this revision to Diff 20094.Feb 10 2020, 7:22 PM
durin42 accepted this revision.Feb 10 2020, 9:16 PM
This revision is now accepted and ready to land.Feb 10 2020, 9:16 PM
martinvonz added a commit: rHG8561ad49915d: revset: add a revset for parents in merge state.Feb 10 2020, 9:23 PM
Closed by commit rHG8561ad49915d: revset: add a revset for parents in merge state (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revset.py (32 lines)
Mrelnotes/next (5 lines)
Mtests/test-merge4.t (34 lines)

Diff 20133

mercurial/revset.py

startrevs = getset(repo, fullreposet(repo), x, order=anyorder) startrevs = getset(repo, fullreposet(repo), x, order=anyorder)
if not startrevs: if not startrevs:
return baseset() return baseset()
for r in startrevs: for r in startrevs:
subset &= dagop.revancestors(repo, baseset([r])) subset &= dagop.revancestors(repo, baseset([r]))
return subset return subset
@predicate(b'conflictlocal()', safe=True)
def conflictlocal(repo, subset, x):
"""The local side of the merge, if currently in an unresolved merge.
"merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
"""
getargs(x, 0, 0, _(b"conflictlocal takes no arguments"))
from . import merge
mergestate = merge.mergestate.read(repo)
if mergestate.active() and repo.changelog.hasnode(mergestate.local):
return subset & {repo.changelog.rev(mergestate.local)}
return baseset()
@predicate(b'conflictother()', safe=True)
def conflictother(repo, subset, x):
"""The other side of the merge, if currently in an unresolved merge.
"merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
"""
getargs(x, 0, 0, _(b"conflictother takes no arguments"))
from . import merge
mergestate = merge.mergestate.read(repo)
if mergestate.active() and repo.changelog.hasnode(mergestate.other):
return subset & {repo.changelog.rev(mergestate.other)}
return baseset()
@predicate(b'contains(pattern)', weight=100) @predicate(b'contains(pattern)', weight=100)
def contains(repo, subset, x): def contains(repo, subset, x):
"""The revision's manifest contains a file matching pattern (but might not """The revision's manifest contains a file matching pattern (but might not
modify it). See :hg:`help patterns` for information about file patterns. modify it). See :hg:`help patterns` for information about file patterns.
The pattern without explicit kind like ``glob:`` is expected to be The pattern without explicit kind like ``glob:`` is expected to be
relative to the current directory and match against a file exactly relative to the current directory and match against a file exactly
for efficiency. for efficiency.
return subset & ps return subset & ps
def _phase(repo, subset, *targets): def _phase(repo, subset, *targets):
"""helper to select all rev in <targets> phases""" """helper to select all rev in <targets> phases"""
return repo._phasecache.getrevset(repo, targets, subset) return repo._phasecache.getrevset(repo, targets, subset)
@predicate(b'_phase(idx)', safe=True) @predicate(b'_phase(idx)', safe=True)
pulkitUnsubmitted
Done

The sentence looks incomplete.

pulkit: The sentence looks incomplete.
martinvonzAuthorUnsubmitted
Done

It was actually just an extra "If". Fixed.

martinvonz: It was actually just an extra "If". Fixed.
def phase(repo, subset, x): def phase(repo, subset, x):
l = getargs(x, 1, 1, b"_phase requires one argument") l = getargs(x, 1, 1, b"_phase requires one argument")
target = getinteger(l[0], b"_phase expects a number") target = getinteger(l[0], b"_phase expects a number")
return _phase(repo, subset, target) return _phase(repo, subset, target)
@predicate(b'draft()', safe=True) @predicate(b'draft()', safe=True)
def draft(repo, subset, x): def draft(repo, subset, x):

relnotes/next

== New Features == == New Features ==
* `hg purge`/`hg clean` can now delete ignored files instead of * `hg purge`/`hg clean` can now delete ignored files instead of
marmouteUnsubmitted
Done

Could we call this conflict_sides, using "parents" for things that are not actual parent might be confusing.

What about having a local_conflict_side and other_conflict_side conflict_base revsets ?

marmoute: Could we call this `conflict_sides`, using "parents" for things that are not actual parent…
martinvonzAuthorUnsubmitted
Done

Those both sound like good ideas. I'll send an update later today.

martinvonz: Those both sound like good ideas. I'll send an update later today.
martinvonzAuthorUnsubmitted
Done

I've renamed them conflictlocal() and conflictother(). Hopefully that's clear enough and not too long.

martinvonz: I've renamed them `conflictlocal()` and `conflictother()`. Hopefully that's clear enough and…
untracked files, with the new -i flag. untracked files, with the new -i flag.
* New `conflictlocal()` and `conflictother()` revsets returns the
commits that are being merged, when there are conflicts. Also works
for conflicts caused by e.g. `hg graft`.
== New Experimental Features == == New Experimental Features ==
== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==

tests/test-merge4.t

$ echo This is file c22 > c $ echo This is file c22 > c
Test hg behaves when committing with a missing file added by a merge Test hg behaves when committing with a missing file added by a merge
$ hg commit -m "commit #3" $ hg commit -m "commit #3"
abort: cannot commit merge with missing files abort: cannot commit merge with missing files
[255] [255]
Test conflict*() revsets
# Bad usage
$ hg log -r 'conflictlocal(foo)'
hg: parse error: conflictlocal takes no arguments
[255]
$ hg log -r 'conflictother(foo)'
hg: parse error: conflictother takes no arguments
[255]
$ hg co -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# No merge parents when not merging
$ hg log -r 'conflictlocal() + conflictother()'
# No merge parents when there is no conflict
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg log -r 'conflictlocal() + conflictother()'
$ hg co -C .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo conflict > b
$ hg ci -Aqm 'conflicting change to b'
$ hg merge 1
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
# Shows merge parents when there is a conflict
$ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'
3 conflicting change to b
$ hg log -r 'conflictother()' -T '{rev} {desc}\n'
1 commit #1