view tests/test-changelog-exec.t @ 51885:adbb183c2f27

vfs: simplify the `abstractvfs.rename()` implementation

PyCharm was yapping about `util.rename()` not returning anything, because it is
typed to return `None`, but the value was captured and returned after calling
`_avoidambig()`.  Instead, drop all of that, unconditionally rename, and then
call `_avoidambig()` if appropriate.

While we're here, convert the ersatz ternary operator into a modern one to help
pytype.  When a variable is initialized the old way, pytype tends to assign the
type of the LHS of the `and`.  In this case, that's a bool, and it will get
confused that bool doesn't have a `stat` attribute once this method gets more
type annotations.  (Currently it thinks the `checkambig` arg is `Any`, so it
doesn't care.)

#require execbit

b51a8138292a introduced a regression where we would mention in the
changelog executable files added by the second parent of a merge. Test
that that doesn't happen anymore

  $ hg init repo
  $ cd repo
  $ echo foo > foo
  $ hg ci -qAm 'add foo'

  $ echo bar > bar
  $ chmod +x bar
  $ hg ci -qAm 'add bar'

manifest of p2:

  $ hg manifest
  bar
  foo

  $ hg up -qC 0
  $ echo >> foo
  $ hg ci -m 'change foo'
  created new head

manifest of p1:

  $ hg manifest
  foo

  $ hg merge
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ chmod +x foo
  $ hg ci -m 'merge'

this should not mention bar but should mention foo:

  $ hg tip -v
  changeset:   3:c53d17ff3380
  tag:         tip
  parent:      2:ed1b79f46b9a
  parent:      1:d394a8db219b
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  files:       foo
  description:
  merge
  
  

  $ hg debugindex bar
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
       0       1 b004912a8510 000000000000 000000000000

  $ cd ..