This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6749

tests: demonstrate crash when committing subset of copies to changeset
ClosedPublic

Authored by martinvonz on Aug 20 2019, 12:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG170b070ec6a5: tests: demonstrate crash when committing subset of copies to changeset
Summary

When writing copy metadata to the changeset and not committing all
copies in the dirstate, we get a ProgrammingError. This commit adds
two tests showing how to trigger this bug.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 20 2019, 12:29 PM
martinvonz added a commit: rHG170b070ec6a5: tests: demonstrate crash when committing subset of copies to changeset.Sep 5 2019, 3:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG170b070ec6a5: tests: demonstrate crash when committing subset of copies to changeset (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-in-changeset.t (31 lines)

Diff 16282

tests/test-copies-in-changeset.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> copies.write-to=changeset-only > copies.write-to=changeset-only
> copies.read-from=changeset-only > copies.read-from=changeset-only
> [alias] > [alias]
> changesetcopies = log -r . -T 'files: {files} > changesetcopies = log -r . -T 'files: {files}
> {extras % "{ifcontains("files", key, "{key}: {value}\n")}"} > {extras % "{ifcontains("files", key, "{key}: {value}\n")}"}
> {extras % "{ifcontains("copies", key, "{key}: {value}\n")}"}' > {extras % "{ifcontains("copies", key, "{key}: {value}\n")}"}'
> showcopies = log -r . -T '{file_copies % "{source} -> {name}\n"}' > showcopies = log -r . -T '{file_copies % "{source} -> {name}\n"}'
> [extensions] > [extensions]
> rebase = > rebase =
> split =
> EOF > EOF
Check that copies are recorded correctly Check that copies are recorded correctly
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo a > a $ echo a > a
$ hg add a $ hg add a
rebasing 2:fc7287ac5b9b "rename a to b" (tip) rebasing 2:fc7287ac5b9b "rename a to b" (tip)
merging a and b to b merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/fc7287ac5b9b-8f2a95ec-rebase.hg saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/fc7287ac5b9b-8f2a95ec-rebase.hg
$ hg st --change . --copies $ hg st --change . --copies
A b A b
a a
R a R a
$ cd .. $ cd ..
Test splitting a commit
$ hg init split
$ cd split
$ echo a > a
$ echo b > b
$ hg ci -Aqm 'add a and b'
$ echo a2 > a
$ hg mv b c
$ hg ci -m 'modify a, move b to c'
$ (hg --config ui.interactive=yes split 2>&1 | grep mercurial.error) <<EOF
> y
> y
> n
> y
> EOF
mercurial.error.ProgrammingError: some copy targets missing from file list
$ cd ..
Test committing half a rename
$ hg init partial
$ cd partial
$ echo a > a
$ hg ci -Aqm 'add a'
$ hg mv a b
$ hg ci -m 'remove a' a 2>&1 | grep mercurial.error
mercurial.error.ProgrammingError: some copy targets missing from file list
$ cd ..