def mockCommit(self, change_info, commit_message, shell_output):
gcl.tempfile.mkstemp(text=True).AndReturn((42, 'commit'))
gcl.os.write(42, commit_message)
gcl.os.close(42)
gcl.tempfile.mkstemp(text=True).AndReturn((43, 'files'))
gcl.os.write(43, '\n'.join(change_info.GetFileNames()))
gcl.os.close(43)
gcl.RunShell(['svn', 'commit', '--file=commit', '--targets=files'],
True).AndReturn(shell_output)
if 'Committed' in shell_output:
self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
gcl.GetCodeReviewSetting('VIEW_VC').AndReturn('http://view/')
gcl.os.remove('commit')
gcl.os.remove('files')
def Revert(revisions,
force=False,
commit=True,
send_email=True,
message=None,
reviewers=None):
"""Reverts many revisions in one change list.
If force is True, it will override local modifications.
If commit is True, a commit is done after the revert.
If send_mail is True, a review email is sent.
If message is True, it is used as the change description.
reviewers overrides the blames email addresses for review email."""
# Use the oldest revision as the primary revision.
changename = "revert%d" % revisions[len(revisions) - 1]
if not force and os.path.exists(gcl.GetChangelistInfoFile(changename)):
print "Error, change %s already exist." % changename
return 1
# Move to the repository root and make the revision numbers sorted in
# decreasing order.
local_root = gcl.GetRepositoryRoot()
os.chdir(local_root)
revisions.sort(reverse=True)
revisions_string = ",".join([str(rev) for rev in revisions])
revisions_string_rev = ",".join([str(-rev) for rev in revisions])
# Get all the modified files by the revision. We'll use this list to optimize
# the svn merge.
logs = []
for revision in revisions:
logs.extend(CaptureSVNLog(["-r", str(revision), "-v"]))
files = []
blames = []
repo_base = GetRepoBase()
for log in logs:
for file in log['paths']:
file_name = file['path']
# Remove the /trunk/src/ part. The + 1 is for the last slash.
if not file_name.startswith(repo_base):
raise OutsideOfCheckout(file_name)
files.append(file_name[len(repo_base):])
blames.append(log['author'])
# On Windows, we need to fix the slashes once they got the url part removed.
if sys.platform == 'win32':
# On Windows, gcl expect the correct slashes.
files = [file.replace('/', os.sep) for file in files]
# Keep unique.
files = UniqueFast(files)
blames = UniqueFast(blames)
if not reviewers:
reviewers = blames
else:
reviewers = UniqueFast(reviewers)
# Make sure there's something to revert.
if not files:
raise NoModifiedFile
if not reviewers:
raise NoBlameList
if blames:
print "Blaming %s\n" % ",".join(blames)
if reviewers != blames:
print "Emailing %s\n" % ",".join(reviewers)
print "These files were modified in %s:" % revisions_string
print "\n".join(files)
print ""
# Make sure these files are unmodified with svn status.
status = gclient_scm.scm.SVN.CaptureStatus(files)
if status:
if force:
# TODO(maruel): Use the tool to correctly revert '?' files.
gcl.RunShell(["svn", "revert"] + files)
else:
raise ModifiedFile(status)
# svn up on each of these files
gcl.RunShell(["svn", "up"] + files)
files_status = {}
# Extract the first level subpaths. Subversion seems to degrade
# exponentially w.r.t. repository size during merges. Working at the root
# directory is too rough for svn due to the repository size.
roots = UniqueFast([file.split(os.sep)[0] for file in files])
for root in roots:
# Is it a subdirectory or a files?
is_root_subdir = os.path.isdir(root)
need_to_update = False
if is_root_subdir:
os.chdir(root)
file_list = []
# List the file directly since it is faster when there is only one file.
for file in files:
if file.startswith(root):
file_list.append(file[len(root) + 1:])
if len(file_list) > 1:
# Listing multiple files is not supported by svn merge.
file_list = ['.']
need_to_update = True
else:
# Oops, root was in fact a file in the root directory.
file_list = [root]
root = "."
print "Reverting %s in %s/" % (revisions_string, root)
if need_to_update:
# Make sure '.' revision is high enough otherwise merge will be
# unhappy.
retcode = gcl.RunShellWithReturnCode(['svn', 'up', '.', '-N'])[1]
if retcode:
print 'svn up . -N failed in %s/.' % root
return retcode
command = ["svn", "merge", "-c", revisions_string_rev]
command.extend(file_list)
(output, retcode) = gcl.RunShellWithReturnCode(command,
print_output=True)
if retcode:
print "'%s' failed:" % command
return retcode
# Grab the status
lines = output.split('\n')
for line in lines:
if line.startswith('---'):
continue
if line.startswith('Skipped'):
print ""
raise ModifiedFile(line[9:-1])
# Update the status.
status = line[:5] + ' '
file = line[5:]
if is_root_subdir:
files_status[root + os.sep + file] = status
else:
files_status[file] = status
if is_root_subdir:
os.chdir('..')
# Transform files_status from a dictionary to a list of tuple.
files_status = [(files_status[file], file) for file in files]
description = "Reverting %s." % revisions_string
if message:
description += "\n\n"
description += message
# Don't use gcl.Change() since it prompts the user for infos.
change_info = gcl.ChangeInfo(changename, 0, 0, description, files_status,
local_root)
change_info.Save()
upload_args = ['--no_presubmit', '-r', ",".join(reviewers)]
if send_email:
upload_args.append('--send_mail')
if commit:
upload_args.append('--no_try')
gcl.UploadCL(change_info, upload_args)
retcode = 0
if commit:
gcl.Commit(change_info, ['--no_presubmit', '--force'])
# TODO(maruel): gclient sync (to leave the local checkout in an usable
# state)
retcode = gclient.Main(["gclient.py", "sync"])
return retcode