tests/test-revert-flags.t
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Wed, 14 Oct 2015 02:40:04 +0900
changeset 26630 3111b45a2bbf
parent 22046 7a9cbb315d84
permissions -rw-r--r--
parsers: make pack_dirstate take now in integer for consistency On recent OS, 'stat.st_mtime' has a double precision floating point value to represent nano seconds, but it is not wide enough for actual file timestamp: nowadays, only 52 - 32 = 20 bit width is available for decimal places in sec. Therefore, casting it to 'int' may cause unexpected result. See also changeset 13272104bb07 fixing issue4836 for detail. For example, changed file A may be treated as "clean" unexpectedly in steps below. "rounded now" is the value gotten by rounding via 'int(st.st_mtime)' or so. ---------------------+--------------------+------------------------ "now" | | timestamp of A (time_t) float rounded time_t| action | FS dirstate ------ ------- ------+--------------------+-------- --------------- N+.nnn N N | | --- --- | update file A | N | dirstate.normal(A) | N N+.999 N+1 N | | | dirstate.write() | N (*1) | : | | change file A | N | : | N+1.00 N+1 N+1 | | | "hg status" (*2) | N N ------ ------- ------+--------------------+-------- --------------- Timestamp N of A in dirstate isn't dropped at (*1), because "rounded now" is N+1 at that time, even if 'st_mtime' in 'time_t' is still N. Then, file A is unexpectedly treated as "clean" at (*2) in this case. For consistent handling of 'stat.st_mtime', this patch makes 'pack_dirstate()' take 'now' argument not in floating point but in integer. This patch makes 'PyArg_ParseTuple()' in 'pack_dirstate()' use format 'i' (= checking type mismatch or overflow), even though it is ensured that 'now' is in the range of 32bit signed integer by masking with '_rangemask' (= 0x7fffffff) on caller side. It should be cheaper enough than packing itself, and useful to detect that legacy code invokes 'pack_dirstate()' with 'now' in floating point value.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 16913
diff changeset
     1
#require execbit
6030
d0dbae32517c revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     2
12110
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     3
  $ hg init repo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     4
  $ cd repo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     5
  $ echo foo > foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     6
  $ chmod 644 foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     7
  $ hg ci -qAm '644'
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     8
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     9
  $ chmod 755 foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    10
  $ hg ci -qAm '755'
6030
d0dbae32517c revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    11
12110
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    12
reverting to rev 0
6030
d0dbae32517c revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    13
12110
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    14
  $ hg revert -a -r 0
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    15
  reverting foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    16
  $ hg st
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    17
  M foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    18
  $ hg diff --git
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    19
  diff --git a/foo b/foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    20
  old mode 100755
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    21
  new mode 100644
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12110
diff changeset
    22
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12110
diff changeset
    23
  $ cd ..