libv8 7.8.279.23.0beta1 → 8.4.255.0.1

data/vendor/depot_tools/git_hyper_blame.py

@@ -7,6 +7,7 @@
 """
 
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import argparse
 import collections
@@ -94,17 +95,12 @@ def parse_blame(blameoutput):
     yield BlameLine(commit, context, lineno_then, lineno_now, False)
 
 
-def num_codepoints(s):
-  """Gets the length of a UTF-8 byte string, in Unicode codepoints."""
-  return len(s.decode('utf-8', errors='replace'))
-
-
-def print_table(table, colsep=' ', rowsep='\n', align=None, out=sys.stdout):
+def print_table(outbuf, table, align):
   """Print a 2D rectangular array, aligning columns with spaces.
 
   Args:
-    align: Optional string of 'l' and 'r', designating whether each column is
-           left- or right-aligned. Defaults to left aligned.
+    align: string of 'l' and 'r', designating whether each column is left- or
+           right-aligned.
   """
   if len(table) == 0:
     return
@@ -112,32 +108,28 @@ def print_table(table, colsep=' ', rowsep='\n', align=None, out=sys.stdout):
   colwidths = None
   for row in table:
     if colwidths is None:
-      colwidths = [num_codepoints(x) for x in row]
+      colwidths = [len(x) for x in row]
     else:
-      colwidths = [max(colwidths[i], num_codepoints(x))
-                   for i, x in enumerate(row)]
-
-  if align is None:  # pragma: no cover
-    align = 'l' * len(colwidths)
+      colwidths = [max(colwidths[i], len(x)) for i, x in enumerate(row)]
 
   for row in table:
     cells = []
     for i, cell in enumerate(row):
-      padding = ' ' * (colwidths[i] - num_codepoints(cell))
+      padding = ' ' * (colwidths[i] - len(cell))
       if align[i] == 'r':
         cell = padding + cell
       elif i < len(row) - 1:
         # Do not pad the final column if left-aligned.
         cell += padding
-      cells.append(cell)
+      cells.append(cell.encode('utf-8', 'replace'))
     try:
-      print(*cells, sep=colsep, end=rowsep, file=out)
+      outbuf.write(b' '.join(cells) + b'\n')
     except IOError:  # pragma: no cover
       # Can happen on Windows if the pipe is closed early.
       pass
 
 
-def pretty_print(parsedblame, show_filenames=False, out=sys.stdout):
+def pretty_print(outbuf, parsedblame, show_filenames=False):
   """Pretty-prints the output of parse_blame."""
   table = []
   for line in parsedblame:
@@ -151,7 +143,7 @@ def pretty_print(parsedblame, show_filenames=False, out=sys.stdout):
     if show_filenames:
       row.insert(1, line.commit.filename)
     table.append(row)
-  print_table(table, align='llllrl' if show_filenames else 'lllrl', out=out)
+  print_table(outbuf, table, align='llllrl' if show_filenames else 'lllrl')
 
 
 def get_parsed_blame(filename, revision='HEAD'):
@@ -263,10 +255,10 @@ def approx_lineno_across_revs(filename, newfilename, revision, newrevision,
   return lineno + cumulative_offset
 
 
-def hyper_blame(ignored, filename, revision='HEAD', out=sys.stdout,
-                err=sys.stderr):
+def hyper_blame(outbuf, ignored, filename, revision):
   # Map from commit to parsed blame from that commit.
   blame_from = {}
+  filename = os.path.normpath(filename)
 
   def cache_blame_from(filename, commithash):
     try:
@@ -279,7 +271,7 @@ def hyper_blame(ignored, filename, revision='HEAD', out=sys.stdout,
   try:
     parsed = cache_blame_from(filename, git_common.hash_one(revision))
   except subprocess2.CalledProcessError as e:
-    err.write(e.stderr)
+    sys.stderr.write(e.stderr.decode())
     return e.returncode
 
   new_parsed = []
@@ -324,12 +316,13 @@ def hyper_blame(ignored, filename, revision='HEAD', out=sys.stdout,
 
     # If any line has a different filename to the file's current name, turn on
     # filename display for the entire blame output.
-    if line.commit.filename != filename:
+    # Use normpath to make variable consistent across platforms.
+    if os.path.normpath(line.commit.filename) != filename:
       show_filenames = True
 
     new_parsed.append(line)
 
-  pretty_print(new_parsed, show_filenames=show_filenames, out=out)
+  pretty_print(outbuf, new_parsed, show_filenames=show_filenames)
 
   return 0
 
@@ -341,14 +334,13 @@ def parse_ignore_file(ignore_file):
       yield line
 
 
-def main(args, stdout=sys.stdout, stderr=sys.stderr):
+def main(args, outbuf):
   parser = argparse.ArgumentParser(
       prog='git hyper-blame',
       description='git blame with support for ignoring certain commits.')
   parser.add_argument('-i', metavar='REVISION', action='append', dest='ignored',
                       default=[], help='a revision to ignore')
-  parser.add_argument('--ignore-file', metavar='FILE',
-                      type=argparse.FileType('r'), dest='ignore_file',
+  parser.add_argument('--ignore-file', metavar='FILE', dest='ignore_file',
                       help='a file containing a list of revisions to ignore')
   parser.add_argument('--no-default-ignores', dest='no_default_ignores',
                       action='store_true',
@@ -361,7 +353,7 @@ def main(args, stdout=sys.stdout, stderr=sys.stderr):
   try:
     repo_root = git_common.repo_root()
   except subprocess2.CalledProcessError as e:
-    stderr.write(e.stderr)
+    sys.stderr.write(e.stderr.decode())
     return e.returncode
 
   # Make filename relative to the repository root, and cd to the root dir (so
@@ -379,7 +371,8 @@ def main(args, stdout=sys.stdout, stderr=sys.stderr):
       ignored_list.extend(parse_ignore_file(ignore_file))
 
   if args.ignore_file:
-    ignored_list.extend(parse_ignore_file(args.ignore_file))
+    with open(args.ignore_file) as ignore_file:
+      ignored_list.extend(parse_ignore_file(ignore_file))
 
   ignored = set()
   for c in ignored_list:
@@ -387,12 +380,12 @@ def main(args, stdout=sys.stdout, stderr=sys.stderr):
       ignored.add(git_common.hash_one(c))
     except subprocess2.CalledProcessError as e:
       # Custom warning string (the message from git-rev-parse is inappropriate).
-      stderr.write('warning: unknown revision \'%s\'.\n' % c)
+      sys.stderr.write('warning: unknown revision \'%s\'.\n' % c)
 
-  return hyper_blame(ignored, filename, args.revision, out=stdout, err=stderr)
+  return hyper_blame(outbuf, ignored, filename, args.revision)
 
 
 if __name__ == '__main__':  # pragma: no cover
   setup_color.init()
   with git_common.less() as less_input:
-    sys.exit(main(sys.argv[1:], stdout=less_input))
+    sys.exit(main(sys.argv[1:], less_input))

data/vendor/depot_tools/git_map.py

@@ -4,6 +4,8 @@
 # found in the LICENSE file.
 
 """
