This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8843

rebase: fix regression in file change detection introduced by 0ecb3b11fcad
ClosedPublic

Authored by mjacob on Jul 28 2020, 2:59 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG0ea08126a2af: rebase: fix regression in file change detection introduced by 0ecb3b11fcad
Summary

Before 0ecb3b11fcad, wctx._compact(), was called by wctx.nofilechanges() as
a side effect. Later, it turned out that this side effect is needed to correctly
detect which files changed. See https://phab.mercurial-scm.org/D8733#131949 for
the history.

The problem could also be triggered by running tests/test-rebase-parameters.t
with --extra-config-opt rebase.experimental.inmemory=1.

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

mjacob created this revision.Jul 28 2020, 2:59 PM
Manuel Jacob <me@manueljacob.de> added a commit: rHG0ea08126a2af: rebase: fix regression in file change detection introduced by 0ecb3b11fcad.Jul 28 2020, 3:38 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0ea08126a2af: rebase: fix regression in file change detection introduced by 0ecb3b11fcad (authored by Manuel Jacob <me@manueljacob.de>). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.Sep 17 2020, 7:10 PM
hgext/rebase.py
1447

Reminder to do this :) Do you have a planned fix? Sorry if there is one that I just haven't seen (or forgotten).

(I just happened to notice this comment while looking at the rebase code today.)

mjacob added inline comments.Sep 19 2020, 1:21 AM
hgext/rebase.py
1447

Sorry, I forgot about this. Since this was submitted, I did almost no Mercurial development. I think I’ll look into this next week.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (4 lines)
Mtests/test-rebase-inmemory.t (18 lines)

Diff 22143

hgext/rebase.py

'''Commit the memory changes with parents p1 and p2. '''Commit the memory changes with parents p1 and p2.
Return node of committed revision.''' Return node of committed revision.'''
# By convention, ``extra['branch']`` (set by extrafn) clobbers # By convention, ``extra['branch']`` (set by extrafn) clobbers
# ``branch`` (used when passing ``--keepbranches``). # ``branch`` (used when passing ``--keepbranches``).
branch = None branch = None
if b'branch' in extra: if b'branch' in extra:
branch = extra[b'branch'] branch = extra[b'branch']
# FIXME: We call _compact() because it's required to correctly detect
# changed files. This was added to fix a regression shortly before the 5.5
# release. A proper fix will be done in the default branch.
martinvonzUnsubmitted
Not Done

Reminder to do this :) Do you have a planned fix? Sorry if there is one that I just haven't seen (or forgotten).

(I just happened to notice this comment while looking at the rebase code today.)

martinvonz: Reminder to do this :) Do you have a planned fix? Sorry if there is one that I just haven't…
mjacobAuthorUnsubmitted
Done

Sorry, I forgot about this. Since this was submitted, I did almost no Mercurial development. I think I’ll look into this next week.

mjacob: Sorry, I forgot about this. Since this was submitted, I did almost no Mercurial development. I…
wctx._compact()
memctx = wctx.tomemctx( memctx = wctx.tomemctx(
commitmsg, commitmsg,
date=date, date=date,
extra=extra, extra=extra,
user=user, user=user,
branch=branch, branch=branch,
editor=editor, editor=editor,
) )

tests/test-rebase-inmemory.t

o 3: 506e2454484b 'merge' o 3: 506e2454484b 'merge'
|\ |\
| o 2: 531f80391e4a 'c' | o 2: 531f80391e4a 'c'
| | | |
o | 1: 6f252845ea45 'a' o | 1: 6f252845ea45 'a'
|/ |/
o 0: d20a80d4def3 'base' o 0: d20a80d4def3 'base'
$ cd ..
Test (virtual) working directory without changes, created by merge conflict
resolution. There was a regression where the file was incorrectly detected as
changed although the file contents were the same as in the parent.
$ hg init nofilechanges
$ cd nofilechanges
$ echo a > a; hg add a; hg ci -m a
$ echo foo > test; hg add test; hg ci -m b
$ hg up 0 -q
$ echo bar > test; hg add test; hg ci -m c
created new head
$ hg rebase -d 2 -d 1 --tool :local
rebasing 2:ca2749322ee5 "c" (tip)
note: not rebasing 2:ca2749322ee5 "c" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/nofilechanges/.hg/strip-backup/ca2749322ee5-6dc7e94b-rebase.hg