Fixes LP248537.

A change in bzr.dev makes that a remote branch without WorkingTree doesn't return something anymore when pushing changes to that branch. So.. retrieve remote revno before and after and calculate # commits send. :)

Jasper
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# testament_sha1: 545344c9f711b205eb8317821a9a28c1d1d5720f
# timestamp: 2008-07-18 01:08:12 +0200
# source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk
# base_revision_id: [EMAIL PROTECTED]
# 
# Begin patch
=== modified file 'push.py'
--- push.py	2008-05-05 18:16:46 +0000
+++ push.py	2008-07-17 23:08:05 +0000
@@ -161,7 +161,10 @@
             # FIXME - what to do here? how should we warn the user?
             count = br_to.pull(br_from, overwrite)
         except errors.NoWorkingTree:
-            count = br_to.pull(br_from, overwrite)
+            revno_before = br_to.last_revision_info()[0]
+            br_to.pull(br_from, overwrite)
+            revno_after = br_to.last_revision_info()[0]
+            count = revno_after - revno_before
         else:
             count = tree_to.pull(br_from, overwrite)
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWen1YQAAAYjfgABQUW///1OU
RIq////wUAO+9sPR0O5uxMw0mijQzKDymmjQNAA0ANGgA5piYAEwATAACYAAmCSgmIKaPEjZT1PU
GmhiAABoASKRqn6mho0JkyGAQDRoaANDIJKCZABqTyU9pGjTKbUyNomRoyGEaFt+Z9vJOl9Cx0E8
YFLHPnc8DRi3FuWq0FMHlX53TwsMbjtPueQ8bLsIu/Xk3oJqHF+1nfthAeSvvfvOusGJIHps2mOy
xByTIigIGbX1EQnu0QZw6s4V4oLDBDOUBbjATFu1Sfb7XnNQlinTrjjgbdsq+PcilmM4pSb1oU5s
UDNLGI1BOQMhPEdQ+Y5Cco9CJwqFuOlV3IomWbuCYYG+a2MvAcXhgUUMaxxSgcf0XhVMdJQepGmi
QJhGpoq+saa/TUWSKAukZHu1R6DNYCv3JnTlEzRxaRKSa20na6JPUMMj7yJA0FRIzpUQ1looMrFM
tzqKiBhA7Bd3Ur8I0jrSdWsp0DeksWs2GKccx7xKq2qxBYwaBWNJ1M9JwBpKRy1PNAyR0SpcRsJF
RImMuTheWFQwcLOtxCtgwpTq5cCL5ynxLNaAvJrIt8iRnZVQWxzPFpO29NGEzk3PKaFklZMDDzZd
dO3/cX/k0nEK7lWwYDOQv3tkyC17VAbAMz4pIpZGsds2HwVEQ49CTlgr5jhWj2qPFM39lKuJyR2E
6gYkDA/HKeliW13gJvVvDUVH1MEu3pM+Vg9v6pKkyy6UbcTIqUw9N2DqwiFXdynevnzmG3fN9O8R
DLYDxRklAQHsjZC0BVoLWoB8ZnOlErB2cONjjw0J1V3qnI3AMKt526rphRsxJ4K6hwk2dPuvMpEx
N8oPXjzlBUm0jF5fWukxrUnClpNmaxiwTWhO3FnjgnVldgOMSvFOJdoURG9uT5rhGYizn+XrZDq3
C6xdPIcay4S0LQr4VUmGnNAUEratZlr1JSWfG0nnX3np1S21IT1Rw0l5hKqV42Dzp1iaBxKJXAH2
ScEnJXhNCCgxDFmahhyptwWmCTGQEYaXpSkDCpfzVM9W7VGqx9zXXXZlAxnEynLGKYVcpvKvazwZ
gnrWXzEuarBMUsNaRODGT8NNqsh3OqFTUSeGxuhWI3pgp4UxwC7isSaGnsNSUZqBuBymxdi6J1ly
AwsPmIZQtNSYMmQ2eL/Qt3QLS4ZfY7WLQW6SiEeUeYKkL1P3tUGKffS8PvxtNGV8sLng3K1NiI2i
YEyrbb9G3YbBYJQT4kk1ozJEsUP8XckU4UJDp9WEAA==

Attachment: signature.asc
Description: OpenPGP digital signature

-- 
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk

Reply via email to