tests/test-revert-unknown.t
author Simon Sapin <simon.sapin@octobus.net>
Fri, 15 Oct 2021 16:12:00 +0200
changeset 48250 1730b2fceaa1
parent 44724 5c2a4f37eace
child 49621 55c6ebd11cb9
permissions -rw-r--r--
dirstate-v2: adds a flag to mark a file as modified Right now, a files with a file system state that requires a lookup (same size, different mtime) will requires a lookup. If the result of that lookup is a modified files, it will remains ambiguous, requiring a lookup on the next status run too. To fix this, we introduce a dedicated flag in the new format. Such flag will allow to record such file as "known modified" avoiding an extra lookup later. As None of the associate code currently exist in the status code, we do the minimal implementation: if we read a dirstate entry with this flag set, we make it as "ambiguous" so that the next status code has to look it up. The same as it would have to without this flag existing anyway. Differential Revision: https://phab.mercurial-scm.org/D11681
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
44724
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents: 12156
diff changeset
    27
  $ ls -A
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents: 12156
diff changeset
    28
  .hg
12111
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    29
  a
327dee7f7327 tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 2982
diff changeset
    30
  unknown