tests/test-sqlite3-permissions.t
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 09 Dec 2019 11:09:11 -0800
changeset 5343 ebfd0d875600
parent 5332 2570d2d4a268
permissions -rw-r--r--
evolve: handle relocation during divergence resolution producing no changes When resolving divergence and the two divergent commits have different parents, we start by rebasing one of them to have the same parent as the other. That step can result in no changes to commit. When it does, we would crash with a TypeError before this patch. This patch fixes it by instead creating an empty commit in that scenario. The existing code then continues to attempt to merge it, which produces no changes, and no commit is created on top. The other side of the divergence is marked as successor as usual, so orphans from the side that became empty will be evolved to the right place (see test).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5332
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     1
#require unix-permissions
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     2
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     3
Test that sqlite3 cache files inherit the permissions of the .hg
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     4
directory like other cache files.
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     5
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     6
  $ . $TESTDIR/testlib/common.sh
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     7
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     8
  $ cat << EOF >> $HGRCPATH
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
     9
  > [extensions]
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    10
  > evolve =
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    11
  > EOF
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    12
  $ hg init test
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    13
  $ cd test
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    14
  $ chmod 700 .hg
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    15
  $ hg debugupdatecache
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    16
  $ ls -l .hg/cache/evoext_*.sqlite
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    17
  -rw------- * .hg/cache/evoext_obshashrange_v2.sqlite (glob)
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    18
  -rw------- * .hg/cache/evoext_stablerange_v2.sqlite (glob)
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    19
  $ rm -r .hg/cache
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    20
  $ chmod 770 .hg
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    21
  $ hg debugupdatecache
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    22
  $ ls -l .hg/cache/evoext_*.sqlite
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    23
  -rw-rw---- * .hg/cache/evoext_obshashrange_v2.sqlite (glob)
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    24
  -rw-rw---- * .hg/cache/evoext_stablerange_v2.sqlite (glob)
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    25
  $ rm -r .hg/cache
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    26
  $ chmod 774 .hg
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    27
  $ hg debugupdatecache
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    28
  $ ls -l .hg/cache/evoext_*.sqlite
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    29
  -rw-rw-r-- * .hg/cache/evoext_obshashrange_v2.sqlite (glob)
2570d2d4a268 caches: preserve permissions of top-level .hg
Joerg Sonnenberger <joerg@bec.de>
parents:
diff changeset
    30
  -rw-rw-r-- * .hg/cache/evoext_stablerange_v2.sqlite (glob)