mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 10:41:31 +00:00
71437c0ba5
Error out of the current tree is dirty (previously the dirty content would be incorporated silently into the newly squashed branch!). Review URL: https://codereview.chromium.org/1064933004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294744 0039d316-1c4b-4281-b951-d872f2087c98
29 lines
764 B
Python
Executable File
29 lines
764 B
Python
Executable File
#!/usr/bin/env python
|
|
# Copyright 2014 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.
|
|
|
|
import argparse
|
|
import sys
|
|
|
|
import git_common
|
|
|
|
def main(args):
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument(
|
|
'-m', '--message', metavar='<msg>', default='git squash commit.',
|
|
help='Use the given <msg> as the first line of the commit message.')
|
|
opts = parser.parse_args(args)
|
|
if git_common.is_dirty_git_tree('squash-branch'):
|
|
return 1
|
|
git_common.squash_current_branch(opts.message)
|
|
return 0
|
|
|
|
|
|
if __name__ == '__main__':
|
|
try:
|
|
sys.exit(main(sys.argv[1:]))
|
|
except KeyboardInterrupt:
|
|
sys.stderr.write('interrupted\n')
|
|
sys.exit(1)
|