skilleter-thingy 0.0.50__tar.gz → 0.0.52__tar.gz

{skilleter_thingy-0.0.50/skilleter_thingy.egg-info → skilleter_thingy-0.0.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.50
+Version: 0.0.52
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.50"
+version = "0.0.52"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52}/skilleter_thingy/git_mr.py

@@ -49,12 +49,13 @@ def main():
     else:
         parents, _ = git.parents()
 
+        if not parents:
+            colour.error('Unable to determine parent branch. Use the [BLUE]--parent[NORMAL] option to specify the appropriate one.')
+
         if len(parents) > 1:
             parent_list = ', '.join(parents)
             colour.error(
                 f'Branch has multiple potential parents: [BLUE]{parent_list}[NORMAL]. Use the [BLUE]--parent[NORMAL] option to specify the appropriate one.')
-        elif not parents:
-            colour.error('Unable to determine parent branch. Use the [BLUE]--parent[NORMAL] option to specify the appropriate one.')
 
     options = ['merge_request.create', f'merge_request.target={parents[0]}']
 

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52}/skilleter_thingy/thingy/files.py

@@ -73,6 +73,8 @@ def format_size(size, always_suffix=False):
         # to 1 (set to 0 when we don't have a divisor).
 
         div *= 1024
+    else:
+        units = ' PiB'
 
     # Calculate the size in 10ths so the we get the first digit after
     # the decimal point, doing all the work in the integer domain to
@@ -89,9 +91,13 @@ def format_size(size, always_suffix=False):
 
 ################################################################################
 
-def backup(filename, extension='bak', copyfile=True):
+def backup(filename, extension='bak', copyfile=True, timestamps=True):
     """ Create a backup of a file by copying or renaming it into a file with extension
-        .bak, deleting any existing file with that name """
+        .bak, deleting any existing file with that name.
+
+        Copies the file by default, unless copyfile is False
+        Sets the timetamps of the backup file to be the same as the original, unless
+        timestamps is False."""
 
     # Do nothing if the file does not exist
 
@@ -117,13 +123,20 @@ def backup(filename, extension='bak', copyfile=True):
     if os.path.isfile(backupname):
         os.unlink(backupname)
 
-    # Create the backup by copying or renaming the file
+    # Create the backup by copying or renaming the file, optionally preserving the
+    # timestamp of the original file
+
+    if timestamps:
+        file_info = os.stat(filename)
 
     if copyfile:
         shutil.copyfile(filename, backupname)
     else:
         os.rename(filename, backupname)
 
+    if timestamps:
+        os.utime(backupname, ns=(file_info.st_atime_ns, file_info.st_mtime_ns))
+
 ################################################################################
 # Test code
 

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52}/skilleter_thingy/thingy/git.py

@@ -515,6 +515,13 @@ def difftool(commit_1=None, commit_2=None, files=None, tool=None):
 
 ################################################################################
 
+# Match 'git diff --numstat' output - first re splits into lines added, removed
+# and name. Second one is used if a file has been renamed, to get the old and
+# new name components.
+
+_DIFF_OUTPUT_RE = re.compile(r'(-|\d+)\s+(-|\d+)\s+(.*)')
+_DIFF_OUTPUT_RENAME_RE = re.compile(r'(.*)\{(.*) => (.*)\}(.*)')
+
 def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
     """ Return details of changes either in single commit (defaulting to the most
         recent one) or between two commits, optionally restricted a path or paths
