Also minor tweak to remove / remove-delete to use proper bools, changed string in revert method because only 1 file gets reverted and changed (unused) broken diff_all method.
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: 7a8044872db5a2c5ee9926af0fd9f023a1fe1e0e # timestamp: 2008-07-24 21:34:02 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/menu.py' --- olive/menu.py 2008-07-22 22:42:43 +0000 +++ olive/menu.py 2008-07-24 19:33:17 +0000 @@ -211,7 +211,7 @@ branch.unlock() @show_bzr_error - def remove_file(self, action,delete_on_disk=0): + def remove_file(self, action, delete_on_disk=False): """ Right context menu -> Remove """ # Remove only the selected file directory = self.path @@ -239,14 +239,17 @@ def remove_and_delete_file(self, action): """ Right context menu -> Remove and delete""" - self.remove_file(action,delete_on_disk=1) + self.remove_file(action, delete_on_disk=True) def rename_file(self, action): """ Right context menu -> Rename """ - from rename import OliveRename - wt = WorkingTree.open_containing(self.path + os.sep + self.selected)[0] - rename = OliveRename(wt, wt.relpath(self.path), self.selected) - rename.display() + from bzrlib.plugins.gtk.olive.rename import RenameDialog + wt = WorkingTree.open_containing(os.path.join(self.path, self.selected))[0] + rename = RenameDialog(wt, wt.relpath(self.path), self.selected) + response = rename.run() + rename.destroy() + if response == gtk.RESPONSE_OK: + self.app.refresh_right() def open_file(self, action): """ Right context menu -> Open """ @@ -274,7 +277,7 @@ _i18n('Please have a look at the working tree before continuing.')) else: info_dialog(_i18n('Revert successful'), - _i18n('All files reverted to last revision.')) + _i18n('Selected file reverted to last revision.')) self.app.refresh_right() def commit(self, action): @@ -361,9 +364,11 @@ def diff_all(self, action): """ Diff toolbutton -> All... """ - from diff import OliveDiff - diff = OliveDiff(self.comm) - diff.display() + wt = WorkingTree.open_containing(self.path)[0] + window = DiffWindow(self.app) + parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision()) + window.set_diff(wt.branch.nick, wt, parent_tree) + window.show() def view_remote(self, action): """ Remote context menu -> View contents """ # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUXCoiUAAfz/gERQBABR5/// V5ncir//3/BQBM7jOeFm9PLg7a172wkkU8VT/ST1PEQ9T0E2keinqAwTRoGh6CAlIE1PRpDU/TVA 9TIyGj1AAAAAA0CBJinqMaTRp6TTTagNABoAZNAJFTTFQeFB6jQNqADQDQAAAAkkQYkwU9NA1NDT U00ZA0ZDIyAHqWREuXl05qgd4cm8Y0QOph7nHfpnCaYZWNwyZzwU9ZmGF9OVG/OEkSSXrV3aZ2zb Yo+KLqZjLHmPBCEKESqJnBVPXRMDK3SiraYy/nrp1/t4PDptWB8zONslD1pOX1I4wcphwMCSPPE+ pL1yvCz3HlkCSvZUEOb7x58+CW7UorhajtSuNts5WmNZ4Va70udM56RmFLNdWnYDRQbIRrPXgLol ngqYXU1HCqfShUpEcRFQ88FbOEZ2OeXGUqhCXajJFBc1jXiWovOSI8invEScPEc2M3EvkvpTPVWi XKY/IRNmI2KP0VY3UWdgo+xqSeVpBmJ7RJXyxCZRkTiJkMOHApU61IJJHUDRBg6YtUhYWtIlENex OnjEZYCiKacbRzCmJF5k4rgFyR2M4LyweYDb1gZGXuuSIkiJxcdUDmP6pTFDY4nsLDaa11mixh5c GKYlsgPisCBqLabRp6RWvqwYRnIlhHoE2RYuiaFWal4LN5zUXBOUkoXmc4hWmM+Mg2qyYuDxJiiu y0rzVIsaZii0S/0dS5FyrSCMpLAhrXF1nKwuxi4OljPz1zHcbaNjEHuJe8v7zdtfJxNnP0pDqmGG +7Kh+/xyZYT3np5YpdWN68qfpnKd0TYayWJxsVHk5OewnO0+s1vUzPDeHBdJ1nOkb7u+vnsKAqKe upIa+bREZBbqGOwD77D0UEb/TXcdBjOQgcx2jG4zJHVcsuCD4Uiee0DOXlp2D0Ke498DYGE9Djy+ dzHaOTUdg25QMU4V+k3FaemrRMeESOnOPE+IGJAaPLGM1R9VjIhNhN1j1CI6+BmxA15aHi4JRgbF IovAcM1rFO2QyYh0cCD27oBgZAMU1Y0KAZX3KxMi1DTwwrlTOGopUFCi4mBZ++QU4xbGCDcdGFJC 0xqJ0mIoD88+o2O+2Ryr/lV0Bqy5z1sSlTz+Jj23Bttcyu0OYGrdfxJR49PmpuyGJGYiW2+piWYU CxW9oYf5irhMRmLO7mjRxHAMgwSKzpfhau7LiflWjOsZAszBacaRNIgq50JGpEWvEtE4HhwAtbJ6 i7XT2m74ilQpCKvZ1tF2msunvqKNpF7QbRke9gtTEBpNFg1kBECmFCIV4IDSJ0SJJpqhiGqtXZ3G BoX4ZbUjRXOD5AbRkdWsmU9AwVB0laoHhg6ys+oujsZUNE2CnK49zX36lbkCRUZ2B7h/Bn0nJVUN 5hRVFDHK3ckZgZF64HJBcWDmdIB+yaYsooxO1qmdcisvar/mqo54QjNNluTAMTuFvJEpjbSUGqiB yn+ZY4GU9Ti4fvSLXuLF8U7XAGGgDNluG8pmnNwZ3CLu5DUgR1YUiwXgGNNEVFj5lNKFsAwgJwk4 EdoxReJMhOQSMnoEAnB8KrYj5AqbBSwMSVpUrwTheDIdki/jTD6TTwSHhXbosq9Q4aMauQnSaUSy qqX+LuSKcKEgi4VESg==
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
