libv8 6.7.288.46.1 → 7.3.492.27.0beta1

data/vendor/depot_tools/git_common.py

@@ -4,6 +4,9 @@
 
 # Monkeypatch IMapIterator so that Ctrl-C can kill everything properly.
 # Derived from https://gist.github.com/aljungberg/626518
+
+from __future__ import print_function
+
 import multiprocessing.pool
 from multiprocessing.pool import IMapIterator
 def wrapper(func):
@@ -32,7 +35,7 @@ import threading
 
 import subprocess2
 
-from StringIO import StringIO
+from io import BytesIO
 
 
 ROOT = os.path.abspath(os.path.dirname(__file__))
@@ -310,7 +313,7 @@ def once(function):
 ## Git functions
 
 def die(message, *args):
-  print >> sys.stderr, textwrap.dedent(message % args)
+  print(textwrap.dedent(message % args), file=sys.stderr)
   sys.exit(1)
 
 
@@ -805,14 +808,14 @@ def status():
   stat_entry = collections.namedtuple('stat_entry', 'lstat rstat src')
 
   def tokenizer(stream):
-    acc = StringIO()
+    acc = BytesIO()
     c = None
     while c != '':
       c = stream.read(1)
       if c in (None, '', '\0'):
-        if acc.len:
+        if len(acc.getvalue()):
           yield acc.getvalue()
-          acc = StringIO()
+          acc = BytesIO()
       else:
         acc.write(c)
 
@@ -843,7 +846,7 @@ def squash_current_branch(header=None, merge_base=None):
   if not get_dirty_files():
     # Sometimes the squash can result in the same tree, meaning that there is
     # nothing to commit at this point.
-    print 'Nothing to commit; squashed branch is empty'
+    print('Nothing to commit; squashed branch is empty')
     return False
   run('commit', '--no-verify', '-a', '-F', '-', indata=log_msg)
   return True

data/vendor/depot_tools/git_map_branches.py

@@ -150,6 +150,8 @@ class BranchMapper(object):
         continue
 
       parent = branch_info.upstream
+      if self.__check_cycle(branch):
+        continue
       if not self.__branches_info[parent]:
         branch_upstream = upstream(branch)
         # If git can't find the upstream, mark the upstream as gone.
@@ -174,6 +176,20 @@ class BranchMapper(object):
       no_branches.append('No User Branches')
       self.output.append(no_branches)
 
+  def __check_cycle(self, branch):
+    # Maximum length of the cycle is `num_branches`. This limit avoids running
+    # into a cycle which does *not* contain `branch`.
+    num_branches = len(self.__branches_info)
+    cycle = [branch]
+    while len(cycle) < num_branches and self.__branches_info[cycle[-1]]:
+      parent = self.__branches_info[cycle[-1]].upstream
+      cycle.append(parent)
+      if parent == branch:
+        print >> sys.stderr, 'Warning: Detected cycle in branches: {}'.format(
+            ' -> '.join(cycle))
+        return True
+    return False
+
   def __is_invalid_parent(self, parent):
     return not parent or parent in self.__gone_branches
 
