tests: store ETag when using --headeronly

Previously, --headeronly would prevent --twice from working
because the ETag wasn't stored when --headeronly was used.
This feels like a bug. That feeling is reaffirmed by the fact
that this change doesn't regress any tests.

tests/get-with-headers.py

@@ -1,92 +1,92
 #!/usr/bin/env python
 
 """This does HTTP GET requests given a host:port and path and returns
 a subset of the headers plus the body of the result."""
 
 from __future__ import absolute_import, print_function
 
 import json
 import os
 import sys
 
 from mercurial import (
     util,
 )
 
 httplib = util.httplib
 
 try:
     import msvcrt
     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
 except ImportError:
     pass
 
 twice = False
 if '--twice' in sys.argv:
     sys.argv.remove('--twice')
     twice = True
 headeronly = False
 if '--headeronly' in sys.argv:
     sys.argv.remove('--headeronly')
     headeronly = True
 formatjson = False
 if '--json' in sys.argv:
     sys.argv.remove('--json')
     formatjson = True
 
 hgproto = None
 if '--hgproto' in sys.argv:
     idx = sys.argv.index('--hgproto')
     hgproto = sys.argv[idx + 1]
     sys.argv.pop(idx)
     sys.argv.pop(idx)
 
 tag = None
 def request(host, path, show):
     assert not path.startswith('/'), path
     global tag
     headers = {}
     if tag:
         headers['If-None-Match'] = tag
     if hgproto:
         headers['X-HgProto-1'] = hgproto
 
     conn = httplib.HTTPConnection(host)
     conn.request("GET", '/' + path, None, headers)
     response = conn.getresponse()
     print(response.status, response.reason)
     if show[:1] == ['-']:
         show = sorted(h for h, v in response.getheaders()
                       if h.lower() not in show)
     for h in [h.lower() for h in show]:
         if response.getheader(h, None) is not None:
             print("%s: %s" % (h, response.getheader(h)))
     if not headeronly:
         print()
         data = response.read()
 
         # Pretty print JSON. This also has the beneficial side-effect
         # of verifying emitted JSON is well-formed.
         if formatjson:
             # json.dumps() will print trailing newlines. Eliminate them
             # to make tests easier to write.
             data = json.loads(data)
             lines = json.dumps(data, sort_keys=True, indent=2).splitlines()
             for line in lines:
                 print(line.rstrip())
         else:
             sys.stdout.write(data)
 
-        if twice and response.getheader('ETag', None):
-            tag = response.getheader('ETag')
+    if twice and response.getheader('ETag', None):
+        tag = response.getheader('ETag')
 
     return response.status
 
 status = request(sys.argv[1], sys.argv[2], sys.argv[3:])
 if twice:
     status = request(sys.argv[1], sys.argv[2], sys.argv[3:])
 
 if 200 <= status <= 305:
     sys.exit(0)
 sys.exit(1)