+usage: git map [-h] [--help] [<args>]
+
 Enhances `git log --graph` view with information on commit branches + tags that
 point to them. Items are colorized as follows:
 
@@ -15,130 +17,150 @@ point to them. Items are colorized as follows:
   * Blue background - The currently checked out commit
 """
 
+from __future__ import unicode_literals
+
+import os
 import sys
 
+import git_common
+import setup_color
 import subprocess2
 
-from git_common import current_branch, branches, tags, get_config_list, GIT_EXE
-from git_common import get_or_create_merge_base, root
-
 from third_party import colorama
 
-CYAN = colorama.Fore.CYAN
-GREEN = colorama.Fore.GREEN
-MAGENTA = colorama.Fore.MAGENTA
-RED = colorama.Fore.RED
-WHITE = colorama.Fore.WHITE
 
-BLUEBAK = colorama.Back.BLUE
+if sys.version_info.major == 2:
+  # On Python 3, BrokenPipeError is raised instead.
+  BrokenPipeError = IOError
+
 
-BRIGHT = colorama.Style.BRIGHT
 RESET = colorama.Fore.RESET + colorama.Back.RESET + colorama.Style.RESET_ALL
+BRIGHT = colorama.Style.BRIGHT
 
-# Git emits combined color
-BRIGHT_RED = '\x1b[1;31m'
+BLUE_BACK = colorama.Back.BLUE + BRIGHT
+BRIGHT_RED = colorama.Fore.RED + BRIGHT
+CYAN = colorama.Fore.CYAN + BRIGHT
+GREEN = colorama.Fore.GREEN + BRIGHT
+MAGENTA = colorama.Fore.MAGENTA + BRIGHT
+RED = colorama.Fore.RED
+WHITE = colorama.Fore.WHITE + BRIGHT
+YELLOW = colorama.Fore.YELLOW
 
 
-def print_help():
+def _print_help(outbuf):
   names = {
     'Cyan': CYAN,
     'Green': GREEN,
     'Magenta': MAGENTA,
     'Red': RED,
     'White': WHITE,
-    'Blue background': BLUEBAK,
+    'Blue background': BLUE_BACK,
   }
-  msg = "usage: git map [-h] [<args>]\n"
-
+  msg = ''
   for line in __doc__.splitlines():
-    for key in names.keys():
-      if key in line:
-        msg += line.replace('* ', '* ' + names[key])+RESET+'\n'
+    for name, color in names.items():
+      if name in line:
+        msg += line.replace('* ' + name, color + '* ' + name + RESET) + '\n'
         break
     else:
       msg += line + '\n'
-  sys.stdout.write(msg)
+  outbuf.write(msg.encode('utf-8', 'replace'))
+
+
+def _color_branch(branch, all_branches, all_tags, current):
+  if branch == current or branch == 'HEAD -> ' + current:
+    color = CYAN
+    current = None
+  elif branch in all_branches:
+    color = GREEN
+    all_branches.remove(branch)
+  elif branch in all_tags:
+    color = MAGENTA
+  elif branch.startswith('tag: '):
+    color = MAGENTA
+    branch = branch[len('tag: '):]
+  else:
+    color = RED
+  return color + branch + RESET
+
+
+def _color_branch_list(branch_list, all_branches, all_tags, current):
+  if not branch_list:
+    return ''
+  colored_branches = (GREEN + ', ').join(
+      _color_branch(branch, all_branches, all_tags, current)
+      for branch in branch_list if branch != 'HEAD')
+  return (GREEN + '(' + colored_branches + GREEN + ') ' + RESET)
+
+
+def _parse_log_line(line):
+  graph, branch_list, commit_date, subject = (
+      line.decode('utf-8', 'replace').strip().split('\x00'))
+  branch_list = [] if not branch_list else branch_list.split(', ')
+  commit = graph.split()[-1]
+  graph = graph[:-len(commit)]
+  return graph, commit, branch_list, commit_date, subject
+
+
+def main(argv, outbuf):
+  if '-h' in argv or '--help' in argv:
+    _print_help(outbuf)
+    return 0
 
+  map_extra = git_common.get_config_list('depot_tools.map_extra')
+  cmd = [
+      git_common.GIT_EXE, 'log', git_common.root(),
+      '--graph', '--branches', '--tags', '--color=always', '--date=short',
+      '--pretty=format:%H%x00%D%x00%cd%x00%s'
+  ] + map_extra + argv
 
-def main(argv):
-  if '-h' in argv:
-    print_help()
-    return 0
+  log_proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE, shell=False)
 
-  map_extra = get_config_list('depot_tools.map_extra')
-  fmt = '%C(red bold)%h%x09%Creset%C(green)%d%Creset %C(yellow)%cd%Creset ~ %s'
-  log_proc = subprocess2.Popen(
-    [GIT_EXE, 'log', '--graph', '--branches', '--tags', root(),
-     '--color=always', '--date=short', ('--pretty=format:' + fmt)
-    ] + map_extra + argv,
-    stdout=subprocess2.PIPE,
-    shell=False)
-
-  current = current_branch()
-  all_branches = set(branches())
-  merge_base_map = {b: get_or_create_merge_base(b) for b in all_branches}
-  merge_base_map = {b: v for b, v in merge_base_map.iteritems() if v}
+  current = git_common.current_branch()
+  all_tags = set(git_common.tags())
+  all_branches = set(git_common.branches())
   if current in all_branches:
     all_branches.remove(current)
-  all_tags = set(tags())
+
+  merge_base_map = {}
+  for branch in all_branches:
+    merge_base = git_common.get_or_create_merge_base(branch)
+    if merge_base:
+      merge_base_map.setdefault(merge_base, set()).add(branch)
+
+  for merge_base, branches in merge_base_map.items():
+    merge_base_map[merge_base] = ', '.join(branches)
+
   try:
-    for line in log_proc.stdout.xreadlines():
-      if merge_base_map:
-        commit = line[line.find(BRIGHT_RED)+len(BRIGHT_RED):line.find('\t')]
-        base_for_branches = set()
-        for branch, sha in merge_base_map.iteritems():
-          if sha.startswith(commit):
-            base_for_branches.add(branch)
-        if base_for_branches:
-          newline = '\r\n' if line.endswith('\r\n') else '\n'
-          line = line.rstrip(newline)
-          line += ''.join(
-              (BRIGHT, WHITE, '    <(%s)' % (', '.join(base_for_branches)),
-               RESET, newline))
-          for b in base_for_branches:
-            del merge_base_map[b]
-
-      start = line.find(GREEN+' (')
-      end   = line.find(')', start)
-      if start != -1 and end != -1:
-        start += len(GREEN) + 2
-        branch_list = line[start:end].split(', ')
-        branches_str = ''
-        if branch_list:
-          colored_branches = []
-          head_marker = ''
-          for b in branch_list:
-            if b == "HEAD":
-              head_marker = BLUEBAK+BRIGHT+'*'
-              continue
-            if b == current:
-              colored_branches.append(CYAN+BRIGHT+b+RESET)
-              current = None
-            elif b in all_branches:
-              colored_branches.append(GREEN+BRIGHT+b+RESET)
-              all_branches.remove(b)
-            elif b in all_tags:
-              colored_branches.append(MAGENTA+BRIGHT+b+RESET)
-            elif b.startswith('tag: '):
-              colored_branches.append(MAGENTA+BRIGHT+b[5:]+RESET)
-            else:
-              colored_branches.append(RED+b)
-            branches_str = '(%s) ' % ((GREEN+", ").join(colored_branches)+GREEN)
-          line = "%s%s%s" % (line[:start-1], branches_str, line[end+5:])
-          if head_marker:
-            line = line.replace('*', head_marker, 1)
-      sys.stdout.write(line)
-  except (IOError, KeyboardInterrupt):
+    for line in log_proc.stdout:
+      if b'\x00' not in line:
+        outbuf.write(line)
+        continue
+
+      graph, commit, branch_list, commit_date, subject = _parse_log_line(line)
+
+      if 'HEAD' in branch_list:
+        graph = graph.replace('*', BLUE_BACK + '*')
+
+      line = '{graph}{commit}\t{branches}{date} ~ {subject}'.format(
+          graph=graph,
+          commit=BRIGHT_RED + commit[:10] + RESET,
+          branches=_color_branch_list(
+              branch_list, all_branches, all_tags, current),
+          date=YELLOW + commit_date + RESET,
+          subject=subject)
+
+      if commit in merge_base_map:
+        line += '    <({})'.format(WHITE + merge_base_map[commit] + RESET)
+
+      line += os.linesep
+      outbuf.write(line.encode('utf-8', 'replace'))
+  except (BrokenPipeError, KeyboardInterrupt):
     pass
-  finally:
-    sys.stderr.close()
-    sys.stdout.close()
   return 0
 
 
 if __name__ == '__main__':
-  try:
-    sys.exit(main(sys.argv[1:]))
-  except KeyboardInterrupt:
-    sys.stderr.write('interrupted\n')
-    sys.exit(1)
+  setup_color.init()
+  with git_common.less() as less_input:
+    sys.exit(main(sys.argv[1:], less_input))

data/vendor/depot_tools/git_map_branches.py

@@ -24,6 +24,8 @@ Branches are colorized as follows:
     upstream, then you will see this.
 """
 