@@ -523,22 +530,35 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
     """
 
     def parse_diff_output(result):
-        """Extract current filename and lines added/deleted from output from git diff --numstat"""
+        """Extract previous and current filename (which may be the same) and lines added/deleted
+           from output from git diff --numstat"""
+
+        p = _DIFF_OUTPUT_RE.fullmatch(result)
+
+        # This shouldn't happen...
 
-        p = re.fullmatch(r'(-|\d+)\s+(-|\d+)\s+(.*)', result)
+        if not p:
+            return 'ERROR', 'ERROR', 0, 0
+
+        # Extract number of lines added/removed
 
         lines_ins = 0 if p.group(1) == '-' else int(p.group(1))
         lines_del = 0 if p.group(2) == '-' else int(p.group(2))
 
+        # Check for rename and get both old and new names
+
         if ' => ' in p.group(3):
-            filepath = p.group(3).split('{')[0]
-            filename = p.group(3).split(' => ')[1]
-            filename = filename.replace('}', '')
-            filename = os.path.join(filepath, filename)
+            q = _DIFF_OUTPUT_RENAME_RE.fullmatch(p.group(3))
+
+            if q:
+                old_filename = q.group(1) + q.group(2) + q.group(4)
+                new_filename = q.group(1) + q.group(3) + q.group(4)
+            else:
+                old_filename, new_filename = p.group(3).split(' => ')
         else:
-            filename = p.group(3)
+            old_filename = new_filename = p.group(3)
 
-        return filename, lines_ins, lines_del
+        return old_filename, new_filename, lines_ins, lines_del
 
     # Either get changes between the two commits, or changes in the specified commit
 
@@ -588,22 +608,23 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
         results = git(['diff', '--numstat'] + params)
 
         for result in results:
-            filename, lines_ins, lines_del = parse_diff_output(result)
+            old_filename, new_filename, lines_ins, lines_del = parse_diff_output(result)
 
-            info[filename]['deleted'] = lines_del
-            info[filename]['added'] = lines_ins
+            info[new_filename]['deleted'] = lines_del
+            info[new_filename]['added'] = lines_ins
 
         # Run git diff to get stats ignoring whitespace changes and add them
 
         results = git(['diff', '--numstat', '--ignore-all-space', '--ignore-blank-lines'] + params)
 
         for result in results:
-            filename, lines_ins, lines_del = parse_diff_output(result)
+            old_filename, new_filename, lines_ins, lines_del = parse_diff_output(result)
 
-            info[filename]['non-ws deleted'] = lines_del
-            info[filename]['non-ws added'] = lines_ins
+            info[new_filename]['non-ws deleted'] = lines_del
+            info[new_filename]['non-ws added'] = lines_ins
 
         # Fill in the blanks - files
+
         for filename in info:
             if 'deleted' not in info[filename]:
                 info[filename]['deleted'] = info[filename]['added'] = 0
@@ -1326,7 +1347,7 @@ def run_tests():
         if value is None:
             print('  Successfully failed to read the newly-deleted config data')
         else:
-            raise GitError
+            raise GitError('Unexpected lack of error reading configuration data', 1)
 
         config_set('user', 'email', 'user@localhost')
         config_set('user', 'name', 'User Name')

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52}/skilleter_thingy/thingy/git2.py

@@ -1259,7 +1259,7 @@ if __name__ == '__main__':
         if value is None:
             print('  Successfully failed to read the newly-deleted config data')
         else:
-            raise GitError
+            raise GitError('Unexpectd lack of error reading configuration data', 1)
 
         config_set('user', 'email', 'user@localhost')
         config_set('user', 'name', 'User Name')

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52}/skilleter_thingy/thingy/run.py

@@ -60,7 +60,7 @@ def capture_output(cmd, input_stream, output_streams, ansi_clean):
                         if stream in (sys.stdout, sys.stderr):
                             stream.write(tidy.convert_ansi(output))
                         elif ansi_clean:
-                            stream.write(colour.clean(output))
+                            stream.write(tidy.remove_ansi(output))
                         else:
                             stream.write(output)
 

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52}/skilleter_thingy/thingy/tfm_pane.py

@@ -63,7 +63,7 @@ class Pane():
 
         self.index = index
 
-        self.current_dir = None
+        self.current_dir = ''
 
         self.ino = inotify.adapters.Inotify() if sys.platform == 'linux' else None
 
@@ -290,13 +290,11 @@ class Pane():
                 else:
                     entry = name + ' ' * (self.width - len(name) - len(data)) + data
 
+                file_colour = self.dircolours.get_colour_pair(current_file['name'], current_file['mode'])
             else:
                 filename = entry = None
                 current = False
-
-            # Render the current line
-
-            file_colour = self.dircolours.get_colour_pair(current_file['name'], current_file['mode']) if filename else normal_colour
+                file_colour = normal_colour
 
             # Reverse the colours if this the cursor line
 

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.52/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.50
+Version: 0.0.52
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk