def createChangesetsForCommits(db,
commits,
silent_if_empty=set(),
full_merges=set(),
replayed_rebases={}):
repository = commits[0].repository
changesets = []
silent_commits = set()
silent_changesets = set()
simple_commits = []
for commit in commits:
if commit not in full_merges and commit not in replayed_rebases:
simple_commits.append(commit)
if simple_commits:
changeset_utils.createChangesets(db, repository, simple_commits)
for commit in commits:
if commit in full_merges:
commit_changesets = changeset_utils.createFullMergeChangeset(
db, user, repository, commit, do_highlight=False)
elif commit in replayed_rebases:
commit_changesets = changeset_utils.createChangeset(
db,
user,
repository,
from_commit=commit,
to_commit=replayed_rebases[commit],
conflicts=True,
do_highlight=False)
else:
commit_changesets = changeset_utils.createChangeset(
db, user, repository, commit, do_highlight=False)
if commit in silent_if_empty:
for commit_changeset in commit_changesets:
if commit_changeset.files:
break
else:
silent_commits.add(commit)
silent_changesets.update(commit_changesets)
changesets.extend(commit_changesets)
return changesets, silent_commits, silent_changesets
def createChangesetsForCommits(db, commits, silent_if_empty=set(), full_merges=set(), replayed_rebases={}):
repository = commits[0].repository
changesets = []
silent_commits = set()
silent_changesets = set()
simple_commits = []
for commit in commits:
if commit not in full_merges and commit not in replayed_rebases:
simple_commits.append(commit)
if simple_commits:
changeset_utils.createChangesets(db, repository, simple_commits)
for commit in commits:
if commit in full_merges:
commit_changesets = changeset_utils.createFullMergeChangeset(
db, user, repository, commit, do_highlight=False)
elif commit in replayed_rebases:
commit_changesets = changeset_utils.createChangeset(
db, user, repository,
from_commit=commit, to_commit=replayed_rebases[commit],
conflicts=True, do_highlight=False)
else:
commit_changesets = changeset_utils.createChangeset(
db, user, repository, commit, do_highlight=False)
if commit in silent_if_empty:
for commit_changeset in commit_changesets:
if commit_changeset.files:
break
else:
silent_commits.add(commit)
silent_changesets.update(commit_changesets)
changesets.extend(commit_changesets)
return changesets, silent_commits, silent_changesets
def addCommitsToReview(db, user, review, commits, new_review=False, commitset=None, pending_mails=None, silent_if_empty=set(), full_merges=set(), replayed_rebases={}, tracked_branch=False):
cursor = db.cursor()
if not new_review:
import index
new_commits = log_commitset.CommitSet(commits)
old_commits = log_commitset.CommitSet(review.branch.commits)
merges = new_commits.getMerges()
for merge in merges:
# We might have stripped it in a previous pass.
if not merge in new_commits: continue
tails = filter(lambda sha1: sha1 not in old_commits and sha1 not in merge.parents, new_commits.getTailsFrom(merge))
if tails:
if tracked_branch:
raise index.IndexException("""\
Merge %s adds merged-in commits. Please push the merge manually
and follow the instructions.""" % merge.sha1[:8])
cursor.execute("SELECT id, confirmed, tail FROM reviewmergeconfirmations WHERE review=%s AND uid=%s AND merge=%s", (review.id, user.id, merge.getId(db)))
row = cursor.fetchone()
if not row or not row[1]:
if not row:
cursor.execute("INSERT INTO reviewmergeconfirmations (review, uid, merge) VALUES (%s, %s, %s) RETURNING id", (review.id, user.id, merge.getId(db)))
confirmation_id = cursor.fetchone()[0]
merged = set()
for tail_sha1 in tails:
children = new_commits.getChildren(tail_sha1)
while children:
child = children.pop()
if child not in merged and new_commits.isAncestorOf(child, merge):
merged.add(child)
children.update(new_commits.getChildren(child) - merged)
merged_values = [(confirmation_id, commit.getId(db)) for commit in merged]
cursor.executemany("INSERT INTO reviewmergecontributions (id, merged) VALUES (%s, %s)", merged_values)
db.commit()
else:
confirmation_id = row[0]
message = "Merge %s adds merged-in commits:" % merge.sha1[:8]
for tail_sha1 in tails:
for parent_sha1 in merge.parents:
if parent_sha1 in new_commits:
parent = new_commits.get(parent_sha1)
if tail_sha1 in new_commits.getTailsFrom(parent):
message += "\n %s..%s" % (tail_sha1[:8], parent_sha1[:8])
message += """
Please confirm that this is intended by loading:
%s/confirmmerge?id=%d""" % (dbutils.getURLPrefix(db, user), confirmation_id)
raise index.IndexException(message)
elif row[2] is not None:
if row[2] == merge.getId(db):
cursor.execute("SELECT merged FROM reviewmergecontributions WHERE id=%s",
(row[0],))
for (merged_id,) in cursor:
merged = gitutils.Commit.fromId(db, review.repository, merged_id)
if merged.sha1 in merge.parents:
new_commits = new_commits.without([merged])
break
else:
tail = gitutils.Commit.fromId(db, review.repository, row[2])
cut = [gitutils.Commit.fromSHA1(db, review.repository, sha1)
for sha1 in tail.parents if sha1 in new_commits]
new_commits = new_commits.without(cut)
if commitset:
commitset &= set(new_commits)
commits = [commit for commit in commits if commit in commitset]
changesets = []
silent_commits = set()
silent_changesets = set()
simple_commits = []
for commit in commits:
if commit not in full_merges and commit not in replayed_rebases:
simple_commits.append(commit)
if simple_commits:
changeset_utils.createChangesets(db, review.repository, simple_commits)
for commit in commits:
if commit in full_merges:
commit_changesets = changeset_utils.createFullMergeChangeset(
db, user, review.repository, commit, do_highlight=False)
elif commit in replayed_rebases:
commit_changesets = changeset_utils.createChangeset(
db, user, review.repository,
from_commit=commit, to_commit=replayed_rebases[commit],
conflicts=True, do_highlight=False)
else:
commit_changesets = changeset_utils.createChangeset(
db, user, review.repository, commit, do_highlight=False)
if commit in silent_if_empty:
for commit_changeset in commit_changesets:
if commit_changeset.files:
break
else:
silent_commits.add(commit)
silent_changesets.update(commit_changesets)
changesets.extend(commit_changesets)
if not new_review:
print "Adding %d commit%s to the review at:\n %s" % (len(commits), len(commits) > 1 and "s" or "", review.getURL(db))
reviewchangesets_values = [(review.id, changeset.id) for changeset in changesets]
cursor.executemany("""INSERT INTO reviewchangesets (review, changeset) VALUES (%s, %s)""", reviewchangesets_values)
cursor.executemany("""INSERT INTO reviewfiles (review, changeset, file, deleted, inserted)
SELECT reviewchangesets.review, reviewchangesets.changeset, fileversions.file,
COALESCE(SUM(chunks.deleteCount), 0), COALESCE(SUM(chunks.insertCount), 0)
FROM reviewchangesets
JOIN fileversions USING (changeset)
LEFT OUTER JOIN chunks USING (changeset, file)
WHERE reviewchangesets.review=%s
AND reviewchangesets.changeset=%s
GROUP BY reviewchangesets.review, reviewchangesets.changeset, fileversions.file""",
reviewchangesets_values)
new_reviewers, new_watchers = assignChanges(db, user, review, changesets=changesets)
cursor.execute("SELECT include FROM reviewrecipientfilters WHERE review=%s AND uid IS NULL", (review.id,))
try: opt_out = cursor.fetchone()[0] is True
except: opt_out = True
if not new_review:
for user_id in new_reviewers:
new_reviewuser = dbutils.User.fromId(db, user_id)
print "Added reviewer: %s <%s>" % (new_reviewuser.fullname, new_reviewuser.email)
if opt_out:
# If the user has opted out from receiving e-mails about this
# review while only watching it, clear the opt-out now that the
# user becomes a reviewer.
cursor.execute("DELETE FROM reviewrecipientfilters WHERE review=%s AND uid=%s AND include=FALSE", (review.id, user_id))
for user_id in new_watchers:
new_reviewuser = dbutils.User.fromId(db, user_id)
print "Added watcher: %s <%s>" % (new_reviewuser.fullname, new_reviewuser.email)
review.incrementSerial(db)
reviewing.comment.propagateCommentChains(db, user, review, new_commits, replayed_rebases)
if pending_mails is None: pending_mails = []
notify_commits = filter(lambda commit: commit not in silent_commits, commits)
notify_changesets = filter(lambda changeset: changeset not in silent_changesets, changesets)
if not new_review and notify_changesets:
recipients = review.getRecipients(db)
for to_user in recipients:
pending_mails.extend(mail.sendReviewAddedCommits(
db, user, to_user, recipients, review, notify_commits,
notify_changesets, tracked_branch=tracked_branch))
mail.sendPendingMails(pending_mails)
review.reviewers.extend([User.fromId(db, user_id) for user_id in new_reviewers])
for user_id in new_watchers:
review.watchers[User.fromId(db, user_id)] = "automatic"
return True
if not commits and not review:
paths = [changed_file.path for changed_file in changesets[0].files]
commits, listed_commits = getApproximativeCommitList(db, repository, from_commit, to_commit, paths)
if commits:
changesets[0].setCommits(commits)
else:
if len(commit.parents) > 1:
if review:
cursor.execute("SELECT COUNT(changeset) FROM reviewchangesets JOIN changesets ON (changeset=id) WHERE review=%s AND child=%s", (review.id, commit.getId(db)))
if cursor.fetchone()[0] > len(commit.parents):
full = True
else:
full = False
if full:
changesets = changeset_utils.createFullMergeChangeset(db, user, repository, commit, review=review)
commits = [commit]
else:
changesets = changeset_utils.createChangeset(db, user, repository, commit=commit, rescan=rescan, reanalyze=reanalyze, conflicts=conflicts, filtered_file_ids=file_ids, review=review)
commits = [commit]
profiler.check("create changeset")
if review and commits:
all_files = set()
pending_files = set()
reviewable_files = set()
cursor.execute("""SELECT reviewfiles.file, reviewfiles.state, reviewuserfiles.uid IS NOT NULL
FROM commits
JOIN changesets ON (changesets.child=commits.id)
if not commits and not review:
paths = [changed_file.path for changed_file in changesets[0].files]
commits, listed_commits = getApproximativeCommitList(db, repository, from_commit, to_commit, paths)
if commits:
changesets[0].setCommits(commits)
else:
if len(commit.parents) > 1:
if review:
cursor.execute("SELECT COUNT(changeset) FROM reviewchangesets JOIN changesets ON (changeset=id) WHERE review=%s AND child=%s", (review.id, commit.getId(db)))
if cursor.fetchone()[0] > len(commit.parents):
full = True
else:
full = False
if full:
changesets = changeset_utils.createFullMergeChangeset(db, user, repository, commit, review=review)
commits = [commit]
else:
changesets = changeset_utils.createChangeset(db, user, repository, commit=commit, rescan=rescan, reanalyze=reanalyze, conflicts=conflicts, filtered_file_ids=file_ids, review=review)
commits = [commit]
profiler.check("create changeset")
if review and commits:
all_files = set()
pending_files = set()
reviewable_files = set()
cursor.execute("""SELECT reviewfiles.file, reviewfiles.state, reviewuserfiles.uid IS NOT NULL
FROM commits
JOIN changesets ON (changesets.child=commits.id)
def addCommitsToReview(db,
user,
review,
commits,
new_review=False,
commitset=None,
pending_mails=None,
silent_if_empty=set(),
full_merges=set(),
tracked_branch=False):
cursor = db.cursor()
if not new_review:
import index
new_commits = log_commitset.CommitSet(commits)
old_commits = log_commitset.CommitSet(review.branch.commits)
merges = new_commits.getMerges()
for merge in merges:
# We might have stripped it in a previous pass.
if not merge in new_commits: continue
tails = filter(
lambda sha1: sha1 not in old_commits and sha1 not in merge.
parents, new_commits.getTailsFrom(merge))
if tails:
if tracked_branch:
raise index.IndexException, """\
Merge %s adds merged-in commits. Please push the merge manually
and follow the instructions.""" % merge.sha1[:8]
cursor.execute(
"SELECT id, confirmed, tail FROM reviewmergeconfirmations WHERE review=%s AND uid=%s AND merge=%s",
(review.id, user.id, merge.getId(db)))
row = cursor.fetchone()
if not row or not row[1]:
if not row:
cursor.execute(
"INSERT INTO reviewmergeconfirmations (review, uid, merge) VALUES (%s, %s, %s) RETURNING id",
(review.id, user.id, merge.getId(db)))
confirmation_id = cursor.fetchone()[0]
merged = set()
for tail_sha1 in tails:
children = new_commits.getChildren(tail_sha1)
while children:
child = children.pop()
if child not in merged and new_commits.isAncestorOf(
child, merge):
merged.add(child)
children.update(
new_commits.getChildren(child) -
merged)
merged_values = [(confirmation_id, commit.getId(db))
for commit in merged]
cursor.executemany(
"INSERT INTO reviewmergecontributions (id, merged) VALUES (%s, %s)",
merged_values)
db.commit()
else:
confirmation_id = row[0]
message = "Merge %s adds merged-in commits:" % merge.sha1[:
8]
for tail_sha1 in tails:
for parent_sha1 in merge.parents:
if parent_sha1 in new_commits:
parent = new_commits.get(parent_sha1)
if tail_sha1 in new_commits.getTailsFrom(
parent):
message += "\n %s..%s" % (tail_sha1[:8],
parent_sha1[:8])
message += """
Please confirm that this is intended by loading:
%s/confirmmerge?id=%d""" % (dbutils.getURLPrefix(db), confirmation_id)
raise index.IndexException, message
elif row[2] is not None:
if row[2] == merge.getId(db):
cursor.execute(
"SELECT merged FROM reviewmergecontributions WHERE id=%s",
(row[0], ))
for (merged_id, ) in cursor:
merged = gitutils.Commit.fromId(
db, review.repository, merged_id)
if merged.sha1 in merge.parents:
new_commits = new_commits.without([merged])
break
else:
tail = gitutils.Commit.fromId(db, review.repository,
row[2])
cut = [
gitutils.Commit.fromSHA1(db, review.repository,
sha1)
for sha1 in tail.parents if sha1 in new_commits
]
new_commits = new_commits.without(cut)
if commitset:
commitset &= set(new_commits)
commits = [commit for commit in commits if commit in commitset]
changesets = []
silent_changesets = set()
simple_commits = []
for commit in commits:
if commit not in full_merges:
simple_commits.append(commit)
if simple_commits:
changeset_utils.createChangesets(db, review.repository, simple_commits)
for commit in commits:
if commit in full_merges:
commit_changesets = changeset_utils.createFullMergeChangeset(
db, user, review.repository, commit)
else:
commit_changesets = changeset_utils.createChangeset(
db, user, review.repository, commit)
if commit in silent_if_empty:
for commit_changeset in commit_changesets:
if commit_changeset.files:
break
else:
silent_changesets.update(commit_changesets)
changesets.extend(commit_changesets)
if not new_review:
print "Adding %d commit%s to the review at:\n %s" % (
len(commits), len(commits) > 1 and "s" or "", review.getURL(db))
reviewchangesets_values = [(review.id, changeset.id)
for changeset in changesets]
cursor.executemany(
"""INSERT INTO reviewchangesets (review, changeset) VALUES (%s, %s)""",
reviewchangesets_values)
cursor.executemany(
"""INSERT INTO reviewfiles (review, changeset, file, deleted, inserted)
SELECT reviewchangesets.review, reviewchangesets.changeset, fileversions.file, COALESCE(SUM(chunks.deleteCount), 0), COALESCE(SUM(chunks.insertCount), 0)
FROM reviewchangesets
JOIN fileversions USING (changeset)
LEFT OUTER JOIN chunks USING (changeset, file)
WHERE reviewchangesets.review=%s
AND reviewchangesets.changeset=%s
GROUP BY reviewchangesets.review, reviewchangesets.changeset, fileversions.file""",
reviewchangesets_values)
new_reviewers, new_watchers = assignChanges(db,
user,
review,
changesets=changesets)
cursor.execute(
"SELECT include FROM reviewrecipientfilters WHERE review=%s AND uid=0",
(review.id, ))
try:
opt_out = cursor.fetchone()[0] is True
except:
opt_out = True
if not new_review:
for user_id in new_reviewers:
new_reviewuser = dbutils.User.fromId(db, user_id)
print "Added reviewer: %s <%s>" % (new_reviewuser.fullname,
new_reviewuser.email)
if opt_out:
# If the user has opted out from receiving e-mails about this
# review while only watching it, clear the opt-out now that the
# user becomes a reviewer.
cursor.execute(
"DELETE FROM reviewrecipientfilters WHERE review=%s AND uid=%s AND include=FALSE",
(review.id, user_id))
for user_id in new_watchers:
new_reviewuser = dbutils.User.fromId(db, user_id)
print "Added watcher: %s <%s>" % (new_reviewuser.fullname,
new_reviewuser.email)
review.incrementSerial(db)
for changeset in changesets:
review_comment.updateCommentChains(db, user, review, changeset)
if pending_mails is None: pending_mails = []
notify_changesets = filter(
lambda changeset: changeset not in silent_changesets, changesets)
if not new_review and notify_changesets:
recipients = review.getRecipients(db)
for to_user in recipients:
pending_mails.extend(
mail.sendReviewAddedCommits(db,
user,
to_user,
recipients,
review,
notify_changesets,
tracked_branch=tracked_branch))
mail.sendPendingMails(pending_mails)
review.reviewers.extend(
[User.fromId(db, user_id) for user_id in new_reviewers])
for user_id in new_watchers:
review.watchers[User.fromId(db, user_id)] = "automatic"
return True