+from __future__ import print_function
+
 import argparse
 import collections
 import os
@@ -138,14 +140,13 @@ class BranchMapper(object):
       # This is a blocking get which waits for the remote CL status to be
       # retrieved.
       for cl, status in status_info:
-        self.__status_info[cl.GetBranch()] = (cl.GetIssueURL(),
-                                              color_for_status(status),
-                                              status)
+        self.__status_info[cl.GetBranch()] = (cl.GetIssueURL(short=True),
+                                              color_for_status(status), status)
 
     roots = set()
 
     # A map of parents to a list of their children.
-    for branch, branch_info in self.__branches_info.iteritems():
+    for branch, branch_info in self.__branches_info.items():
       if not branch_info:
         continue
 
@@ -185,8 +186,8 @@ class BranchMapper(object):
       parent = self.__branches_info[cycle[-1]].upstream
       cycle.append(parent)
       if parent == branch:
-        print >> sys.stderr, 'Warning: Detected cycle in branches: {}'.format(
-            ' -> '.join(cycle))
+        print('Warning: Detected cycle in branches: {}'.format(
+            ' -> '.join(cycle)), file=sys.stderr)
         return True
     return False
 
@@ -312,17 +313,17 @@ def print_desc():
 def main(argv):
   setup_color.init()
   if get_git_version() < MIN_UPSTREAM_TRACK_GIT_VERSION:
