Skip to content

C
Chromium_Depot_tools
Switch branch/tag
  1. 04 Aug, 2016 2 commits
    • wychen's avatar
      Extract patchset in Rietveld URLs better · 3c1c172d
      wychen authored 
      Parse URL in the form of:
https://domain/<number>/#ps<patchset>

Review-Url: https://codereview.chromium.org/2215433004
      3c1c172d
    • raphael.kubo.da.costa's avatar
      gclient_scm: Make calls to "git merge-base" non-fatal. · 05c83591
      raphael.kubo.da.costa authored 
      It might be the case for some repositories that there is no merge base
between the current git HEAD and origin/master, which causes git
merge-base to exit with a non-zero code and cause calls to gclient
status/diff/pack to fail, as well as gclient sync if the repository in
question has been removed from DEPS.

This is true for the external/webrtc/trunk/talk repository, for example.
Its recent release branches (branch-heads/45 all the way to /53 at
least) have no ancestry shared with its master branch, so gclient
sync'ing from a Chromium M51 checkout to an M52 one (where it's no
longer in DEPS) fails because of the failed git merge-base calls.

We now ignore failures and just don't specify a merge base when calling
"git diff".

BUG=633962
R=iannucci@chromium.org,agable@chromium.org,maruel@chromium.org

Review-Url: https://codereview.chromium.org/2215673002
      05c83591
  3. 03 Aug, 2016 1 commit
  5. 02 Aug, 2016 1 commit
  7. 01 Aug, 2016 1 commit
  9. 29 Jul, 2016 1 commit
  11. 28 Jul, 2016 1 commit
  13. 27 Jul, 2016 5 commits
  15. 26 Jul, 2016 3 commits
  17. 25 Jul, 2016 3 commits
  19. 23 Jul, 2016 2 commits
  21. 22 Jul, 2016 7 commits
  23. 21 Jul, 2016 4 commits
  25. 20 Jul, 2016 7 commits
  27. 19 Jul, 2016 2 commits
    • techtonik's avatar
      map-branches: Fix crash with --show-subject when branch name matches files · 2e24812d
      techtonik authored 
      Traceback (most recent call last):
  ...
  File "...\\git_map_branches.py", line 303, in main
    mapper.start()
  File "...\\git_map_branches.py", line 169, in start
    self.__append_branch(root)
  File "...\\git_map_branches.py", line 272, in __append_branch
    self.__append_branch(child, depth=depth + 1)
  File "...\\git_map_branches.py", line 267, in __append_branch
    line.append(run('log', '-n1', '--format=%s', branch))
  File "...\git_common.py", line 599, in run
    return run_with_stderr(*cmd, **kwargs)[0]
  File "...\git_common.py", line 668, in run_with_stderr
    raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(), ret, err)
subprocess2.CalledProcessError: Command '...\\git.bat -c color.ui=never log -n1 --format=%s readme' returned non-zero exit status 128 in ...
fatal: ambiguous argument 'readme': both revision and filename
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

BUG=

Review-Url: https://codereview.chromium.org/2153803002
      2e24812d
    • sdefresne's avatar
      Add new parameter --project_root to cpplint.py. · 263e9287
      sdefresne authored 
      Chrome on iOS downstream repository tracks Chromium via DEPS and wants
to use cpplint canned presubmit check but the cpplint.py errors due at
the include guard as it stops at the inner most git repository.

Add a new parameter --project_root to cpplint.py. If set, it overrides
the automatic detection of the project root that searches the root of
the version control repository.

The --root parameter cannot be used as it is used after the automatic
resolution is performed (and allow chopping the head of the relative
path while the need is to expend the path to include ios_internal/).

BUG=598090

Review-Url: https://codereview.chromium.org/2036773002
      263e9287