sync-master-with-upstream 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. #!/usr/bin/env python
  2. # Copyright 2012 Google, Inc. All rights reserved.
  3. #
  4. # Redistribution and use in source and binary forms, with or without
  5. # modification, are permitted provided that the following conditions
  6. # are met:
  7. # 1. Redistributions of source code must retain the above copyright
  8. # notice, this list of conditions and the following disclaimer.
  9. # 2. Redistributions in binary form must reproduce the above copyright
  10. # notice, this list of conditions and the following disclaimer in the
  11. # documentation and/or other materials provided with the distribution.
  12. #
  13. # THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
  14. # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  15. # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  16. # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
  17. # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  18. # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  19. # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  20. # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  21. # OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  22. # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  23. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  24. # This script is intended to support the GitHub workflow described here:
  25. # https://trac.webkit.org/wiki/UsingGitHub
  26. #
  27. # This script fetches the latest changes from upstream, and pushes those
  28. # changes to the master branch in origin (e.g., your GitHub fork of WebKit).
  29. #
  30. # Running this script periodically will keep your fork of WebKit on GitHub in
  31. # sync with the "root" WebKit repository in upstream, assuming you've run
  32. # configure-github-as-upstream
  33. import subprocess
  34. def run(args, error_message = None):
  35. if subprocess.call(args) != 0:
  36. if error_message:
  37. print error_message
  38. exit(1)
  39. run(["git", "fetch", "upstream"], "Have you run configure-github-as-upstream to configure an upstream repository?")
  40. run(["git", "push", "origin", "upstream/master:master"])
  41. print "\nConsider running 'git merge origin' to update your local branches."