libv8 5.6.326.50.0beta1 → 5.7.492.65.0beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7112c330b5754a453c2991e5f5ad68873326a377
-  data.tar.gz: dda15f0240c57a55a6a1fb216c12dfbea3140ed0
+  metadata.gz: 49da25131392fb1dd3b357a9ecc6625208fc27bd
+  data.tar.gz: b2a6ba3094fd54ddbc3f478ebe2e83eb81d2ac1d
 SHA512:
-  metadata.gz: b90b65c23d279675155f0d7718f7e783f9c4439eab084b8828279e76c331169a1d5d5f089d45bf6896033084b70b79ab399efe19a72f45957362cd796f09b803
-  data.tar.gz: e604fb24672ba3dcd29d565f31f8ef6fe70a81a24df91b54bea9ae7252623354d5057029ce15844106fe1faa3c71a8e6a3dd6a1f39e230def4be7253c930aa16
+  metadata.gz: 8e961ed6cf39bfc9e21a26acf035cfaa3909ebea807d0dc6aedd28300dc5726cf3f7224ccbca25d426650fe9059741aea724c89b003e558273446c1858ac3bd8
+  data.tar.gz: ef5bfff65de21bc7b646828ee750caae706b79d3369e8e2ee3dd60a21c3cf00b9478798cb009e609337fbb422e877675c6298f708f898842bc29f04f1c68d565

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ### Unreleased
 
-* Update upstream v8 version to 5.6.326.50
+* Update upstream v8 version to 5.7.492.65
+* Stop using the bundled toolchain to compile. (Fixes Alpine Linux compilation
+  failures) #227
+* Set GYP_DEFINES when fetching/syncing upstream source #233
+* Add ARMv6 architecture detection #234, #235
+* Add an Alpine Linux Vagrant VM for testing purposes #221
 
 ### v5.3.332.38.4, v5.3.332.38.5 - 2016-02-27
 

data/README.md

@@ -29,6 +29,7 @@ platforms.
 * x86_64-linux
 * x86-linux
 * x86_64-freebsd-10
+* x86_64-freebsd-11
 
 If you don't see your platform on this list, first, make sure that it
 installs from source, and second talk to us about setting up a binary

data/Rakefile

@@ -51,7 +51,14 @@ task :binary => :compile do
 end
 
 namespace :build do
-  ['x86_64-linux', 'x86-linux', 'armhf-linux', 'x86_64-freebsd-10', 'x86_64-freebsd-11'].each do |arch|
+  [
+    'x86_64-linux',
+    'x86-linux',
+    'armhf-linux',
+    'x86_64-freebsd-10',
+    'x86_64-freebsd-11',
+    'x86_64-linux-musl'
+  ].each do |arch|
     desc "build binary gem for #{arch}"
     task arch do
       arch_dir = Pathname(__FILE__).dirname.join("release/#{arch}")

data/ext/libv8/arch.rb

@@ -6,11 +6,11 @@ module Libv8
 
     def libv8_arch
       case Gem::Platform.local.cpu
-      when /^arm(v7.*)*$/     then 'arm'
-      when /^a(rm|arch)64$/   then 'arm64'
-      when /^x86$/            then 'ia32'
-      when /^(x86_64|amd64)$/ then 'x64'
-      when /^universal$/      then 'x64' # OS X
+      when /^arm(v6.*|v7.*)*$/ then 'arm'
+      when /^a(rm|arch)64$/    then 'arm64'
+      when /^x86$/             then 'ia32'
+      when /^(x86_64|amd64)$/  then 'x64'
+      when /^universal$/       then 'x64' # OS X
       else
         warn "Unsupported target: #{Gem::Platform.local.cpu}"
         Gem::Platform.local.cpu

data/ext/libv8/builder.rb

@@ -29,8 +29,12 @@ module Libv8
       # Do not use an external snapshot as we don't really care for binary size
       defines << 'v8_use_external_startup_data=0'
 
-      # Do not use the GPLv3 ld.gold binary on Linux
-      #defines << 'linux_use_bundled_gold=0'
+      # Do not use the embedded toolchain
+      defines << 'use_sysroot=0'
+      defines << 'linux_use_bundled_binutils=0'
+      defines << 'linux_use_bundled_gold=0'
+      defines << 'make_clang_dir=""'
+      defines << 'clang_dir=""'
 
       # Pass clang flag to GYP in order to work around GCC compilation failures
       defines << "clang=#{@compiler.is_a?(Compiler::Clang) ? '1' : '0'}"
@@ -106,15 +110,15 @@ module Libv8
       ENV['PATH'] = "#{File.expand_path('../../../vendor/depot_tools', __FILE__)}:#{ENV['PATH']}"
       Dir.chdir(File.expand_path('../../../vendor', __FILE__)) do
         unless Dir.exists? 'v8'
-          system "fetch v8" or fail "unable to fetch v8 source"
+          system "env #{gyp_defines} fetch v8" or fail "unable to fetch v8 source"
         else
-          system "gclient fetch" or fail "could not fetch v8 build dependencies commits"
+          system "env #{gyp_defines} gclient fetch" or fail "could not fetch v8 build dependencies commits"
         end
         Dir.chdir('v8') do
           unless system "git checkout #{source_version}"
             fail "unable to checkout source for v8 #{source_version}"
           end
-          system "gclient sync" or fail "could not sync v8 build dependencies"
+          system "env #{gyp_defines} gclient sync" or fail "could not sync v8 build dependencies"
           system "git checkout Makefile" # Work around a weird bug on FreeBSD
         end
       end

data/lib/libv8/version.rb

@@ -1,3 +1,3 @@
 module Libv8
-  VERSION = "5.6.326.50.0beta1"
+  VERSION = "5.7.492.65.0beta1"
 end

data/patches/0001-Build-a-standalone-static-library.patch

@@ -1,4 +1,4 @@
-From fbf90ea249b9f00e0dc31ee9ca335a29a218e735 Mon Sep 17 00:00:00 2001
+From 66dd2280b3ecbb4a09f4f262d52a3a99a97afd45 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:00:19 +0300
 Subject: [PATCH 1/4] Build a standalone static library
@@ -22,5 +22,5 @@ index d438a5aeab..f28c9bfa9f 100644
          'defines!': [
            'DEBUG',
 -- 
-2.11.1
+2.12.1
 

data/patches/0002-Don-t-compile-unnecessary-stuff.patch

@@ -1,12 +1,12 @@
-From 2ddb964b20ad4381de65077a2db6f44a6cc05c52 Mon Sep 17 00:00:00 2001
+From 73b9ff314b5027e9bd1410130df607dbd7f40aa4 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Tue, 28 Feb 2017 00:04:26 +0200
 Subject: [PATCH 2/4] Don't compile unnecessary stuff
 
 ---
  Makefile         |  7 +------
- gypfiles/all.gyp | 39 +--------------------------------------
- 2 files changed, 2 insertions(+), 44 deletions(-)
+ gypfiles/all.gyp | 43 +------------------------------------------
+ 2 files changed, 2 insertions(+), 48 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 6eeac09a14..a2807ffafe 100644
@@ -27,10 +27,10 @@ index 6eeac09a14..a2807ffafe 100644
  # If vtunejit=on, the v8vtune.gyp will be appended.
  ifeq ($(vtunejit), on)
 diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp
-index a3f2eedc77..9b02b4d305 100644
+index 12e1fdadb7..9b02b4d305 100644
 --- a/gypfiles/all.gyp
 +++ b/gypfiles/all.gyp
-@@ -15,44 +15,7 @@
+@@ -15,48 +15,7 @@
            'dependencies': [
              '../tools/parser-shell.gyp:parser-shell',
            ],
@@ -46,10 +46,14 @@ index a3f2eedc77..9b02b4d305 100644
 -        }],
 -        ['v8_enable_inspector==1', {
 -          'dependencies': [
--            '../test/debugger/debugger.gyp:*',
 -            '../test/inspector/inspector.gyp:*',
 -          ],
 -        }],
