The attached patch fixes a couple of uses of None instead of NULL_REVISION in bzr-gtk.
Cheers, Jelmer
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: lp:bzr-gtk # testament_sha1: fce33b464838144492fe24b17c7e49eaff706703 # timestamp: 2009-04-10 03:35:27 +0200 # base_revision_id: [email protected] # # Begin patch === modified file 'viz/branchwin.py' --- viz/branchwin.py 2008-11-28 16:42:25 +0000 +++ viz/branchwin.py 2009-04-10 01:35:07 +0000 @@ -439,7 +439,7 @@ parents = self.treeview.get_parents() if len(parents) == 0: - parent_id = None + parent_id = NULL_REVISION else: parent_id = parents[0] @@ -616,14 +616,11 @@ value = '%sx%s' % (width, height) self.config.set_user_option(name, value) - def show_diff(self, revid=None, parentid=None): + def show_diff(self, revid=None, parentid=NULL_REVISION): """Open a new window to show a diff between the given revisions.""" from bzrlib.plugins.gtk.diff import DiffWindow window = DiffWindow(parent=self) - if parentid is None: - parentid = NULL_REVISION - rev_tree = self.branch.repository.revision_tree(revid) parent_tree = self.branch.repository.revision_tree(parentid) @@ -638,13 +635,13 @@ if not revision: # default to selected row revision = self.treeview.get_revision() - if (not revision) or (revision == NULL_REVISION): + if revision == NULL_REVISION: return if not parents: # default to selected row's parents parents = self.treeview.get_parents() if len(parents) == 0: - parent_id = None + parent_id = NULL_REVISION else: parent_id = parents[0] # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY7f244AAatfgERQUWf//1I1 mwC////wUAOY3tNLu7rg6m4SSgmKeJNNphE3pEwIDRo0BoyaBJIpp4qemJmqGmj1APUGQAANABIi QKZoFPaJqaep+qHqPUABkeoeU0A5gE0wCZDAAEwTAAABJEBT1NMU2U0ymNI0GmmgA0MIwoF+bsPN uHy9y21h4LFA1e7tOE0RtYusiy7dVFXZoBUDtswM+ZjaOXcLpSvM4yePTBMPGYzut6X8zLwPo45u eWr+2RDrfDe/tLY2UZ4cPTHXdq2Uo3OhKNOeUHpeV5rZvzlZ/REVV5l7MKTWeqRnVhc7JDpRbuQE aG5bEROhd6kb0womBkKInicDYlSItsRFC20lElRjfeKjTbFQxpWoN5x6sqsMuq0XxMqrczWU+RQx vcp0HPmajTeo3HKLIsL0xXvV0jixQrGIXktZsIUJxwNbkDA2MUzOGQVGDOpMiOWZ0KqICtGTpOIN crXZWICYyD4zFePHkFidaqfhVLCkdpOsNORdeGIrGo3SkQYKjQGLFDQNk0cYPW4mMVHcZiBixwqR gWsEkqmGRpgeiy1SxSxyatlRSRVTQUYGwNAeSQMKb9YiTLJ6+njppaapkxfT94nCHUdiwsLtYxGv 8nojGeyvFJpZRsVbTj3zZBY4m1Ii9pnc/wj8o6Is6I5o6I0LW2+aO9DI5kbb0Sqjx2nBmncHz++y R0pEyIOuo8BXi0cPlwSwKjfBy6npGUssxhTJB+J/XoOQ7ShI/VA5zob69R0gO4ZGYxuHKm64z2Ms n3sUumE068sQ/dIkrpdIzfNpsN2PbMM6U3bh/e48zNJkPkw0Ek8AOM9hoOezRlp5YEiANCZHQEsV F6BIk24gtIFIIuJ5+kpphFkL5YPFJcLRiTWMfWfQ5l8YxZaEiUXG8VhfjawT8CmFB7yE+lKBzHBy 1VKAo2KUJv2p6G8gmQWs87DPwq8GNg8mrP7pVjsITq7Os0Xi8Ct6HKpCxUgs+24wws1lJlwmlsJC QlO6/JelRoa1CdQoY+NcSD2M1kSMocUiVdb6lnwUchiuutQkQXYV1j+F62L9vc0lcHqC/GpBB1cI yNTYkW2Qo1TmCSjKQogb8h/kjv461cZPEgi1XKpGf79vCTevcYTH0XFIiemNd5E0BAO1iLLBz2i+ PqhT+Ki1iNOFWC26FKb05zc6kKy5isUW/xdyRThQkI7f244=
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