@@ -307,8 +323,9 @@ def main(argv):
 
   parser = argparse.ArgumentParser()
   parser.add_argument('-v', action='count',
-                      help=('Pass once to show tracking info; '
-                           'twice for hash and review url'))
+                      help=('Pass once to show tracking info, '
+                            'twice for hash and review url, '
+                            'thrice for review status'))
   parser.add_argument('--no-color', action='store_true', dest='nocolor',
                       help='Turn off colors.')
   parser.add_argument(

data/vendor/depot_tools/git_nav_downstream.py

@@ -13,8 +13,10 @@ import argparse
 import sys
 
 from git_common import current_branch, branches, upstream, run, hash_one
+import metrics
 
 
+@metrics.collector.collect_metrics('git nav-downstream')
 def main(args):
   parser = argparse.ArgumentParser()
   parser.add_argument('--pick',
@@ -60,8 +62,5 @@ def main(args):
 
 
 if __name__ == '__main__':
-  try:
+  with metrics.collector.print_notice_and_exit():
     sys.exit(main(sys.argv[1:]))
-  except KeyboardInterrupt:
-    sys.stderr.write('interrupted\n')
-    sys.exit(1)

data/vendor/depot_tools/git_rebase_update.py

@@ -223,6 +223,11 @@ def main(args=None):
   parser.add_argument('--no_fetch', '--no-fetch', '-n',
                       action='store_true',
                       help='Skip fetching remotes.')
+  parser.add_argument(
+      '--current', action='store_true', help='Only rebase the current branch.')
+  parser.add_argument('branches', nargs='*',
+                      help='Branches to be rebased. All branches are assumed '
+                           'if none specified.')
   opts = parser.parse_args(args)
 
   if opts.verbose:  # pragma: no cover
@@ -254,7 +259,13 @@ def main(args=None):
   else:
     git.freeze()  # just in case there are any local changes.
 
+  branches_to_rebase = set(opts.branches)
+  if opts.current:
+    branches_to_rebase.add(git.current_branch())
+
   skipped, branch_tree = git.get_branch_tree()
+  if branches_to_rebase:
+    skipped = set(skipped).intersection(branches_to_rebase)
   for branch in skipped:
     print 'Skipping %s: No upstream specified' % branch
 
@@ -273,6 +284,9 @@ def main(args=None):
   # Rebase each branch starting with the root-most branches and working
   # towards the leaves.
   for branch, parent in git.topo_iter(branch_tree):
+    # Only rebase specified branches, unless none specified.
+    if branches_to_rebase and branch not in branches_to_rebase:
+      continue
     if git.is_dormant(branch):
       print 'Skipping dormant branch', branch
     else:

data/vendor/depot_tools/git_reparent_branch.py

@@ -12,6 +12,7 @@ import subprocess2
 
 from git_common import upstream, current_branch, run, tags, set_branch_config
 from git_common import get_or_create_merge_base, root, manual_merge_base
+from git_common import get_branch_tree, topo_iter
 
 import git_rebase_update
 
@@ -81,8 +82,13 @@ def main(args):
 
   manual_merge_base(branch, mbase, new_parent)
 
-  # TODO(iannucci): ONLY rebase-update the branch which moved (and dependants)
-  return git_rebase_update.main(['--no-fetch'])
+  # ONLY rebase-update the branch which moved (and dependants)
+  _, branch_tree = get_branch_tree()
+  branches = [branch]
+  for branch, parent in topo_iter(branch_tree):
+    if parent in branches:
+      branches.append(branch)
+  return git_rebase_update.main(['--no-fetch'] + branches)
 
 
 if __name__ == '__main__':  # pragma: no cover

data/vendor/depot_tools/gn.py

@@ -12,20 +12,55 @@ binary. It will also automatically try to find the gn binary when run inside
 the chrome source tree, so users can just type "gn" on the command line
 (normally depot_tools is on the path)."""
 
-import gclient_utils
+import gclient_paths
 import os
 import subprocess
 import sys
 
 
+def PruneVirtualEnv():
+  # Set by VirtualEnv, no need to keep it.
+  os.environ.pop('VIRTUAL_ENV', None)
+
+  # Set by VPython, if scripts want it back they have to set it explicitly.
+  os.environ.pop('PYTHONNOUSERSITE', None)
+
+  # Look for "activate_this.py" in this path, which is installed by VirtualEnv.
+  # This mechanism is used by vpython as well to sanitize VirtualEnvs from
+  # $PATH.
+  os.environ['PATH'] = os.pathsep.join([
+    p for p in os.environ.get('PATH', '').split(os.pathsep)
+    if not os.path.isfile(os.path.join(p, 'activate_this.py'))
+  ])
+
+
 def main(args):
-  bin_path = gclient_utils.GetBuildtoolsPlatformBinaryPath()
+  # Prune all evidence of VPython/VirtualEnv out of the environment. This means
+  # that we 'unwrap' vpython VirtualEnv path/env manipulation. Invocations of
+  # `python` from GN should never inherit the gn.py's own VirtualEnv. This also
+  # helps to ensure that generated ninja files do not reference python.exe from
+  # the VirtualEnv generated from depot_tools' own .vpython file (or lack
+  # thereof), but instead reference the default python from the PATH.
+  PruneVirtualEnv()
+
+  # Try in primary solution location first, with the gn binary having been
+  # downloaded by cipd in the projects DEPS.
+  primary_solution_path = gclient_paths.GetPrimarySolutionPath()
+  if primary_solution_path:
+    gn_path = os.path.join(primary_solution_path, 'third_party',
+                           'gn', 'gn' + gclient_paths.GetExeSuffix())
+    if os.path.exists(gn_path):
+      return subprocess.call([gn_path] + args[1:])
+
+  # Otherwise try the old .sha1 and download_from_google_storage locations
+  # inside of buildtools.
+  bin_path = gclient_paths.GetBuildtoolsPlatformBinaryPath()
   if not bin_path:
     print >> sys.stderr, ('gn.py: Could not find checkout in any parent of '
                           'the current path.\nThis must be run inside a '
                           'checkout.')
     return 1
-  gn_path = os.path.join(bin_path, 'gn' + gclient_utils.GetExeSuffix())
+  gn_path = os.path.join(bin_path, 'gn' + gclient_paths.GetExeSuffix())
   if not os.path.exists(gn_path):
     print >> sys.stderr, 'gn.py: Could not find gn executable at: %s' % gn_path
     return 2

data/vendor/depot_tools/gsutil.py

@@ -17,7 +17,12 @@ import subprocess
 import sys
 import tempfile
 import time
-import urllib2
+
+try:
+  import urllib2 as urllib
+except ImportError:  # For Py3 compatibility
+  import urllib.request as urllib
+
 import zipfile
 
 
@@ -53,7 +58,7 @@ def download_gsutil(version, target_dir):
     local_md5 = md5_calc.hexdigest()
 
     metadata_url = '%s%s' % (API_URL, filename)
-    metadata = json.load(urllib2.urlopen(metadata_url))
+    metadata = json.load(urllib.urlopen(metadata_url))
     remote_md5 = base64.b64decode(metadata['md5Hash'])
 
     if local_md5 == remote_md5:
@@ -62,7 +67,7 @@ def download_gsutil(version, target_dir):
 
   # Do the download.
   url = '%s%s' % (GSUTIL_URL, filename)
-  u = urllib2.urlopen(url)
+  u = urllib.urlopen(url)
   with open(target_filename, 'wb') as f:
     while True:
       buf = u.read(4096)

data/vendor/depot_tools/gsutil.py.bat

@@ -0,0 +1,15 @@
+@echo off
+:: Copyright (c) 2018 The Chromium Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that can be
+:: found in the LICENSE file.
+setlocal
+
+:: Synchronize the root directory before deferring control back to gsutil.py.
+call "%~dp0update_depot_tools.bat" %*
+
+:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
+:: standalone, but allow other PATH manipulations to take priority.
+set PATH=%PATH%;%~dp0
+
+:: Defer control.
+python "%~dp0gsutil.py" %*

data/vendor/depot_tools/gsutil.vpython

@@ -100,3 +100,19 @@ wheel: <
 ##
 # END "cryptography" dependencies.
 ##
+
+wheel: <
+  name: "infra/python/wheels/crcmod/${vpython_platform}"
+  version: "version:1.7"
+  match_tag: <
+    abi: "cp27mu"
+    platform: "manylinux1_i686"
+  >
+  match_tag: <
+    abi: "cp27mu"
+    platform: "manylinux1_x86_64"
+  >
+  match_tag: <
+    platform: "macosx_10_6_intel"
+  >
+>

data/vendor/depot_tools/infra/config/OWNERS

@@ -2,7 +2,6 @@ set noparent
 iannucci@chromium.org
 nodir@chromium.org
 sergiyb@chromium.org
-tandrii@chromium.org
 
 per-file recipes.cfg=martiniss@chromium.org
 per-file recipes.cfg=recipe-roller@chromium.org

data/vendor/depot_tools/infra/config/recipes.cfg

@@ -15,10 +15,11 @@
   "deps": {
     "recipe_engine": {
       "branch": "master",
-      "revision": "94bb0a758456a5df6891677a8cf2876c07ea5f0c",
+      "revision": "602257a66a4e492e7029ccaf542b55f9ef641346",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
   "project_id": "depot_tools",
-  "recipes_path": "recipes"
+  "recipes_path": "recipes",
+  "repo_name": "depot_tools"
 }

data/vendor/depot_tools/lucicfg

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+MYPATH=$(dirname "${BASH_SOURCE[0]}")
+
+source "$MYPATH/cipd_bin_setup.sh"
+cipd_bin_setup &> /dev/null
+
+exec "$MYPATH/.cipd_bin/lucicfg" "$@"

data/vendor/depot_tools/lucicfg.bat

@@ -0,0 +1,7 @@
+@echo off
+:: Copyright 2019 The Chromium Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that can be
+:: found in the LICENSE file.
+
+call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
+"%~dp0\.cipd_bin\lucicfg.exe" %*

data/vendor/depot_tools/man/html/git-map-branches.html

@@ -819,6 +819,30 @@ Branches which have this as their parent are usually misconfigured, and
 </div>
 </div>
 <div class="sect1">
+<h2 id="_options">OPTIONS</h2>
+<div class="sectionbody">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+--no-color
+</dt>
+<dd>
+<p>
+  Turn off colors.
+</p>
+</dd>
+<dt class="hdlist1">
+-v
+</dt>
+<dd>
+<p>
+  Be more verbose. Pass once to show tracking info, twice for hash and review
+  URL, thrice for review status.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_example">EXAMPLE</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Given the hypothetical demo repo in <a href="git-map.html">git-map(1)</a>'s EXAMPLE section, and
@@ -831,7 +855,15 @@ assuming that the <code>frozen_changes</code> branch was currently checked out,
 </span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
 </span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
 </span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *</span>
+</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *
+</span><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
+<span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM}          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #19c518"></span><span style="color: #19c518">  no_upstream          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/master          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 6 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *    </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 3 </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]</span>
 </code></pre></div></div><p><div class="paragraph"></p></div>
 </div>
 </div>
@@ -865,7 +897,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-12-15 15:36:52 PST
+Last updated 2018-12-04 11:07:30 CET
 </div>
 </div>
 </body>

data/vendor/depot_tools/man/html/git-new-branch.html

@@ -790,7 +790,7 @@ new-branch --upstream_current &lt;branch_name&gt;</code>.</p></div>
 </p>
 </dd>
 <dt class="hdlist1">
---uptstream &lt;REF&gt;
+--upstream &lt;REF&gt;
 </dt>
 <dd>
 <p>
@@ -830,43 +830,51 @@ defaults to <em>origin/master</em>.  This is considered to be the <em>root</em>
 <div class="sect1">
 <h2 id="_example">EXAMPLE</h2>
 <div class="sectionbody">
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *    </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 3 </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]
 </span><span style="font-weight: bold; color: #ffffff">$ git new-branch independent_cl</span>
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  cool_feature
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  independent_cl *
+<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
+<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master         </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">        </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
+</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  cool_feature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit               </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch     </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  independent_cl *    </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">        </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
+</span><span style="font-weight: bold; color: #ffffff">$ vi foo &amp;&amp; git add -A &amp;&amp; git commit -m foo</span>
+<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master         </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit               </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch     </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  independent_cl *    </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 1 </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]
 </span><span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream subfeature nested_cl</span>
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    subfeature</span> <b>&lt;1&gt;</b><span>
-</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">      nested_cl *
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fixit
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
-</span><span style="color: #19c518"></span><span style="color: #19c518">  independent_cl
+<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature       </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    subfeature       </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 2 </span><span style="font-weight: bold; color: #ffffff">| </span><span style="font-weight: bold; color: #d338d3">behind 1 </span><span style="font-weight: bold; color: #ffffff">]</span> <b>&lt;1&gt;</b><span>
+</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">      nested_cl *    </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">        </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
+</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fixit              </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch    </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">  independent_cl     </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 1 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 </span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span>
 Switched to branch 'cool_feature'
 Your branch is ahead of 'origin/master' by 4 commits.
   (use "git push" to publish your local commits)
 <span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current cl_depends_on_cool_feature</span>
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature
-</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    cl_depends_on_cool_feature *
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">    subfeature
-</span><span style="color: #19c518"></span><span style="color: #19c518">      nested_cl
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
-</span><span style="color: #19c518"></span><span style="color: #19c518">  independent_cl</span>
+<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master                       </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature                      </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 4 </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]
+</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    cl_depends_on_cool_feature *    </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">        </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
+</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">    subfeature                      </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">      nested_cl                     </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                             </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch                   </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 3 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
+</span><span style="color: #19c518"></span><span style="color: #19c518">  independent_cl                    </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 1 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]</span>
 </code></pre></div></div><p><div class="paragraph"></p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
@@ -917,7 +925,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-12-15 15:36:52 PST
+Last updated 2018-12-05 15:20:42 CET
 </div>
 </div>
 </body>