This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8980

repoview: pin revisions for `local` and `other` when a merge is active
ClosedPublic

Authored by mharbison72 on Sep 4 2020, 5:44 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGaaeccdb6e654: repoview: pin revisions for `local` and `other` when a merge is active
Summary

I've hit this a couple of times, where pulling with a dirty wdir obsoletes
p1 and updating to the successor results in merge conflicts. The problem was
resolving them failed immediately, complaining that the old checkout was
filtered.

The change in test-rebase-obsolete.t is because there's an outstanding merge
conflict in a rebase operation. The summary prompt to merge seems incorrect for
this scenario, but that's an existing issue.

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.Sep 4 2020, 5:44 PM
mharbison72 added a comment.Sep 4 2020, 8:42 PM

I'm not sure if the other op_state files need similar treatment. The fact that this catches a rebase mid operation makes me think this will cover everything.

pulkit accepted this revision.Sep 8 2020, 3:34 AM
This revision is now accepted and ready to land.Sep 8 2020, 3:34 AM

Revision Contents
Changeset List

Diff 22565

mercurial/repoview.py

pinned.update([cl.rev(bm) for bm in repo._bookmarks.values()]) pinned.update([cl.rev(bm) for bm in repo._bookmarks.values()])
tags = {} tags = {}
tagsmod.readlocaltags(repo.ui, repo, tags, {}) tagsmod.readlocaltags(repo.ui, repo, tags, {})
if tags: if tags:
rev = cl.index.get_rev rev = cl.index.get_rev
pinned.update(rev(t[0]) for t in tags.values()) pinned.update(rev(t[0]) for t in tags.values())
pinned.discard(None) pinned.discard(None)
# Avoid cycle: mercurial.filemerge -> mercurial.templater ->
# mercurial.templatefuncs -> mercurial.revset -> mercurial.repoview ->
# mercurial.mergestate -> mercurial.filemerge
from . import mergestate
ms = mergestate.mergestate.read(repo)
if ms.active():
pinned.add(ms.localctx.rev())
pinned.add(ms.otherctx.rev())
return pinned return pinned
def _revealancestors(pfunc, hidden, revs): def _revealancestors(pfunc, hidden, revs):
"""reveals contiguous chains of hidden ancestors of 'revs' by removing them """reveals contiguous chains of hidden ancestors of 'revs' by removing them
from 'hidden' from 'hidden'
- pfunc(r): a funtion returning parent of 'r', - pfunc(r): a funtion returning parent of 'r',

tests/test-rebase-check-restore.t

o 3:draft 'D' o 3:draft 'D'
| |
| o 2:secret 'C' | o 2:secret 'C'
| | | |
| o 1:draft 'B' | o 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ cat >> .hg/hgrc << EOF
> [experimental]
> evolution.createmarkers=True
> EOF
When updating away from a dirty, obsolete wdir, don't complain that the old p1
is filtered and requires --hidden.
$ echo conflict > A
$ hg debugobsolete 071d07019675449d53b7e312c65bcf28adbbdb64 965c486023dbfdc9c32c52dc249a231882fd5c17
1 new obsolescence markers
obsoleted 1 changesets
$ hg update -r 2 --config ui.merge=internal:merge --merge
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
1 files updated, 0 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ hg resolve A
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
[1]
$ hg up -C -q .
$ cd .. $ cd ..

tests/test-rebase-obsolete.t

unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1] [1]
$ cp -R . $TESTTMP/hidden-state2 $ cp -R . $TESTTMP/hidden-state2
$ hg log -G $ hg log -G
@ 2:b18e25de2cf5 D @ 2:b18e25de2cf5 D
| |
| % 1:2ec65233581b B (pruned using prune)
|/
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg summary $ hg summary
parent: 2:b18e25de2cf5 tip parent: 2:b18e25de2cf5 tip
D D
branch: default branch: default
commit: 1 modified, 1 added, 1 unknown, 1 unresolved commit: 1 modified, 1 added, 1 unknown, 1 unresolved
update: (current) update: 1 new changesets, 2 branch heads (merge)
phases: 2 draft phases: 3 draft
rebase: 0 rebased, 2 remaining (rebase --continue) rebase: 0 rebased, 2 remaining (rebase --continue)
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Also test --continue for the above case Also test --continue for the above case
$ cd $TESTTMP/hidden-state2 $ cd $TESTTMP/hidden-state2