view tests/test-merge5.t @ 48491:08af0adc235c

pytype: stop excluding ssutil.py

Pytype simply can't distinguish the type for this one entry's value from the
other values:

  File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 142, in _hostsettings:
      No attribute 'append' on None [attribute-error]
    In Optional[Union[Any, List[nothing], bool, bytes]]
  File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 142, in _hostsettings:
      No attribute 'append' on bool [attribute-error]
    In Optional[Union[Any, List[nothing], bool, bytes]]
  File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 142, in _hostsettings:
      No attribute 'append' on bytes [attribute-error]
    In Optional[Union[Any, List[nothing], bool, bytes]]
  File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 147, in _hostsettings:
      No attribute 'append' on None [attribute-error]
    In Optional[Union[Any, List[Tuple[Any, Any]], bool, bytes]]
  File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 147, in _hostsettings:
      No attribute 'append' on bool [attribute-error]
    In Optional[Union[Any, List[Tuple[Any, Any]], bool, bytes]]
  File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 147, in _hostsettings:
      No attribute 'append' on bytes [attribute-error]
    In Optional[Union[Any, List[Tuple[Any, Any]], bool, bytes]]

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

  $ hg init
  $ echo This is file a1 > a
  $ echo This is file b1 > b
  $ hg add a b
  $ hg commit -m "commit #0"
  $ echo This is file b22 > b
  $ hg commit -m "comment #1"
  $ hg update 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ rm b
  $ hg commit -A -m "comment #2"
  removing b
  created new head
  $ hg update 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ rm b
  $ hg update -c 2
  abort: uncommitted changes
  [20]
  $ hg revert b
  $ hg update -c 2
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ mv a c

Should abort:

  $ hg update 1
  abort: uncommitted changes
  (commit or update --clean to discard changes)
  [255]
  $ mv c a

Should succeed:

  $ hg update 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved