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

Merge "Add error message for download -c conflicts"

Browse Source
This commit is contained in:
David Pursehouse 2014-02-17 07:56:59 +00:00 committed by Gerrit Code Review
commit baca5f7e88
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
subcmds/download.py
View File

@ -18,6 +18,7 @@ import re
import sys
from command import Command
from error import GitError
CHANGE_RE = re.compile(r'^([1-9][0-9]*)(?:[/\.-]([1-9][0-9]*))?$')
@ -87,7 +88,12 @@ makes it available in your project's local working directory.
for c in dl.commits:
print(' %s' % (c), file=sys.stderr)
if opt.cherrypick:
project._CherryPick(dl.commit)
try:
project._CherryPick(dl.commit)
except GitError:
print('[%s] Could not complete the cherry-pick of %s' \
% (project.name, dl.commit), file=sys.stderr)
elif opt.revert:
project._Revert(dl.commit)
elif opt.ffonly: