Changeset 58297 in webkit
- Timestamp:
- Apr 27, 2010 2:10:12 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r58293 r58297 1 2010-04-27 Adam Barth <abarth@webkit.org> 2 3 Reviewed by Maciej Stachowiak. 4 5 REGRESSION(r58261): webkit-patch upload does not work in an SVN checkout. 6 https://bugs.webkit.org/show_bug.cgi?id=38186 7 8 Unfortunately, we don't have a good way of testing this change because 9 our test coverage of the scm.py API is poor... 10 11 * Scripts/webkitpy/common/checkout/scm.py: 12 * Scripts/webkitpy/tool/steps/preparechangelog.py: 13 1 14 2010-04-26 Eric Seidel <eric@webkit.org> 2 15 -
trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
r58261 r58297 212 212 raise NotImplementedError, "subclasses must implement" 213 213 214 def should_squash(self, squash): 215 raise NotImplementedError, "subclasses must implement" 216 214 217 def commit_with_message(self, message, username=None, git_commit=None, squash=None): 215 218 raise NotImplementedError, "subclasses must implement" … … 392 395 run_command(['svn', 'revert'] + file_paths) 393 396 397 def should_squash(self, squash): 398 # SVN doesn't support the concept of squashing. 399 return False 400 394 401 def commit_with_message(self, message, username=None, git_commit=None, squash=None): 395 402 # squash and git-commit are not used by SVN. -
trunk/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py
r58261 r58297 56 56 if self._options.email: 57 57 args.append("--email=%s" % self._options.email) 58 if (self._tool.scm().supports_local_commits() and 59 self._tool.scm().should_squash(self._options.squash)): 58 if self._tool.scm().should_squash(self._options.squash): 60 59 args.append("--merge-base=%s" % self._tool.scm().svn_merge_base()) 61 60 if self._options.git_commit:
Note: See TracChangeset
for help on using the changeset viewer.