tests/test-revert-unknown.t
author Matt Harbison <matt_harbison@yahoo.com>
Tue, 12 Nov 2019 17:47:42 -0500
changeset 43699 21e05aabef8c
parent 12156 4c94b6d0fb1c
child 44724 5c2a4f37eace
permissions -rw-r--r--
hghave: add a check for the `xz` compression utility This isn't install by default on Mac, which causes a test failure. The logic for avoiding the command is a little goofy, but nested `#if` isn't supported, and it still seems worth running the hg command to see if anything explodes. With this, the py3 tests run (almost) cleanly on 10.14.6: # Ran 835 tests, 58 skipped, 1 failed. Alas, the mac-packaging test is skipped because it's slow. The failure here is in test-releasenotes-merging.t, complaining about not being able to import the `fuzzywuzzy` module. I have it installed on py3 (thus the test isn't skipped), but not on py2. So there must be some unintended cross pollination here when running `hg` commands. Differential Revision: https://phab.mercurial-scm.org/D7374
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12111
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
     1
  $ hg init
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
     2
  $ touch unknown
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     3
12111
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
     4
  $ touch a
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
     5
  $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12111
diff changeset
     6
  $ hg ci -m "1"
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
     7
12111
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
     8
  $ touch b
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
     9
  $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12111
diff changeset
    10
  $ hg ci -m "2"
12111
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    11
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    12
Should show unknown
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    13
12111
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    14
  $ hg status
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    15
  ? unknown
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    16
  $ hg revert -r 0 --all
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    17
  removing b
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    18
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    19
Should show unknown and b removed
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset
    20
12111
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    21
  $ hg status
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    22
  R b
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    23
  ? unknown
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    24
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    25
Should show a and unknown
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    26
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    27
  $ ls
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    28
  a
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    29
  unknown