This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11756

rhg: Enable `rhg status` in most tests
ClosedPublic

Authored by SimonSapin on Nov 15 2021, 6:09 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb7fde9237c92: rhg: Enable `rhg status` in most tests
Summary

This subcommand is disabled by default because of bugs that make some test fail.
Enable it in the rest of the tests in order to avoid regressing them.

As with RHG_ON_UNSUPPORTED, an environment variable is used instead of
a configuration file and HGRCPATH because some tests override HGRCPATH.

Running unset RHG_STATUS at the start of a test restores the default of
rhg status being disabled. Hopefully it can be increasingly removed
from test files as bugs are fixed.

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

SimonSapin created this revision.Nov 15 2021, 6:09 AM
SimonSapin updated this revision to Diff 31066.Nov 15 2021, 6:12 AM
Alphare accepted this revision.Nov 24 2021, 6:15 AM
This revision is now accepted and ready to land.Nov 24 2021, 6:15 AM
SimonSapin added a commit: rHGb7fde9237c92: rhg: Enable `rhg status` in most tests.Nov 26 2021, 10:02 AM
Closed by commit rHGb7fde9237c92: rhg: Enable `rhg status` in most tests (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31142

rust/hg-core/src/config/config.rs

b"rhg", b"rhg",
b"on-unsupported", b"on-unsupported",
); );
config.add_for_environment_variable( config.add_for_environment_variable(
"RHG_FALLBACK_EXECUTABLE", "RHG_FALLBACK_EXECUTABLE",
b"rhg", b"rhg",
b"fallback-executable", b"fallback-executable",
); );
config.add_for_environment_variable("RHG_STATUS", b"rhg", b"status");
// HGRCPATH replaces user config // HGRCPATH replaces user config
if opt_rc_path.is_none() { if opt_rc_path.is_none() {
config.add_user_config()? config.add_user_config()?
} }
if let Some(rc_path) = &opt_rc_path { if let Some(rc_path) = &opt_rc_path {
for path in env::split_paths(rc_path) { for path in env::split_paths(rc_path) {
if !path.as_os_str().is_empty() { if !path.as_os_str().is_empty() {

tests/run-tests.py

# Affects hghave.py # Affects hghave.py
osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1' osenvironb[b'RHG_INSTALLED_AS_HG'] = b'1'
# Affects configuration. Alternatives would be setting configuration through # Affects configuration. Alternatives would be setting configuration through
# `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include # `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include
# `--config` but that disrupts tests that print command lines and check expected # `--config` but that disrupts tests that print command lines and check expected
# output. # output.
osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback' osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg
osenvironb[b'RHG_STATUS'] = b'1'
else: else:
# drop flag for hghave # drop flag for hghave
osenvironb.pop(b'RHG_INSTALLED_AS_HG', None) osenvironb.pop(b'RHG_INSTALLED_AS_HG', None)
if self.options.rhg: if self.options.rhg:
self._hgcommand = b'rhg' self._hgcommand = b'rhg'
elif self.options.with_rhg: elif self.options.with_rhg:
rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg)) rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg))
self._hgcommand = os.path.basename(self.options.with_rhg) self._hgcommand = os.path.basename(self.options.with_rhg)

tests/test-basic.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
Create a repository: Create a repository:
#if no-extraextensions #if no-extraextensions
$ hg config $ hg config
chgserver.idletimeout=60 chgserver.idletimeout=60
devel.all-warnings=true devel.all-warnings=true
devel.default-date=0 0 devel.default-date=0 0
extensions.fsmonitor= (fsmonitor !) extensions.fsmonitor= (fsmonitor !)

tests/test-conflict.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init $ hg init
$ cat << EOF > a $ cat << EOF > a
> Small Mathematical Series. > Small Mathematical Series.
> One > One
> Two > Two
> Three > Three
> Four > Four
> Five > Five

tests/test-dirstate.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-rc-dirstate-v2=1 > exp-rc-dirstate-v2=1
> [storage] > [storage]
> dirstate-v2.slow-path=allow > dirstate-v2.slow-path=allow
> EOF > EOF
#endif #endif
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
------ Test dirstate._dirs refcounting ------ Test dirstate._dirs refcounting
$ hg init t $ hg init t
$ cd t $ cd t
$ mkdir -p a/b/c/d $ mkdir -p a/b/c/d
$ touch a/b/c/d/x $ touch a/b/c/d/x
$ touch a/b/c/d/y $ touch a/b/c/d/y
$ touch a/b/c/d/z $ touch a/b/c/d/z

tests/test-encode.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
Test encode/decode filters Test encode/decode filters
$ hg init $ hg init
$ cat > .hg/hgrc <<EOF $ cat > .hg/hgrc <<EOF
> [encode] > [encode]
> not.gz = tr [:lower:] [:upper:] > not.gz = tr [:lower:] [:upper:]
> *.gz = gzip -d > *.gz = gzip -d
> [decode] > [decode]

tests/test-execute-bit.t

#require execbit #require execbit
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init $ hg init
$ echo a > a $ echo a > a
$ hg ci -Am'not executable' $ hg ci -Am'not executable'
adding a adding a
$ chmod +x a $ chmod +x a
$ hg ci -m'executable' $ hg ci -m'executable'
$ hg id $ hg id

tests/test-hgignore.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-rc-dirstate-v2=1 > exp-rc-dirstate-v2=1
> [storage] > [storage]
> dirstate-v2.slow-path=allow > dirstate-v2.slow-path=allow
> EOF > EOF
#endif #endif
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init ignorerepo $ hg init ignorerepo
$ cd ignorerepo $ cd ignorerepo
debugignore with no hgignore should be deterministic: debugignore with no hgignore should be deterministic:
$ hg debugignore $ hg debugignore
<nevermatcher> <nevermatcher>
Issue562: .hgignore requires newline at end: Issue562: .hgignore requires newline at end:

tests/test-import.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init a $ hg init a
$ mkdir a/d1 $ mkdir a/d1
$ mkdir a/d1/d2 $ mkdir a/d1/d2
$ echo line 1 > a/a $ echo line 1 > a/a
$ echo line 1 > a/d1/d2/a $ echo line 1 > a/d1/d2/a
$ hg --cwd a ci -Ama $ hg --cwd a ci -Ama
adding a adding a
adding d1/d2/a adding d1/d2/a

tests/test-issue6528.t

=============================================================== ===============================================================
Test non-regression on the corruption associated with issue6528 Test non-regression on the corruption associated with issue6528
=============================================================== ===============================================================
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
Setup Setup
===== =====
$ hg init base-repo $ hg init base-repo
$ cd base-repo $ cd base-repo
$ cat <<EOF > a.txt $ cat <<EOF > a.txt
> 1 > 1

tests/test-merge-exec.t

=============================================== ===============================================
Testing merge involving change to the exec flag Testing merge involving change to the exec flag
=============================================== ===============================================
#require execbit #require execbit
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
Initial setup Initial setup
============== ==============
$ hg init base-repo $ hg init base-repo
$ cd base-repo $ cd base-repo
$ cat << EOF > a $ cat << EOF > a

tests/test-merge-types.t

#require symlink execbit #require symlink execbit
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ tellmeabout() { $ tellmeabout() {
> if [ -h $1 ]; then > if [ -h $1 ]; then
> echo $1 is a symlink: > echo $1 is a symlink:
> $TESTDIR/readlink.py $1 > $TESTDIR/readlink.py $1
> elif [ -x $1 ]; then > elif [ -x $1 ]; then
> echo $1 is an executable file with content: > echo $1 is an executable file with content:
> cat $1 > cat $1
> else > else

tests/test-permissions.t

#require unix-permissions no-root reporevlogstore #require unix-permissions no-root reporevlogstore
#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-rc-dirstate-v2=1 > exp-rc-dirstate-v2=1
> [storage] > [storage]
> dirstate-v2.slow-path=allow > dirstate-v2.slow-path=allow
> EOF > EOF
#endif #endif
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init t $ hg init t
$ cd t $ cd t
$ echo foo > a $ echo foo > a
$ hg add a $ hg add a
$ hg commit -m "1" $ hg commit -m "1"

tests/test-rename-dir-merge.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init t $ hg init t
$ cd t $ cd t
$ mkdir a $ mkdir a
$ echo foo > a/a $ echo foo > a/a
$ echo bar > a/b $ echo bar > a/b
$ hg ci -Am "0" $ hg ci -Am "0"
adding a/a adding a/a

tests/test-status-color.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [ui] > [ui]
> color = always > color = always
> [color] > [color]
> mode = ansi > mode = ansi
> EOF > EOF
Terminfo codes compatibility fix Terminfo codes compatibility fix
$ echo "color.none=0" >> $HGRCPATH $ echo "color.none=0" >> $HGRCPATH

tests/test-status-terse.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ mkdir folder $ mkdir folder
$ cd folder $ cd folder
$ hg init $ hg init
$ mkdir x x/l x/m x/n x/l/u x/l/u/a $ mkdir x x/l x/m x/n x/l/u x/l/u/a
$ touch a b x/aa.o x/bb.o $ touch a b x/aa.o x/bb.o
$ hg status $ hg status
? a ? a
? b ? b

tests/test-status.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-rc-dirstate-v2=1 > exp-rc-dirstate-v2=1
> [storage] > [storage]
> dirstate-v2.slow-path=allow > dirstate-v2.slow-path=allow
> EOF > EOF
#endif #endif
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init repo1 $ hg init repo1
$ cd repo1 $ cd repo1
$ mkdir a b a/1 b/1 b/2 $ mkdir a b a/1 b/1 b/2
$ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2 $ touch in_root a/in_a b/in_b a/1/in_a_1 b/1/in_b_1 b/2/in_b_2
hg status in repo root: hg status in repo root:
$ hg status $ hg status

tests/test-subrepo-deep-nested-change.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extdiff] > [extdiff]
> # for portability: > # for portability:
> pdiff = sh "$RUNTESTDIR/pdiff" > pdiff = sh "$RUNTESTDIR/pdiff"
> [progress] > [progress]
> disable=False > disable=False
> assume-tty = 1 > assume-tty = 1
> delay = 0 > delay = 0

tests/test-subrepo-missing.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ hg init subrepo $ hg init subrepo
$ echo a > subrepo/a $ echo a > subrepo/a
$ hg -R subrepo ci -Am adda $ hg -R subrepo ci -Am adda
adding a adding a
$ echo 'subrepo = subrepo' > .hgsub $ echo 'subrepo = subrepo' > .hgsub
$ hg ci -Am addsubrepo $ hg ci -Am addsubrepo

tests/test-symlinks.t

#require symlink #require symlink
#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-rc-dirstate-v2=1 > exp-rc-dirstate-v2=1
> [storage] > [storage]
> dirstate-v2.slow-path=allow > dirstate-v2.slow-path=allow
> EOF > EOF
#endif #endif
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
== tests added in 0.7 == == tests added in 0.7 ==
$ hg init test-symlinks-0.7; cd test-symlinks-0.7; $ hg init test-symlinks-0.7; cd test-symlinks-0.7;
$ touch foo; ln -s foo bar; ln -s nonexistent baz $ touch foo; ln -s foo bar; ln -s nonexistent baz
import with add and addremove -- symlink walking should _not_ screwup. import with add and addremove -- symlink walking should _not_ screwup.
$ hg add $ hg add