Lines Matching +full:merge +full:- +full:multiple
3 # Use of this source code is governed by a BSD-style license that can be
7 lastchange.py -- Chromium revision fetching utility.
52 command = ['sh', '-c', ' '.join(command)]
79 command = ['sh', '-c', ' '.join(command)]
107 Return the merge-base of HEAD and ref.
111 ref: The ref to use to find the merge base.
113 The git commit SHA of the merge-base as a string.
115 logging.debug("Calculating merge base between HEAD and %s in %s",
117 command = ['merge-base', 'HEAD', ref]
123 Fetch the Git hash (and Cr-Commit-Position if any) for a given directory.
136 git_args = ['log', '-1', '--format=%H %ct']
138 git_args.append('--grep=' + commit_filter)
148 output = _RunGitCommand(directory, ['cat-file', 'commit', hash_])
150 if line.startswith('Cr-Commit-Position:'):
151 pos = line.rsplit()[-1].strip()
152 logging.debug("Found Cr-Commit-Position '%s'", pos)
153 revision = "{}-{}".format(hash_, pos)
166 if src_index != -1:
197 """Get the top git directory - the directory that contains the .git directory.
202 The output of "git rev-parse --show-toplevel" as a string
204 return _RunGitCommand(source_dir, ['rev-parse', '--show-toplevel'])
245 "You requested a --merge-base-ref value of '%s' but no "
246 "merge base could be found between it and HEAD. Git "
276 parser.add_argument("-m", "--version-macro",
277 help=("Name of C #define when using --header. Defaults to "
279 parser.add_argument("-o",
280 "--output",
283 "Can be combined with other file-output-related "
284 "options to write multiple files."))
285 parser.add_argument("--header",
288 "Can be combined with other file-output-related "
289 "options to write multiple files."))
290 parser.add_argument("--revision",
292 help=("Write last change to FILE as a one-line revision. "
293 "Can be combined with other file-output-related "
294 "options to write multiple files."))
295 parser.add_argument("--merge-base-ref",
297 help=("Only consider changes since the merge "
299 parser.add_argument("--revision-id-only", action='store_true',
301 "Git, a 40-character commit hash, excluding the "
302 "Cr-Commit-Position)."))
303 parser.add_argument("--revision-id-prefix",
306 parser.add_argument("--print-only", action="store_true",
308 "file-output-related options."))
309 parser.add_argument("-s", "--source-dir", metavar="DIR",
311 parser.add_argument("--filter", metavar="REGEX",
314 "'^Change-Id:' to suppress local commits."),
315 default='^Change-Id:')