More debug.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 79 matching lines @@
 
 def GetNoGitPagerEnv():
   env = os.environ.copy()
   # 'cat' is a magical git string that disables pagers on all platforms.
   env['GIT_PAGER'] = 'cat'
   return env
 
 
 def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
   try:
-    return subprocess2.check_output(args, shell=shell, **kwargs)
+    out = subprocess2.check_output(args, shell=shell, **kwargs)
+    logging.debug('output of %s is\n%s\n', args,
+        '\n'.join('  ' + l for l in out.splitlines()))
+    return out
   except subprocess2.CalledProcessError as e:
     logging.debug('Failed running %s', args)
+    logging.debug('output of %s is\n%s\n', args,
+        '\n'.join('  ' + l for l in e.stdout.splitlines()) if e.stdout else '')
     if not error_ok:
       DieWithError(
           'Command "%s" failed.\n%s' % (
             ' '.join(args), error_message or e.stdout or ''))
     return e.stdout
 
 
 def RunGit(args, **kwargs):
   """Returns stdout."""
   return RunCommand(['git'] + args, **kwargs)
 
 
 def RunGitWithCode(args, suppress_stderr=False):
   """Returns return code and stdout."""
   if suppress_stderr:
     stderr = subprocess2.VOID
   else:
     stderr = sys.stderr
   try:
     (out, _), code = subprocess2.communicate(['git'] + args,
                                              env=GetNoGitPagerEnv(),
                                              stdout=subprocess2.PIPE,
                                              stderr=stderr)
+    logging.debug('output of %s is\n%s\n', args,
+        '\n'.join('  ' + l for l in out.splitlines()))
     return code, out
   except subprocess2.CalledProcessError as e:
     logging.debug('Failed running %s', args)
+    logging.debug('output of %s is\n%s\n', args,
+        '\n'.join('  ' + l for l in e.stdout.splitlines()) if e.stdout else '')
     return e.returncode, e.stdout
 
 
 def RunGitSilent(args):
   """Returns stdout, suppresses stderr and ignores the return code."""
   return RunGitWithCode(args, suppress_stderr=True)[1]
 
 
 def IsGitVersionAtLeast(min_version):
   prefix = 'git version '
@@ skipping 1878 matching lines @@
       upload_args.extend(['--base_url', remote_url])
       remote, remote_branch = self.GetRemoteBranch()
       target_ref = GetTargetRef(remote, remote_branch, options.target_branch,
                                 settings.GetPendingRefPrefix())
       if target_ref:
         upload_args.extend(['--target_ref', target_ref])
 
       # Look for dependent patchsets. See crbug.com/480453 for more details.
       remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
       upstream_branch = ShortBranchName(upstream_branch)
+      logging.debug('remote: %s, upstream: %s', remote, upstream_branch)
       if remote is '.':
         # A local branch is being tracked.
         local_branch = upstream_branch
         if settings.GetIsSkipDependencyUpload(local_branch):
           print()
           print('Skipping dependency patchset upload because git config '
                 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
           print()
         else:
           auth_config = auth.extract_auth_config_from_options(options)
           branch_cl = Changelist(branchref='refs/heads/'+local_branch,
                                  auth_config=auth_config)
+          logging.debug('upstream cl: Gerrit=%s', branch_cl.IsGerrit())
           branch_cl_issue_url = branch_cl.GetIssueURL()
           branch_cl_issue = branch_cl.GetIssue()
           branch_cl_patchset = branch_cl.GetPatchset()
+          logging.debug('upstream cl: url %s issue %s pachset %s',
+            branch_cl_issue_url, branch_cl_issue , branch_cl_patchset)
+
           if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
             upload_args.extend(
                 ['--depends_on_patchset', '%s:%s' % (
                      branch_cl_issue, branch_cl_patchset)])
             print(
                 '\n'
                 'The current branch (%s) is tracking a local branch (%s) with '
                 'an associated CL.\n'
                 'Adding %s/#ps%s as a dependency patchset.\n'
                 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
@@ skipping 3150 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)