procutils: don't try to get `.buffer` if sys.stdin is None While hunting down following test failure of test-chg.t on Python 3, I stumbled the case when `.buffer` is not available as sys.stdin is None. --- /home/pulkit/repo/hg-committed/tests/test-chg.t +++ /home/pulkit/repo/hg-committed/tests/test-chg.t.err @@ -203,7 +203,31 @@ $ CHGDEBUG=1 chg version -q 0<&- chg: debug: * stdio fds are missing (glob) chg: debug: * execute original hg (glob) - Mercurial Distributed SCM * (glob) + Traceback (most recent call last): + File "/tmp/hgtests.avspvsq4/install/bin/hg", line 43, in <module> + dispatch.run() + File "/usr/lib/python3.6/importlib/util.py", line 233, in __getattribute__ + self.__spec__.loader.exec_module(self) + File "<frozen importlib._bootstrap_external>", line 678, in exec_module + File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/dispatch.py", line 726, in <module> + class lazyaliasentry(object): + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/dispatch.py", line 737, in lazyaliasentry + @util.propertycache + File "/usr/lib/python3.6/importlib/util.py", line 233, in __getattribute__ + self.__spec__.loader.exec_module(self) + File "<frozen importlib._bootstrap_external>", line 678, in exec_module + File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/util.py", line 3473, in <module> + f=procutil.stderr, + File "/usr/lib/python3.6/importlib/util.py", line 233, in __getattribute__ + self.__spec__.loader.exec_module(self) + File "<frozen importlib._bootstrap_external>", line 678, in exec_module + File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed + File "/tmp/hgtests.avspvsq4/install/lib/python/mercurial/utils/procutil.py", line 127, in <module> + stdin = sys.stdin.buffer + AttributeError: 'NoneType' object has no attribute 'buffer' + [1] server lifecycle ---------------- Differential Revision: https://phab.mercurial-scm.org/D9500

     1

  $ cat >> $HGRCPATH << EOF

     2

  > [extensions]

     3

  > absorb=

     4

  > EOF

     5

     6

  $ hg init repo1

     7

  $ cd repo1

     8

     9

Make some commits:

    10

    11

  $ for i in 1 2 3; do

    12

  >   echo $i >> a

    13

  >   hg commit -A a -m "commit $i" -q

    14

  > done

    15

    16

absorb --edit-lines will run the editor if filename is provided:

    17

    18

  $ hg absorb --edit-lines --apply-changes

    19

  nothing applied

    20

  [1]

    21

  $ HGEDITOR=cat hg absorb --edit-lines --apply-changes a

    22

  HG: editing a

    23

  HG: "y" means the line to the right exists in the changeset to the top

    24

  HG:

    25

  HG: /---- 4ec16f85269a commit 1

    26

  HG: |/--- 5c5f95224a50 commit 2

    27

  HG: ||/-- 43f0a75bede7 commit 3

    28

  HG: |||

    29

      yyy : 1

    30

       yy : 2

    31

        y : 3

    32

  nothing applied

    33

  [1]

    34

    35

Edit the file using --edit-lines:

    36

    37

  $ cat > editortext << EOF

    38

  >       y : a

    39

  >      yy :  b

    40

  >      y  : c

    41

  >     yy  : d  

    42

  >     y y : e

    43

  >     y   : f

    44

  >     yyy : g

    45

  > EOF

    46

  $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a

    47

  $ hg cat -r 0 a

    48

  d  

    49

  e

    50

  f

    51

  g

    52

  $ hg cat -r 1 a

    53

   b

    54

  c

    55

  d  

    56

  g

    57

  $ hg cat -r 2 a

    58

  a

    59

   b

    60

  e

    61

  g