This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11208

tests: demonstrate bug in `hg fix` with incorrectly dirty working copy
ClosedPublic

Authored by martinvonz on Jul 23 2021, 3:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG184d83ef2e59: tests: demonstrate bug in `hg fix` with incorrectly dirty working copy
Summary

If the parent commit needs formatting but the working copy already has
the correct formatting, then the working copy will be reported as
modified even though it's clean (because the size in the dirstate is
incorrect). Because the bug only occurs when the size changes, I
modified the formatter used in the test case to remove repeated
spaces.

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.

Revision Contents
Changeset List

PathPackages
Mtests/test-fix.t (25 lines)

Diff 29713

tests/test-fix.t

A script that implements uppercasing of specific lines in a file. This A script that implements uppercasing of specific lines in a file. This
approximates the behavior of code formatters well enough for our tests. approximates the behavior of code formatters well enough for our tests.
$ UPPERCASEPY="$TESTTMP/uppercase.py" $ UPPERCASEPY="$TESTTMP/uppercase.py"
$ cat > $UPPERCASEPY <<EOF $ cat > $UPPERCASEPY <<EOF
> import re
> import sys > import sys
> from mercurial.utils.procutil import setbinary > from mercurial.utils.procutil import setbinary
> setbinary(sys.stdin) > setbinary(sys.stdin)
> setbinary(sys.stdout) > setbinary(sys.stdout)
> stdin = getattr(sys.stdin, 'buffer', sys.stdin) > stdin = getattr(sys.stdin, 'buffer', sys.stdin)
> stdout = getattr(sys.stdout, 'buffer', sys.stdout) > stdout = getattr(sys.stdout, 'buffer', sys.stdout)
> lines = set() > lines = set()
> def format(text):
> return re.sub(b' +', b' ', text.upper())
> for arg in sys.argv[1:]: > for arg in sys.argv[1:]:
> if arg == 'all': > if arg == 'all':
> stdout.write(stdin.read().upper()) > stdout.write(format(stdin.read()))
> sys.exit(0) > sys.exit(0)
> else: > else:
> first, last = arg.split('-') > first, last = arg.split('-')
> lines.update(range(int(first), int(last) + 1)) > lines.update(range(int(first), int(last) + 1))
> for i, line in enumerate(stdin.readlines()): > for i, line in enumerate(stdin.readlines()):
> if i + 1 in lines: > if i + 1 in lines:
> stdout.write(line.upper()) > stdout.write(format(line))
> else: > else:
> stdout.write(line) > stdout.write(line)
> EOF > EOF
$ TESTLINES="foo\nbar\nbaz\nqux\n" $ TESTLINES="foo\nbar\nbaz\nqux\n"
$ printf $TESTLINES | "$PYTHON" $UPPERCASEPY $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY
foo foo
bar bar
baz baz
$ hg add $ hg add
adding something.whole adding something.whole
$ hg fix --working-dir $ hg fix --working-dir
$ cat something.whole $ cat something.whole
SOMETHING SOMETHING
$ cd .. $ cd ..
Test that the working copy is reported clean if formatting of the parent makes
it clean.
$ hg init wc-already-formatted
$ cd wc-already-formatted
$ printf "hello world\n" > hello.whole
$ hg commit -Am initial
adding hello.whole
$ hg fix -w *
$ hg st
M hello.whole
$ hg fix -s . *
$ hg st
M hello.whole (known-bad-output !)
$ hg diff
$ cd ..
Test the effect of fixing the working directory for each possible status, with Test the effect of fixing the working directory for each possible status, with
and without providing explicit file arguments. and without providing explicit file arguments.
$ hg init implicitlyfixstatus $ hg init implicitlyfixstatus
$ cd implicitlyfixstatus $ cd implicitlyfixstatus
$ printf "modified\n" > modified.whole $ printf "modified\n" > modified.whole
$ printf "removed\n" > removed.whole $ printf "removed\n" > removed.whole