+-        ['v8_enable_inspector==1 and test_isolation_mode != "noop"', {
+-          'dependencies': [
+-            '../test/debugger/debugger.gyp:*',
+-          ],
+-        }],
 -        ['test_isolation_mode != "noop"', {
 -          'dependencies': [
 -            '../test/bot_default.gyp:*',
@@ -77,5 +81,5 @@ index a3f2eedc77..9b02b4d305 100644
      }
    ]
 -- 
-2.11.1
+2.12.1
 

data/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch

@@ -1,4 +1,4 @@
-From 51ffbf60118ba9cf62475fef0e0633f45b7353c8 Mon Sep 17 00:00:00 2001
+From f40d71bda11b9de95ba732e455832517d1e3b9d6 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:05:47 +0300
 Subject: [PATCH 3/4] Use the -fPIC flag for the static library
@@ -21,5 +21,5 @@ index f28c9bfa9f..01e4dc9336 100644
            }],
            [ 'clang==0 and coverage==1', {
 -- 
-2.11.1
+2.12.1
 

data/patches/0004-Do-not-embed-debug-symbols-in-macOS-libraries.patch

@@ -1,4 +1,4 @@
-From bdeebd38b99b47f379f3ee8b392692cbea729439 Mon Sep 17 00:00:00 2001
+From 3084588d43a95001266fdc77a6c6ed3ce9747937 Mon Sep 17 00:00:00 2001
 From: Jb Aviat <jb@sqreen.io>
 Date: Mon, 27 Feb 2017 11:14:42 +0200
 Subject: [PATCH 4/4] Do not embed debug symbols in macOS libraries
@@ -21,5 +21,5 @@ index 01e4dc9336..027eaff718 100644
            'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
            'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
 -- 
-2.11.1
+2.12.1
 

data/vendor/depot_tools/.gitignore

@@ -63,6 +63,7 @@
 # Ignore recipe working directory.
 /.recipe_deps
 /infra/.recipe_deps
+/recipes/.recipe_deps
 
 # Ignore google AE downloaded for running testing only.
 testing_support/google_appengine

data/vendor/depot_tools/cbuildbot

@@ -1 +1 @@
-support/chromite_wrapper
+vendor/depot_tools/support/chromite_wrapper

data/vendor/depot_tools/chrome_set_ver

@@ -1 +1 @@
-support/chromite_wrapper
+vendor/depot_tools/support/chromite_wrapper

data/vendor/depot_tools/cipd_client_version

@@ -1 +1 @@
-git_revision:a22c452038ad21e6d246461813fa1c952ae668c3
+git_revision:76eadcd75c5ad2638e1fc098f81748aad150c7c0

data/vendor/depot_tools/cit.py

@@ -146,7 +146,7 @@ def run(args):
 
 def main():
   parser = argparse.ArgumentParser("Chrome Infrastructure CLI.")
-  parser.add_argument('-b', '--infra-branch', default='deployed',
+  parser.add_argument('-b', '--infra-branch', default='cit',
       help="The name of the 'infra' branch to use (default is %(default)s).")
   parser.add_argument('args', nargs=argparse.REMAINDER)
 

data/vendor/depot_tools/cpplint.py

@@ -2752,7 +2752,8 @@ def CheckForNonStandardConstructs(filename, clean_lines, linenum,
   # Look for single-argument constructors that aren't marked explicit.
   # Technically a valid construct, but against style.
   explicit_constructor_match = Match(
-      r'\s+(?:inline\s+)?(explicit\s+)?(?:inline\s+)?%s\s*'
+      r'\s+(?:(?:inline|constexpr)\s+)*(explicit\s+)?'
+      r'(?:(?:inline|constexpr)\s+)*%s\s*'
       r'\(((?:[^()]|\([^()]*\))*)\)'
       % re.escape(base_classname),
       line)

data/vendor/depot_tools/cros

@@ -1 +1 @@
-support/chromite_wrapper
+vendor/depot_tools/support/chromite_wrapper

data/vendor/depot_tools/cros_sdk

@@ -1 +1 @@
-support/chromite_wrapper
+vendor/depot_tools/support/chromite_wrapper

data/vendor/depot_tools/gclient.py

@@ -714,8 +714,9 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
       if 'action' in hook:
         hooks_to_run.append(hook)
 
-    self._pre_deps_hooks = [self.GetHookAction(hook, []) for hook in
-                            local_scope.get('pre_deps_hooks', [])]
+    if self.recursion_limit:
+      self._pre_deps_hooks = [self.GetHookAction(hook, []) for hook in
+                              local_scope.get('pre_deps_hooks', [])]
 
     self.add_dependencies_and_close(deps_to_add, hooks_to_run)
     logging.info('ParseDepsFile(%s) done' % self.name)

data/vendor/depot_tools/gerrit_util.py

@@ -11,7 +11,7 @@ https://gerrit-review.googlesource.com/Documentation/rest-api.html
 import base64
 import contextlib
 import cookielib
-import httplib
+import httplib  # Still used for its constants.
 import json
 import logging
 import netrc
@@ -27,6 +27,7 @@ import urlparse
 from cStringIO import StringIO
 
 import gclient_utils
+from third_party import httplib2
 
 LOGGER = logging.getLogger()
 TRY_LIMIT = 5
@@ -59,13 +60,11 @@ def _QueryString(param_dict, first_param=None):
   return '+'.join(q)
 
 
-def GetConnectionClass(protocol=None):
+def GetConnectionObject(protocol=None):
   if protocol is None:
     protocol = GERRIT_PROTOCOL
-  if protocol == 'https':
-    return httplib.HTTPSConnection
-  elif protocol == 'http':
-    return httplib.HTTPConnection
+  if protocol in ('http', 'https'):
+    return httplib2.Http()
   else:
     raise RuntimeError(
         "Don't know how to work with protocol '%s'" % protocol)
@@ -107,7 +106,7 @@ class CookiesAuthenticator(Authenticator):
     if not parts[0].endswith('-review'):
       parts[0] += '-review'
     url = 'https://%s/new-password' % ('.'.join(parts))
-    return 'You can (re)generate your credentails by visiting %s' % url
+    return 'You can (re)generate your credentials by visiting %s' % url
 
   @classmethod
   def get_netrc_path(cls):
@@ -185,19 +184,30 @@ class CookiesAuthenticator(Authenticator):
 
     return gitcookies
 
-  def get_auth_header(self, host):
-    auth = None
+  def _get_auth_for_host(self, host):
     for domain, creds in self.gitcookies.iteritems():
       if cookielib.domain_match(host, domain):
-        auth = (creds[0], None, creds[1])
-        break
+        return (creds[0], None, creds[1])
+    return self.netrc.authenticators(host)
 
-    if not auth:
-      auth = self.netrc.authenticators(host)
+  def get_auth_header(self, host):
+    auth = self._get_auth_for_host(host)
     if auth:
       return 'Basic %s' % (base64.b64encode('%s:%s' % (auth[0], auth[2])))
     return None
 
+  def get_auth_email(self, host):
+    """Best effort parsing of email to be used for auth for the given host."""
+    auth = self._get_auth_for_host(host)
+    if not auth:
+      return None
+    login = auth[0]
+    # login typically looks like 'git-xxx.example.com'
+    if not login.startswith('git-') or '.' not in login:
+      return None
+    username, domain = login[len('git-'):].split('.', 1)
+    return '%s@%s' % (username, domain)
+
 
 # Backwards compatibility just in case somebody imports this outside of
 # depot_tools.
@@ -229,11 +239,11 @@ class GceAuthenticator(Authenticator):
   def _test_is_gce(cls):
     # Based on https://cloud.google.com/compute/docs/metadata#runninggce
     try:
-      resp = cls._get(cls._INFO_URL)
-    except socket.error:
+      resp, _ = cls._get(cls._INFO_URL)
+    except (socket.error, httplib2.ServerNotFoundError):
       # Could not resolve URL.
       return False
-    return resp.getheader('Metadata-Flavor', None) == 'Google'
+    return resp.get('metadata-flavor') == 'Google'
 
   @staticmethod
   def _get(url, **kwargs):
@@ -247,12 +257,11 @@ class GceAuthenticator(Authenticator):
         next_delay_sec *= 2
 
       p = urlparse.urlparse(url)
-      c = GetConnectionClass(protocol=p.scheme)(p.netloc)
-      c.request('GET', url, **kwargs)
-      resp = c.getresponse()
+      c = GetConnectionObject(protocol=p.scheme)
+      resp, contents = c.request(url, 'GET', **kwargs)
       LOGGER.debug('GET [%s] #%d/%d (%d)', url, i+1, TRY_LIMIT, resp.status)
       if resp.status < httplib.INTERNAL_SERVER_ERROR:
-        return resp
+        return (resp, contents)
 
   @classmethod
   def _get_token_dict(cls):
@@ -261,10 +270,10 @@ class GceAuthenticator(Authenticator):
       if cls._token_expiration < time.time() - 25:
         return cls._token_cache
 
-    resp = cls._get(cls._ACQUIRE_URL, headers=cls._ACQUIRE_HEADERS)
+    resp, contents = cls._get(cls._ACQUIRE_URL, headers=cls._ACQUIRE_HEADERS)
     if resp.status != httplib.OK:
       return None
-    cls._token_cache = json.load(resp)
+    cls._token_cache = json.loads(contents)
     cls._token_expiration = cls._token_cache['expires_in'] + time.time()
     return cls._token_cache
 
@@ -303,15 +312,14 @@ def CreateHttpConn(host, path, reqtype='GET', headers=None, body=None):
       LOGGER.debug('%s: %s' % (key, val))
     if body:
       LOGGER.debug(body)
-  conn = GetConnectionClass()(host)
+  conn = GetConnectionObject()
   conn.req_host = host
   conn.req_params = {
-      'url': url,
+      'uri': urlparse.urljoin('%s://%s' % (GERRIT_PROTOCOL, host), url),
       'method': reqtype,
       'headers': headers,
       'body': body,
   }
-  conn.request(**conn.req_params)
   return conn
 
 
@@ -319,7 +327,7 @@ def ReadHttpResponse(conn, expect_status=200, ignore_404=True):
   """Reads an http response from a connection into a string buffer.
 
   Args:
-    conn: An HTTPSConnection or HTTPConnection created by CreateHttpConn, above.
+    conn: An Http object created by CreateHttpConn above.
     expect_status: Success is indicated by this status in the response.
     ignore_404: For many requests, gerrit-on-borg will return 404 if the request
                 doesn't match the database contents.  In most such cases, we
@@ -329,10 +337,10 @@ def ReadHttpResponse(conn, expect_status=200, ignore_404=True):
 
   sleep_time = 0.5
   for idx in range(TRY_LIMIT):
-    response = conn.getresponse()
+    response, contents = conn.request(**conn.req_params)
 
     # Check if this is an authentication issue.
-    www_authenticate = response.getheader('www-authenticate')
+    www_authenticate = response.get('www-authenticate')
     if (response.status in (httplib.UNAUTHORIZED, httplib.FOUND) and
         www_authenticate):
       auth_match = re.search('realm="([^"]+)"', www_authenticate, re.I)
@@ -344,31 +352,25 @@ def ReadHttpResponse(conn, expect_status=200, ignore_404=True):
     # If response.status < 500 then the result is final; break retry loop.
     if response.status < 500:
       LOGGER.debug('got response %d for %s %s', response.status,
-                   conn.req_params['method'], conn.req_params['url'])
+                   conn.req_params['method'], conn.req_params['uri'])
       break
     # A status >=500 is assumed to be a possible transient error; retry.
     http_version = 'HTTP/%s' % ('1.1' if response.version == 11 else '1.0')
     LOGGER.warn('A transient error occurred while querying %s:\n'
                 '%s %s %s\n'
                 '%s %d %s',
-                conn.host, conn.req_params['method'], conn.req_params['url'],
+                conn.host, conn.req_params['method'], conn.req_params['uri'],
                 http_version, http_version, response.status, response.reason)
     if TRY_LIMIT - idx > 1:
       LOGGER.warn('... will retry %d more times.', TRY_LIMIT - idx - 1)
       time.sleep(sleep_time)
       sleep_time = sleep_time * 2
-      req_host = conn.req_host
-      req_params = conn.req_params
-      conn = GetConnectionClass()(req_host)
-      conn.req_host = req_host
-      conn.req_params = req_params
-      conn.request(**req_params)
   if ignore_404 and response.status == 404:
     return StringIO()
   if response.status != expect_status:
-    reason = '%s: %s' % (response.reason, response.read())
+    reason = '%s: %s' % (response.reason, contents)
     raise GerritError(response.status, reason)
-  return StringIO(response.read())
+  return StringIO(contents)
 
 
 def ReadHttpJsonResponse(conn, expect_status=200, ignore_404=True):
@@ -386,7 +388,7 @@ def ReadHttpJsonResponse(conn, expect_status=200, ignore_404=True):
 
 
 def QueryChanges(host, param_dict, first_param=None, limit=None, o_params=None,
-                 sortkey=None):
+                 start=None):
   """
   Queries a gerrit-on-borg server for changes matching query terms.
 
@@ -395,6 +397,7 @@ def QueryChanges(host, param_dict, first_param=None, limit=None, o_params=None,
         http://gerrit-documentation.googlecode.com/svn/Documentation/2.6/user-search.html
     first_param: A change identifier
     limit: Maximum number of results to return.
+    start: how many changes to skip (starting with the most recent)
     o_params: A list of additional output specifiers, as documented here:
         https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#list-changes
   Returns:
@@ -404,8 +407,8 @@ def QueryChanges(host, param_dict, first_param=None, limit=None, o_params=None,
   if not param_dict and not first_param:
     raise RuntimeError('QueryChanges requires search parameters')
   path = 'changes/?q=%s' % _QueryString(param_dict, first_param)
-  if sortkey:
-    path = '%s&N=%s' % (path, sortkey)
+  if start:
+    path = '%s&start=%s' % (path, start)
   if limit:
     path = '%s&n=%d' % (path, limit)
   if o_params:
@@ -415,30 +418,49 @@ def QueryChanges(host, param_dict, first_param=None, limit=None, o_params=None,
 
 
 def GenerateAllChanges(host, param_dict, first_param=None, limit=500,
-                       o_params=None, sortkey=None):
+                       o_params=None, start=None):
   """
   Queries a gerrit-on-borg server for all the changes matching the query terms.
 
+  WARNING: this is unreliable if a change matching the query is modified while
+    this function is being called.
+
   A single query to gerrit-on-borg is limited on the number of results by the
   limit parameter on the request (see QueryChanges) and the server maximum
-  limit. This function uses the "_more_changes" and "_sortkey" attributes on
-  the returned changes to iterate all of them making multiple queries to the
-  server, regardless the query limit.
+  limit.
 
   Args:
     param_dict, first_param: Refer to QueryChanges().
     limit: Maximum number of requested changes per query.
     o_params: Refer to QueryChanges().
-    sortkey: The value of the "_sortkey" attribute where starts from. None to
-        start from the first change.
+    start: Refer to QueryChanges().
 
   Returns:
-    A generator object to the list of returned changes, possibly unbound.
+    A generator object to the list of returned changes.
   """
+  already_returned = set()
+  def at_most_once(cls):
+    for cl in cls:
+      if cl['_number'] not in already_returned:
+        already_returned.add(cl['_number'])
+        yield cl
+
+  start = start or 0
+  cur_start = start
   more_changes = True
+
   while more_changes:
-    page = QueryChanges(host, param_dict, first_param, limit, o_params, sortkey)
-    for cl in page:
+    # This will fetch changes[start..start+limit] sorted by most recently
+    # updated. Since the rank of any change in this list can be changed any time
+    # (say user posting comment), subsequent calls may overalp like this:
+    #   > initial order ABCDEFGH
+    #   query[0..3]  => ABC
+    #   > E get's updated. New order: EABCDFGH
+    #   query[3..6] => CDF   # C is a dup
+    #   query[6..9] => GH    # E is missed.
+    page = QueryChanges(host, param_dict, first_param, limit, o_params,
+                        cur_start)
+    for cl in at_most_once(page):
       yield cl
 
     more_changes = [cl for cl in page if '_more_changes' in cl]
@@ -448,11 +470,18 @@ def GenerateAllChanges(host, param_dict, first_param=None, limit=500,
           'Received %d changes with a _more_changes attribute set but should '
           'receive at most one.' % len(more_changes))
     if more_changes:
-      sortkey = more_changes[0]['_sortkey']
+      cur_start += len(page)
+
+  # If we paged through, query again the first page which in most circumstances
+  # will fetch all changes that were modified while this function was run.
+  if start != cur_start:
+    page = QueryChanges(host, param_dict, first_param, limit, o_params, start)
+    for cl in at_most_once(page):
+      yield cl
 
 
 def MultiQueryChanges(host, param_dict, change_list, limit=None, o_params=None,
-                      sortkey=None):
+                      start=None):
   """Initiate a query composed of multiple sets of query parameters."""
   if not change_list:
     raise RuntimeError(
@@ -462,8 +491,8 @@ def MultiQueryChanges(host, param_dict, change_list, limit=None, o_params=None,
     q.append(_QueryString(param_dict))
   if limit:
     q.append('n=%d' % limit)
-  if sortkey:
-    q.append('N=%s' % sortkey)
+  if start:
+    q.append('S=%s' % start)
   if o_params:
     q.extend(['o=%s' % p for p in o_params])
   path = 'changes/?%s' % '&'.join(q)
@@ -659,7 +688,7 @@ def AddReviewers(host, change, add=None, is_reviewer=True, notify=True):
       _ = ReadHttpJsonResponse(conn, ignore_404=False)
     except GerritError as e:
       if e.http_status == 422:  # "Unprocessable Entity"
-        LOGGER.warn('Failed to add "%s" as a %s' % (r, state.lower()))
+        LOGGER.warn('Note: "%s" not added as a %s' % (r, state.lower()))
         errors = True
       else:
         raise
@@ -787,6 +816,21 @@ def GetGerritBranch(host, project, branch):
   raise GerritError(200, 'Unable to get gerrit branch')
 
 
+def GetAccountDetails(host, account_id='self'):
+  """Returns details of the account.
+
+  If account_id is not given, uses magic value 'self' which corresponds to
+  whichever account user is authenticating as.
+
+  Documentation:
+    https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#get-account
+  """
+  if account_id != 'self':
+    account_id = int(account_id)
+  conn = CreateHttpConn(host, '/accounts/%s' % account_id)
+  return ReadHttpJsonResponse(conn)
+
+
 @contextlib.contextmanager
 def tempdir():
   tdir = None