From 3d125940f6223efe62e35b795f57e7e717b4528e Mon Sep 17 00:00:00 2001 From: Pierre Tardy Date: Fri, 4 May 2012 12:18:12 +0200 Subject: repo download: add --ff-only option Allows to ff-only a gerrit patch This patch is necessary to automatically ensure that the patch will be correctly submitted on ff-only gerrit projects You can now use: repo download (--ff-only|-f) project changeid/patchnumber This is useful to automate verification of fast forward status of a patch in the context of build automation, and commit gating (e.g. buildbot) Change-Id: I403a667557a105411a633e62c8eec23d93724b43 Signed-off-by: Erwan Mahe Signed-off-by: Pierre Tardy --- subcmds/download.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'subcmds/download.py') diff --git a/subcmds/download.py b/subcmds/download.py index f79f485b..0ea45c3f 100644 --- a/subcmds/download.py +++ b/subcmds/download.py @@ -39,6 +39,9 @@ makes it available in your project's local working directory. p.add_option('-r','--revert', dest='revert', action='store_true', help="revert instead of checkout") + p.add_option('-f','--ff-only', + dest='ffonly', action='store_true', + help="force fast-forward merge") def _ParseChangeIds(self, args): if not args: @@ -87,5 +90,7 @@ makes it available in your project's local working directory. project._CherryPick(dl.commit) elif opt.revert: project._Revert(dl.commit) + elif opt.ffonly: + project._FastForward(dl.commit, ffonly=True) else: project._Checkout(dl.commit) -- cgit v1.2.3-54-g00ecf