This patch restores the ability to override commit dialogs, so
that the test suite doesn't have to wait for user interaction.
Vincent
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: http://bazaar.launchpad.net/%7Ebzr-gtk/bzr-gtk/trunk
# testament_sha1: 28b96223b4eadfd210bd987449445d8ed9e60153
# timestamp: 2008-09-29 18:15:17 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'commit.py'
--- commit.py 2008-08-25 17:20:50 +0000
+++ commit.py 2008-09-29 16:10:51 +0000
@@ -104,7 +104,9 @@
gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
parent=parent,
flags=0,
- buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+ buttons=(gtk.STOCK_CANCEL,
+ gtk.RESPONSE_CANCEL))
+ self._question_dialog = question_dialog
self._wt = wt
# TODO: Do something with this value, it is used by Olive
@@ -650,7 +652,7 @@
message = self._get_global_commit_message()
if message == '':
- response = question_dialog(
+ response = self._question_dialog(
_i18n('Commit with an empty message?'),
_i18n('You can describe your commit intent in the message.'),
parent=self)
@@ -671,7 +673,7 @@
# entirely, since there isn't a way for them to add the unknown
# files at this point.
for path in self._wt.unknowns():
- response = question_dialog(
+ response = self._question_dialog(
_i18n("Commit with unknowns?"),
_i18n("Unknown files exist in the working tree. Commit anyway?"),
parent=self)
@@ -692,7 +694,7 @@
specific_files=specific_files,
revprops=revprops)
except errors.PointlessCommit:
- response = question_dialog(
+ response = self._question_dialog(
_i18n('Commit with no changes?'),
_i18n('There are no changes in the working tree.'
' Do you want to commit anyway?'),
=== modified file 'tests/test_commit.py'
--- tests/test_commit.py 2008-06-10 15:25:47 +0000
+++ tests/test_commit.py 2008-09-29 16:10:51 +0000
@@ -651,7 +651,7 @@
def _set_question_yes(self, dlg):
"""Set the dialog to answer YES to any questions."""
self.questions = []
- def _question_yes(*args):
+ def _question_yes(*args, **kwargs):
self.questions.append(args)
self.questions.append('YES')
return gtk.RESPONSE_YES
@@ -660,7 +660,7 @@
def _set_question_no(self, dlg):
"""Set the dialog to answer NO to any questions."""
self.questions = []
- def _question_no(*args):
+ def _question_no(*args, **kwargs):
self.questions.append(args)
self.questions.append('NO')
return gtk.RESPONSE_NO
@@ -708,7 +708,7 @@
self.assertEqual(last_rev, dlg.committed_revision_id)
self.assertEqual(last_rev, tree.branch.last_revision())
- def test_commit_no_message(self):
+ def test_commit_empty_message(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a', 'tree/b'])
tree.add(['a'], ['a-id'])
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfjneKEAAnr/gERQAAFR////
fw3fAL////BQBcYrzpIzWdUZsG7YUJJQ0QankDQaaJmpoaDQAaaAaNA0EohJsp5GhR6TQNAAAAAA
AAJIgiJ5NGptBT00ynqZlNGAgGgaNNPUaDjJkyYjEwAmTBMgBowjAEMAkkTTTQJk0aT0aqe1T9NG
gUeobQaaEAGn6oclKXS1u6WJMQw3tg8yejCrrJ2CpIzWxo1CmT7PUVJajm0xAtjI1bkWTLLNAPEU
MDU1LyBOQMerbLUpjXkVjMyZhfnvQWxorctd8OGiZGM8VEVkgOO0pvCGnhWfDW6+5HwzHjqvbscs
tOupyNEc3l5UTqlCTlUXv9TljDrgh+r9kwwIscrrvEcnJd1NnhQSeOM0+DytAfQzoV2skV29SEEL
XN/Nq+qpRWi+cEZXOMoM4iOGumzFNowjmMcAYDiNud1scDjNF6ps90Z6CoMwUkxH9EaQeg2KPuQ1
fVhIss13FIBNwc8sGEEw3gR1t3qYfJ0yCc4OcuIyE/kWEHqgYDKspUKQcVlJE3eclCaBBTCqlCts
QHT61AYj5pOp45ou5gIShTe5VKZUqvSBYSuPKBvuTSTjECxazq+prtalYF90wgvuH7AtweSNTiMd
U3/FhEYBkTfUrtfXPW9oZB6Y8eWTSBEIUlDCQyNizMFypeUESqMSEkWhzL0emmP4rxpEkTP7jS2t
1leK1aaylAwVwjY4LWubnmRcVDwLzyW5aC1oyeqgHaQYxgDPtRiMYjGGFpAmOkKSo0nWVW4udrYk
X6jRTAYqtDYOUjQaAyNQ4B1kqUKkcUD5E5quJXKhxEIndyMaiQMBecRXaX1eMRKkY3LkGB5sRmyZ
WhCxVIk2o51uZLtYsC3KV0DPtdy4ZjaMenR3K6EJuTVjcIhAPAlRUKCnlyHqezE5qKWXCDYHx83t
iP9SO/fT2TLKYRqwE+HDRv2q2/3J0syIJy6DO5TBGcnElOFTmZ+XpAmiygZ+AdJQeyaQus5gdh2H
w8i7rw9feIiUhaHJDU3AfEAeGAap7PwtS9D5HCGhviDFZdlOmYnMuIqhOTlkYardza7IKEOo7Sgx
GjbNqcW377m6O4NPmzh7AxdVvllJlib47CcHB7QHbSgUS8WckGs12LglVPEtkEjyesJ5aH/TkM6Y
4CxvX3NmH8AicY4S2nqSmn+ZpMjxM61YeNs6kTIv6iizjLSIyJ9Q9i8CIvvCnoPWqj6LS4T6cLYB
VHcH5GngVKKKD0TJO5ILXqosSIoHo5RyDoReaygzPE3Dj6EQ5zlOYJpzGqCB9zcbSzCbIIf3CN4j
h7Z5fUnTCcGCoZdGERhhIPGv9+3v0T0ucYnCxqrhDznS/EmetS5xPwjlLSkX5hctKiUO19DpHq2e
OKbHE/crshkMmGY70FqEaWW5s94EAOdBN2AbfcxIqzcDOHDZgW9qwRV5rYug9TiCgHYIseGLGsTW
dLwcl2jAcxHLZFT3reuNCIMqYhgem9055rLegVKBU7laeyyU4cQGAIZq5QkMiDDMs2javxfBEkOZ
Jln0mR2pq8UBxhmv5GAYBgkCPY8bE9MGCHAQRlbg1BFSirMdz/DPiESOLi0B1zTwjnAVaqYXUVRi
LaZsS5bgOo2ElogYioyWiEUT0fcyeInglzV3jSXsn9sgiiqVeEFOt0NYXFCnYlhgnybJMMxB2Mju
M1JJHYEl/tuDp+eMNWIZMuSbAOXYAsTskKaGqZPAhQWWXkzJGwxbKSSkAyTFLXzvCLSq0aenSzW6
2gwq6nRn0jrlwIMQQMeCERWgzMmKGC9ODtjOZ/4guSLb/XXVS8r2rI3PbsMQY7jBY3IMAKe81cTR
K6IF/yxMJtqrXhaivzFAnYdPrI9BR676j/xdyRThQkPjneKE
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