-    print >> sys.stderr, (
+    print(
         'This tool will not show all tracking information for git version '
         'earlier than ' +
         '.'.join(str(x) for x in MIN_UPSTREAM_TRACK_GIT_VERSION) +
-        '. Please consider upgrading.')
+        '. Please consider upgrading.', file=sys.stderr)
 
   if '-h' in argv:
     print_desc()
 
   parser = argparse.ArgumentParser()
-  parser.add_argument('-v', action='count',
+  parser.add_argument('-v', action='count', default=0,
                       help=('Pass once to show tracking info, '
                             'twice for hash and review url, '
                             'thrice for review status'))
@@ -342,7 +343,7 @@ def main(argv):
   mapper.maxjobs = opts.maxjobs
   mapper.show_subject = opts.show_subject
   mapper.start()
-  print mapper.output.as_formatted_string()
+  print(mapper.output.as_formatted_string())
   return 0
 
 if __name__ == '__main__':

data/vendor/depot_tools/git_mark_merge_base.py

@@ -11,6 +11,8 @@ purposes of the chromium depot_tools git extensions. Passing no arguments will
 just print the effective merge base for the current branch.
 """
 
+from __future__ import print_function
+
 import argparse
 import sys
 
@@ -39,16 +41,16 @@ def main(argv):
     try:
       remove_merge_base(cur)
     except CalledProcessError:
-      print 'No merge base currently exists for %s.' % cur
+      print('No merge base currently exists for %s.' % cur)
     return 0
 
   if opts.merge_base:
     try:
       opts.merge_base = hash_one(opts.merge_base)
     except CalledProcessError:
-      print >> sys.stderr, (
-          'fatal: could not resolve %s as a commit' % (opts.merge_base)
-      )
+      print(
+          'fatal: could not resolve %s as a commit' % opts.merge_base,
+          file=sys.stderr)
       return 1
 
     manual_merge_base(cur, opts.merge_base, upstream(cur))
@@ -57,9 +59,9 @@ def main(argv):
   actual = get_or_create_merge_base(cur)
   if opts.merge_base and opts.merge_base != actual:
     ret = 1
-    print "Invalid merge_base %s" % opts.merge_base
+    print("Invalid merge_base %s" % opts.merge_base)
 
-  print "merge_base(%s): %s" % (cur, actual)
+  print("merge_base(%s): %s" % (cur, actual))
   return ret
 
 

data/vendor/depot_tools/git_nav_downstream.py

@@ -9,9 +9,12 @@ is more than one downstream branch, then this script will prompt you to select
 which branch.
 """
 
+from __future__ import print_function
+
 import argparse
 import sys
 
+import gclient_utils
 from git_common import current_branch, branches, upstream, run, hash_one
 import metrics
 
@@ -36,24 +39,24 @@ def main(args):
     cur = hash_one(cur)
   downstreams = [b for b in branches() if upfn(b) == cur]
   if not downstreams:
-    print "No downstream branches"
+    print("No downstream branches")
     return 1
   elif len(downstreams) == 1:
     run('checkout', downstreams[0], stdout=sys.stdout, stderr=sys.stderr)
   else:
     high = len(downstreams) - 1
     while True:
-      print "Please select a downstream branch"
+      print("Please select a downstream branch")
       for i, b in enumerate(downstreams):
-        print "  %d. %s" % (i, b)
+        print("  %d. %s" % (i, b))
       prompt = "Selection (0-%d)[0]: " % high
       r = opts.pick
       if r:
-        print prompt + r
+        print(prompt + r)
       else:
-        r = raw_input(prompt).strip() or '0'
+        r = gclient_utils.AskForData(prompt).strip() or '0'
       if not r.isdigit() or (0 > int(r) > high):
-        print "Invalid choice."
+        print("Invalid choice.")
       else:
         run('checkout', downstreams[int(r)], stdout=sys.stdout,
             stderr=sys.stderr)

data/vendor/depot_tools/git_new_branch.py

@@ -9,11 +9,44 @@ Create new branch tracking origin/master by default.
 import argparse
 import sys
 
+import git_common
 import subprocess2
 
-from git_common import run, root, set_config, get_or_create_merge_base, tags
-from git_common import hash_one, upstream, set_branch_config, current_branch
 
+def create_new_branch(
+    branch_name, upstream_current=False, upstream=None, inject_current=False):
+  upstream = upstream or git_common.root()
+  try:
+    if inject_current:
+      below = git_common.current_branch()
+      if below is None:
+        raise Exception('no current branch')
+      above = git_common.upstream(below)
+      if above is None:
+        raise Exception('branch %s has no upstream' % (below))
+      git_common.run('checkout', '--track', above, '-b', branch_name)
+      git_common.run('branch', '--set-upstream-to', branch_name, below)
+    elif upstream_current:
+      git_common.run('checkout', '--track', '-b', branch_name)
+    else:
+      if upstream in git_common.tags():
+        # TODO(iannucci): ensure that basis_ref is an ancestor of HEAD?
+        git_common.run(
+            'checkout', '--no-track', '-b', branch_name,
+            git_common.hash_one(upstream))
+        git_common.set_config('branch.%s.remote' % branch_name, '.')
+        git_common.set_config('branch.%s.merge' % branch_name, upstream)
+      else:
+        # TODO(iannucci): Detect unclean workdir then stash+pop if we need to
+        # teleport to a conflicting portion of history?
+        git_common.run('checkout', '--track', upstream, '-b', branch_name)
+    git_common.get_or_create_merge_base(branch_name)
+  except subprocess2.CalledProcessError as cpe:
+    sys.stdout.write(cpe.stdout.decode('utf-8', 'replace'))
+    sys.stderr.write(cpe.stderr.decode('utf-8', 'replace'))
+    return 1
+  sys.stderr.write('Switched to branch %s.\n' % branch_name)
+  return 0
 
 def main(args):
   parser = argparse.ArgumentParser(
@@ -25,7 +58,7 @@ def main(args):
   g.add_argument('--upstream-current', '--upstream_current',
                  action='store_true',
                  help='set upstream branch to current branch.')
-  g.add_argument('--upstream', metavar='REF', default=root(),
+  g.add_argument('--upstream', metavar='REF',
                  help='upstream branch (or tag) to track.')
   g.add_argument('--inject-current', '--inject_current',
                  action='store_true',
@@ -36,36 +69,9 @@ def main(args):
 
   opts = parser.parse_args(args)
 
-  try:
-    if opts.inject_current:
-      below = current_branch()
-      if below is None:
-        raise Exception('no current branch')
-      above = upstream(below)
-      if above is None:
-        raise Exception('branch %s has no upstream' % (below))
-      run('checkout', '--track', above, '-b', opts.branch_name)
-      run('branch', '--set-upstream-to', opts.branch_name, below)
-    elif opts.upstream_current:
-      run('checkout', '--track', '-b', opts.branch_name)
-    else:
-      if opts.upstream in tags():
-        # TODO(iannucci): ensure that basis_ref is an ancestor of HEAD?
-        run('checkout', '--no-track', '-b', opts.branch_name,
-            hash_one(opts.upstream))
-        set_config('branch.%s.remote' % opts.branch_name, '.')
-        set_config('branch.%s.merge' % opts.branch_name, opts.upstream)
-      else:
-        # TODO(iannucci): Detect unclean workdir then stash+pop if we need to
-        # teleport to a conflicting portion of history?
-        run('checkout', '--track', opts.upstream, '-b', opts.branch_name)
-    get_or_create_merge_base(opts.branch_name)
-  except subprocess2.CalledProcessError as cpe:
-    sys.stdout.write(cpe.stdout)
-    sys.stderr.write(cpe.stderr)
-    return 1
-  sys.stderr.write('Switched to branch %s.\n' % opts.branch_name)
-  return 0
+  return create_new_branch(
+      opts.branch_name, opts.upstream_current, opts.upstream,
+      opts.inject_current)
 
 
 if __name__ == '__main__':  # pragma: no cover