view tests/test-update-atomic.t @ 42619:20d0e59be79b

tests: show the files fields of changelogs for many merges

I don't think there's coverage for many of the subtle cases, and I
found it hard to understand what the code is doing by reading it.  The
test takes 40s to run on a laptop, or 9s with --chg.

I have yet to find a description of what the files field is supposed
to be for merges. I thought it could be one of:
1. the files added/modified/removed relative to p1 (wouldn't seem
  useful, but `hg diff -c -r mergerev` has this behavior)
2. the files with filelog nodes not in either parent (i.e., what is
needed to create a bundle out of a commit)
3. the files added/removed/modified files by merge itself [1]

It's clearly not 1, because file contents merges are symmetric. It's
clearly not 2 because removed files and exec bit changes are
listed. It's also not 3 but I think it's intended to be 3 and the
differences are bugs.

Assuming 3, the test shows that, for merges, the list of files both
overapproximates and underapproximates. All the cases involve file
changes not in the filelog but in the manifest (existence of file
at revision, exec bit and file vs symlink).

I didn't look at all underapproximations, but they looked minor. The
two overapproximations are problematic though because they both cause
potentially long lists of files when merging cleanly.


[1] even what it means for the merge commit itself to change a file is
not completely trivial. A file in the merge being the same as in one
of the parent is too lax as it would consider that merges change
nothing when they revert all the changes done on one side. The
criteria used in the test and in the next commit for "merge didn't
touch a file" is:
- the parents and the merge all have the same file
- or, one parent didn't touch the file and the other parent contains
  the same file as the merge

Differential Revision: https://phab.mercurial-scm.org/D6612

#require execbit unix-permissions

Checking that experimental.atomic-file works.

  $ cat > $TESTTMP/show_mode.py <<EOF
  > from __future__ import print_function
  > import os
  > import stat
  > import sys
  > ST_MODE = stat.ST_MODE
  > 
  > for file_path in sys.argv[1:]:
  >     file_stat = os.stat(file_path)
  >     octal_mode = oct(file_stat[ST_MODE] & 0o777).replace('o', '')
  >     print("%s:%s" % (file_path, octal_mode))
  > 
  > EOF

  $ hg init repo
  $ cd repo

  $ cat > .hg/showwrites.py <<EOF
  > from __future__ import print_function
  > from mercurial import pycompat
  > from mercurial.utils import stringutil
  > def uisetup(ui):
  >   from mercurial import vfs
  >   class newvfs(vfs.vfs):
  >     def __call__(self, *args, **kwargs):
  >       print(pycompat.sysstr(stringutil.pprint(
  >           ('vfs open', args, sorted(list(kwargs.items()))))))
  >       return super(newvfs, self).__call__(*args, **kwargs)
  >   vfs.vfs = newvfs
  > EOF

  $ for v in a1 a2 b1 b2 c ro; do echo $v > $v; done
  $ chmod +x b*
  $ hg commit -Aqm _

# We check that
# - the changes are actually atomic
# - that permissions are correct (all 4 cases of (executable before) * (executable after))
# - that renames work, though they should be atomic anyway
# - that it works when source files are read-only (but directories are read-write still)

  $ for v in a1 a2 b1 b2 ro; do echo changed-$v > $v; done
  $ chmod -x *1; chmod +x *2
  $ hg rename c d
  $ hg commit -qm _

Check behavior without update.atomic-file

  $ hg update -r 0 -q
  $ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb"
  ('vfs open', ('a1', 'wb'), [('atomictemp', False), ('backgroundclose', True)])

  $ python $TESTTMP/show_mode.py *
  a1:0644
  a2:0755
  b1:0644
  b2:0755
  d:0644
  ro:0644

Add a second revision for the ro file so we can test update when the file is
present or not

  $ echo "ro" > ro

  $ hg commit -qm _

Check behavior without update.atomic-file first

  $ hg update -C -r 0 -q

  $ hg update -r 1
  6 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ python $TESTTMP/show_mode.py *
  a1:0644
  a2:0755
  b1:0644
  b2:0755
  d:0644
  ro:0644

Manually reset the mode of the read-only file

  $ chmod a-w ro

  $ python $TESTTMP/show_mode.py ro
  ro:0444

Now the file is present, try to update and check the permissions of the file

  $ hg up -r 2
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ python $TESTTMP/show_mode.py ro
  ro:0644

# The file which was read-only is now writable in the default behavior

Check behavior with update.atomic-files


  $ cat >> .hg/hgrc <<EOF
  > [experimental]
  > update.atomic-file = true
  > EOF

  $ hg update -C -r 0 -q
  $ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb"
  ('vfs open', ('a1', 'wb'), [('atomictemp', True), ('backgroundclose', True)])
  $ hg st -A --rev 1
  C a1
  C a2
  C b1
  C b2
  C d
  C ro

Check the file permission after update
  $ python $TESTTMP/show_mode.py *
  a1:0644
  a2:0755
  b1:0644
  b2:0755
  d:0644
  ro:0644

Manually reset the mode of the read-only file

  $ chmod a-w ro

  $ python $TESTTMP/show_mode.py ro
  ro:0444

Now the file is present, try to update and check the permissions of the file

  $ hg update -r 2 --traceback
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ python $TESTTMP/show_mode.py ro
  ro:0644

# The behavior is the same as without atomic update