android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

repo download: add --revert option

Browse Source 
BZ: 4779
Allows to revert a gerrit patch
This patch is necessary for the on-demand creation of
engineering builds using buildbot

You can now use:
repo download [--revert|-r project changeid/patchnumber

This is useful to automate reverting of a patch
in the context of build automation, and regression bisection

Change-Id: I3985e80e4b2a230f83526191ea1379765a54bdcf
Signed-off-by: Erwan Mahe <erwan.mahe@intel.com>
Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
This commit is contained in:
Erwan Mahe 2011-08-19 13:56:09 +02:00 committed by Shawn O. Pearce
parent e5a2122e64
commit a94f162b9f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
project.py
View File

@ -1645,6 +1645,15 @@ class Project(object):
if self._allrefs: if self._allrefs:
raise GitError('%s cherry-pick %s ' % (self.name, rev)) raise GitError('%s cherry-pick %s ' % (self.name, rev))
def _Revert(self, rev, quiet=False):
cmd = ['revert']
cmd.append('--no-edit')
cmd.append(rev)
cmd.append('--')
if GitCommand(self, cmd).Wait() != 0:
if self._allrefs:
raise GitError('%s revert %s ' % (self.name, rev))
def _ResetHard(self, rev, quiet=True): def _ResetHard(self, rev, quiet=True):
cmd = ['reset', '--hard'] cmd = ['reset', '--hard']
if quiet: if quiet:

7
subcmds/download.py
View File

@ -36,6 +36,9 @@ makes it available in your project's local working directory.
p.add_option('-c','--cherry-pick', p.add_option('-c','--cherry-pick',
dest='cherrypick', action='store_true', dest='cherrypick', action='store_true',
help="cherry-pick instead of checkout") help="cherry-pick instead of checkout")
p.add_option('-r','--revert',
dest='revert', action='store_true',
help="revert instead of checkout")
def _ParseChangeIds(self, args): def _ParseChangeIds(self, args):
if not args: if not args:
@ -68,7 +71,7 @@ makes it available in your project's local working directory.
% (project.name, change_id, ps_id) % (project.name, change_id, ps_id)
sys.exit(1) sys.exit(1)
if not dl.commits: if not opt.revert and not dl.commits:
print >>sys.stderr, \ print >>sys.stderr, \
'[%s] change %d/%d has already been merged' \ '[%s] change %d/%d has already been merged' \
% (project.name, change_id, ps_id) % (project.name, change_id, ps_id)
@ -82,5 +85,7 @@ makes it available in your project's local working directory.
print >>sys.stderr, ' %s' % (c) print >>sys.stderr, ' %s' % (c)
if opt.cherrypick: if opt.cherrypick:
project._CherryPick(dl.commit) project._CherryPick(dl.commit)
elif opt.revert:
project._Revert(dl.commit)
else: else:
project._Checkout(dl.commit) project._Checkout(dl.commit)