diff -Nru nemo-rabbitvcs-3.4.0/debian/changelog nemo-rabbitvcs-3.6.0/debian/changelog --- nemo-rabbitvcs-3.4.0/debian/changelog 2017-05-11 11:01:24.000000000 +0000 +++ nemo-rabbitvcs-3.6.0/debian/changelog 2017-11-21 10:53:14.000000000 +0000 @@ -1,8 +1,14 @@ -nemo-rabbitvcs (3.4.0-1~webupd8~0) xenial; urgency=medium +nemo-rabbitvcs (3.6.0-1~webupd8~zesty) zesty; urgency=medium - * New upstream release + * 3.6.0 - -- Alin Andrei Thu, 11 May 2017 13:05:21 +0100 + -- Alin Andrei Tue, 21 Nov 2017 12:53:14 +0200 + +nemo-rabbitvcs (3.6.0) sylvia; urgency=medium + + * 3.6.0 + + -- Clement Lefebvre Tue, 24 Oct 2017 11:58:54 +0100 nemo-rabbitvcs (3.4.0) sonya; urgency=medium diff -Nru nemo-rabbitvcs-3.4.0/RabbitVCS.py nemo-rabbitvcs-3.6.0/RabbitVCS.py --- nemo-rabbitvcs-3.4.0/RabbitVCS.py 2017-05-04 10:51:55.000000000 +0000 +++ nemo-rabbitvcs-3.6.0/RabbitVCS.py 2017-10-24 11:00:07.000000000 +0000 @@ -66,6 +66,8 @@ from os.path import isdir, isfile, realpath, basename import datetime +import gi +gi.require_version('Nemo', '3.0') from gi.repository import Nemo, GObject, Gtk, GdkPixbuf import pysvn @@ -99,7 +101,7 @@ from rabbitvcs.services.checkerservice import StatusCheckerStub as StatusChecker class RabbitVCS(Nemo.InfoProvider, Nemo.MenuProvider, - Nemo.ColumnProvider, Nemo.PropertyPageProvider, Nemo.NameAndDescProvider, GObject.GObject): + Nemo.ColumnProvider, Nemo.PropertyPageProvider, Nemo.NameAndDescProvider, GObject.GObject): """ This is the main class that implements all of our awesome features. @@ -182,7 +184,7 @@ "scalable/apps/rabbitvcs-small.svg", "16x16/actions/rabbitvcs-push.png" ] - + rabbitvcs_icon_path = get_icon_path() for rel_icon_path in rabbitvcs_icons: icon_path = "%s/%s" % (rabbitvcs_icon_path, rel_icon_path) @@ -194,16 +196,16 @@ factory.add(root, iconset) factory.add_default() - + # Create a global client we can use to do VCS related stuff self.vcs_client = VCS() self.status_checker = StatusChecker() - + self.status_checker.assert_version(EXT_VERSION) - + self.items_cache = {} - + def get_columns(self): """ Return all the columns we support. @@ -258,9 +260,9 @@ """ enable_emblems = bool(int(settings.get("general", "enable_emblems"))) enable_attrs = bool(int(settings.get("general", "enable_attributes"))) - + if not (enable_emblems or enable_attrs): return Nemo.OperationResult.COMPLETE - + if not self.valid_uri(item.get_uri()): return Nemo.OperationResult.FAILED path = rabbitvcs.util.helper.unquote_url(self.get_local_path(item.get_uri())) @@ -313,7 +315,7 @@ # FIXME: when did this get disabled? if enable_attrs: self.update_columns(item, path, status) if enable_emblems: self.update_status(item, path, status) - + return Nemo.OperationResult.COMPLETE def update_columns(self, item, path, status): @@ -385,24 +387,24 @@ self.nemoVFSFile_table[path] = item if len(paths) == 0: return [] - + # log.debug("get_file_items_full() called") paths_str = "-".join(paths) - + conditions_dict = None if paths_str in self.items_cache: conditions_dict = self.items_cache[paths_str] if conditions_dict and conditions_dict != "in-progress" \ - and hasattr(window, 'base_dir'): + and hasattr(window, 'base_dir'): conditions = NemoMenuConditions(conditions_dict) menu = NemoMainContextMenu(self, window.base_dir, paths, conditions).get_menu() return menu - + if conditions_dict != "in-progress" and hasattr(window, 'base_dir'): - self.status_checker.generate_menu_conditions_async(provider, window.base_dir, paths, self.update_file_items) + self.status_checker.generate_menu_conditions_async(provider, window.base_dir, paths, self.update_file_items) self.items_cache[path] = "in-progress" - + return () def get_file_items(self, window, items): @@ -414,9 +416,9 @@ self.nemoVFSFile_table[path] = item if len(paths) == 0: return [] - + # log.debug("get_file_items() called") - + return NemoMainContextMenu(self, window.base_dir, paths).get_menu() def update_file_items(self, provider, base_dir, paths, conditions_dict): @@ -426,24 +428,24 @@ #~ @disable # This is useful for profiling. Rename it to "get_background_items" and then - # rename the real function "get_background_items_real". + # rename the real function "get_background_items_real". def get_background_items_profile(self, window, item): import cProfile import rabbitvcs.util.helper - + path = unicode(gnomevfs.get_local_path_from_uri(item.get_uri()), "utf-8").replace("/", ":") - + profile_data_file = os.path.join( - rabbitvcs.util.helper.get_home_folder(), - "checkerservice_%s.stats" % path) - + rabbitvcs.util.helper.get_home_folder(), + "checkerservice_%s.stats" % path) + prof = cProfile.Profile() retval = prof.runcall(self.get_background_items_real, window, item) prof.dump_stats(profile_data_file) log.debug("Dumped: %s" % profile_data_file) return retval - + def get_background_items_full(self, provider, window, item): """ Menu activated on entering a directory. Builds context menu for File @@ -471,7 +473,7 @@ conditions_dict = self.items_cache[path] if conditions_dict and conditions_dict != "in-progress": conditions = NemoMenuConditions(conditions_dict) - menu = NemoMainContextMenu(self, path, [path], conditions).get_menu() + menu = NemoMainContextMenu(self, path, [path], conditions).get_menu() return menu window.base_dir = path @@ -479,7 +481,7 @@ if conditions_dict != "in-progress": self.status_checker.generate_menu_conditions_async(provider, path, [path], self.update_background_items) self.items_cache[path] = "in-progress" - + return () def get_background_items(self, window, item): @@ -488,9 +490,9 @@ self.nemoVFSFile_table[path] = item # log.debug("get_background_items() called") - + window.base_dir = path - + return NemoMainContextMenu(self, path, [path]).get_menu() def update_background_items(self, provider, base_dir, paths, conditions_dict): @@ -621,7 +623,7 @@ for item in items: if self.valid_uri(item.get_uri()): path = rabbitvcs.util.helper.unquote_url(self.get_local_path(item.get_uri())) - + if self.vcs_client.is_in_a_or_a_working_copy(path): paths.append(path) self.nemoVFSFile_table[path] = item @@ -632,8 +634,8 @@ page = rabbitvcs.ui.property_page.PropertyPage(paths, claim_domain=False).get_widget() ppage = Nemo.PropertyPage(name='RabbitVCS::PropertyPage', - label=label, - page=page) + label=label, + page=page) return [ppage] @@ -658,14 +660,14 @@ # explicitly import from Nautilus. Instead we make the menu item here # manually, and pass it back out. I don't really know why it wasn't # done this way in the first place. - + identifier = item.make_magic_id(id_magic) menuitem = Nemo.MenuItem(name=identifier, label=item.make_label(), tip=item.tooltip, icon=item.icon) - - # Was that so hard? + + # Was that so hard? return menuitem def attach_submenu(self, menu_node, submenu_list):