view tests/test-issue5979.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.)

  $ hg init r1
  $ cd r1
  $ hg ci --config ui.allowemptycommit=true -m c0
  $ hg ci --config ui.allowemptycommit=true -m c1
  $ hg ci --config ui.allowemptycommit=true -m c2
  $ hg co -q 0
  $ hg ci --config ui.allowemptycommit=true -m c3
  created new head
  $ hg co -q 3
  $ hg merge --quiet
  $ hg ci --config ui.allowemptycommit=true -m c4

  $ hg log -G -T'{desc}'
  @    c4
  |\
  | o  c3
  | |
  o |  c2
  | |
  o |  c1
  |/
  o  c0
  

  >>> from mercurial import hg
  >>> from mercurial import ui as uimod
  >>> repo = hg.repository(uimod.ui())
  >>> for anc in repo.changelog.ancestors([4], inclusive=True):
  ...   print(anc)
  4
  3
  2
  1
  0