( )⚙ D11399 narrow: show repo corruption when commiting empty files

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11399

narrow: show repo corruption when commiting empty files
ClosedPublic

Authored by valentin.gatienbaron on Sep 10 2021, 3:13 PM.

Details

Reviewers
durin42
Alphare
Group Reviewers
hg-reviewers
Commits
rHGcc33deae66a1: narrow: show repo corruption when commiting empty files

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

Alphare accepted this revision.Sep 13 2021, 6:01 AM
Alphare added a subscriber: Alphare.

In theory we'd use (known-bad-output !) and (missing-correct-output !) where appropriate, but given that you're fixing it in the next change, it does seem overkill to ask you to do so.

This revision is now accepted and ready to land.Sep 13 2021, 6:01 AM
Alphare updated this revision to Diff 30215.Sep 13 2021, 11:35 AM
valentin.gatienbaron added a comment.Sep 13 2021, 11:54 AM

It seems that this kind of corruption can propagate between clones as well. Sadness.

Alphare added a comment.Sep 13 2021, 11:55 AM

Ouch, that's unfortunate. Can this be easily checked during an addgroup?

valentin.gatienbaron added a comment.Sep 13 2021, 3:39 PM

Maybe the server could reject such changes, but I'd rather simply roll clients with the fix.

Separately, it's not exactly the kind of corruption from the test that can propagate, because push would fail in the example of the test.
But if the filelog exists (or presumably, is created afterwards), then the push can succeed. And then hg status when wdir is at such a revision in a non-narrow clone would always report the empty file as being modified.

I doubt someone else cares, but just in case, one can find problematic revisions with this command:

@command(
    b'zzz',
    [
        (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
    ],
    intents={INTENT_READONLY},
)
def zzz(ui, repo, **opts):
    """"""
    opts = pycompat.byteskwargs(opts)
    repo = repo.unfiltered()
    revs = scmutil.revrange(repo, [opts.get(b'rev')])
    for r in revs:
        node = repo[r].node()
        mnode = repo[r].manifestnode()
        for (f, fnode) in repo.manifestlog[mnode].readdelta().iteritems():
            if fnode == repo.nullid:
                ui.write(b'%b %b\n' % (hex(node), f))

Revision Contents
Changeset List

PathPackages
Mtests/test-narrow-commit.t (12 lines)

Diff 30220

tests/test-narrow-commit.t

seconds of precision, so by sleeping for 3 seconds, we can ensure that seconds of precision, so by sleeping for 3 seconds, we can ensure that
the timestamps of files stored by dirstate will appear older than the the timestamps of files stored by dirstate will appear older than the
dirstate file, and therefore we'll be able to get stable output from dirstate file, and therefore we'll be able to get stable output from
debugdirstate. If we don't do this, the test can be slightly flaky. debugdirstate. If we don't do this, the test can be slightly flaky.
$ sleep 3 $ sleep 3
$ hg status $ hg status
$ hg debugdirstate --no-dates $ hg debugdirstate --no-dates
n 644 10 set inside/f1 n 644 10 set inside/f1
Can't commit empty files
$ touch inside/c; hg add inside/c; hg commit -qm _; hg verify -q
warning: revlog 'data/inside/c.i' not in fncache!
4: empty or missing inside/c
inside/c@4: manifest refers to unknown revision 000000000000
1 warnings encountered!
hint: run "hg debugrebuildfncache" to recover from corrupt fncache
2 integrity errors encountered!
(first damaged changeset appears to be 4)
[1]