Skip to content

C
Chromium_Depot_tools
Switch branch/tag
  1. 02 Oct, 2015 5 commits
  3. 01 Oct, 2015 1 commit
  5. 30 Sep, 2015 2 commits
  7. 29 Sep, 2015 3 commits
  9. 25 Sep, 2015 3 commits
  11. 24 Sep, 2015 1 commit
  13. 23 Sep, 2015 1 commit
  15. 22 Sep, 2015 2 commits
  17. 21 Sep, 2015 1 commit
  19. 19 Sep, 2015 1 commit
  21. 18 Sep, 2015 1 commit
  23. 17 Sep, 2015 2 commits
  25. 15 Sep, 2015 3 commits
  27. 14 Sep, 2015 1 commit
  29. 11 Sep, 2015 1 commit
  31. 10 Sep, 2015 2 commits
  33. 09 Sep, 2015 1 commit
    • scottmg@chromium.org's avatar
      find-releases: handle untagged merges · b62f6754
      scottmg@chromium.org authored 
      At the moment, this doesn't work too well for something that was just merged to
45.

[(b912ace...)]scottmg@scottmg:/work/cr/src$ git find-releases 55b4c95889d6a72e52bc72702580a62f04f35777
commit 55b4c95889d6a72e52bc72702580a62f04f35777 was:
  initially in 47.0.2501.0
  merged to undefined (as de54b58d404a0cdf01639ae7260ef10bbb843ed9)
  merged to 46.0.2490.19 (as b4ba1071baaabc92cb5a2ca89e238c478eca0075)

("undefined" being the problem). This is because:

[(b912ace...)]scottmg@scottmg:/work/cr/src$ git name-rev --tags de54b58d404a0cdf01639ae7260ef10bbb843ed9
de54b58d404a0cdf01639ae7260ef10bbb843ed9 undefined

But,

[(b912ace...)]scottmg@scottmg:/work/cr/src$ cat .git/refs/remotes/branch-heads/2454
de54b58d404a0cdf01639ae7260ef10bbb843ed9

So, if name-rev --tags says it's not yet tagged, rather than just printing
'undefined', at least say which branch it was merged to. As in:

[(b912ace...)]scottmg@scottmg:/work/cr/src$ git find-releases 55b4c95889d6a72e52bc72702580a62f04f35777
commit 55b4c95889d6a72e52bc72702580a62f04f35777 was:
  initially in 47.0.2501.0
  merged to branch-heads/2454 [untagged] (as de54b58d404a0cdf01639ae7260ef10bbb843ed9)
  merged to 46.0.2490.19 (as b4ba1071baaabc92cb5a2ca89e238c478eca0075)


R=dpranke@chromium.org,primiano@chromium.org

Review URL: https://codereview.chromium.org/1325233005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296621 0039d316-1c4b-4281-b951-d872f2087c98
      b62f6754
  35. 08 Sep, 2015 1 commit
  37. 07 Sep, 2015 1 commit
  39. 02 Sep, 2015 1 commit
  41. 31 Aug, 2015 1 commit
  43. 27 Aug, 2015 1 commit
  45. 25 Aug, 2015 1 commit
  47. 24 Aug, 2015 1 commit
    • tandrii@chromium.org's avatar
      Gclient with git cache: delete conflicting mirror. · c438c148
      tandrii@chromium.org authored 
      Consider an SVN repo which was mirrored to git by git_updater. When SVN repo is migrated to github, the git histories of chromium mirror and new github one are different. As a result, hashes of the objects do not match.

Before, gclient would just get stuck at trying to fetch the repo after changing its remote url with errors like this:

...
[0:01:21] error: refs/heads/master does not point to a valid object!
[0:01:21] error: refs/remotes/origin/HEAD does not point to a valid object!
[0:01:21] error: refs/remotes/origin/master does not point to a valid object!
[0:01:21] error: refs/heads/master does not point to a valid object!
[0:01:21] error: refs/remotes/origin/HEAD does not point to a valid object!
[0:01:21] error: refs/remotes/origin/master does not point to a valid object!
[0:01:21] fatal: bad object HEAD
[0:01:21] error: /b/git-cache/chromium.googlesource.com-external-github.com-google-open--vcdiff did not send all necessary objects


The solution is to notice such state, delete the .git folder, and clone again.


BUG=523239
R=akuegel@chromium.org

Review URL: https://codereview.chromium.org/1303293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296417 0039d316-1c4b-4281-b951-d872f2087c98
      c438c148
  49. 18 Aug, 2015 2 commits