Title: [148461] trunk/Tools
- Revision
- 148461
- Author
- [email protected]
- Date
- 2013-04-15 13:13:45 -0700 (Mon, 15 Apr 2013)
Log Message
WKR gets stuck when there are many merges
https://bugs.webkit.org/show_bug.cgi?id=114632
Reviewed by Andreas Kling.
Move the last revision forward when it exists in a branch.
Otherwise, we'll be stuck looping over revisions made to merge patches.
* Scripts/webkitpy/tool/commands/newcommitbot.py:
(NewCommitBot.next_work_item):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (148460 => 148461)
--- trunk/Tools/ChangeLog 2013-04-15 20:09:32 UTC (rev 148460)
+++ trunk/Tools/ChangeLog 2013-04-15 20:13:45 UTC (rev 148461)
@@ -1,3 +1,16 @@
+2013-04-15 Ryosuke Niwa <[email protected]>
+
+ WKR gets stuck when there are many merges
+ https://bugs.webkit.org/show_bug.cgi?id=114632
+
+ Reviewed by Andreas Kling.
+
+ Move the last revision forward when it exists in a branch.
+ Otherwise, we'll be stuck looping over revisions made to merge patches.
+
+ * Scripts/webkitpy/tool/commands/newcommitbot.py:
+ (NewCommitBot.next_work_item):
+
2013-04-15 Gustavo Noronha Silva <[email protected]>
[GTK] Missing a few packages for building on stock Fedora
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py (148460 => 148461)
--- trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py 2013-04-15 20:09:32 UTC (rev 148460)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py 2013-04-15 20:13:45 UTC (rev 148461)
@@ -72,16 +72,24 @@
_log.info('Last SVN revision: %d' % self._last_svn_revision)
- for revision in range(self._last_svn_revision + 1, self._last_svn_revision + self._maximum_number_of_revisions_to_avoid_spamming_irc):
+ count = 0
+ while count < self._maximum_number_of_revisions_to_avoid_spamming_irc:
+ new_revision = self._last_svn_revision + 1
try:
commit_log = self._tool.executive.run_command(['svn', 'log', 'https://svn.webkit.org/repository/webkit/trunk', '--non-interactive', '--revision',
- self._tool.scm().strip_r_from_svn_revision(revision)])
+ self._tool.scm().strip_r_from_svn_revision(new_revision)])
except ScriptError:
break
- if self._is_empty_log(commit_log) or commit_log.find('No such revision') >= 0:
+
+ if commit_log.find('No such revision') >= 0:
continue
- _log.info('Found revision %d' % revision)
- self._last_svn_revision = revision
+
+ self._last_svn_revision = new_revision
+ if self._is_empty_log(commit_log):
+ continue
+
+ count += 1
+ _log.info('Found revision %d' % new_revision)
self._tool.irc().post(self._summarize_commit_log(commit_log).encode('utf-8'))
def _is_empty_log(self, commit_log):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
