skilleter-thingy 0.0.26__tar.gz → 0.0.28__tar.gz

{skilleter_thingy-0.0.26/skilleter_thingy.egg-info → skilleter_thingy-0.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.26
+Version: 0.0.28
 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.26 → skilleter_thingy-0.0.28}/pyproject.toml

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

{skilleter_thingy-0.0.26 → skilleter_thingy-0.0.28}/skilleter_thingy/git.py

@@ -531,8 +531,10 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
         lines_del = 0 if p.group(2) == '-' else int(p.group(2))
 
         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)
         else:
             filename = p.group(3)
 
@@ -581,6 +583,7 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
 
     if diff_stats:
         # Run git diff to get stats, and add them to the info
+        # TODO: Need to extract old name of renamed files
 
         results = git(['diff', '--numstat'] + params)
 

{skilleter_thingy-0.0.26 → skilleter_thingy-0.0.28}/skilleter_thingy/git_review.py

@@ -27,9 +27,9 @@
             * Show:  all / wildcard match / wildcard non-match
             * Show:  all / reviewed / unreviewed files
         * Tag files for group operations (reset, delete, add, commit)
+        * Handle renamed files properly - need to show old and new names, but need to return this info from git.commit_info()
 
     BUGS:
-        * Fails to handle renamed files -thinks it a file called 'oldname => newname'
         * If console window is too small, popups aren't displayed - should handle this better - scrollable popup?
         * Switching between hiding reviewed files and not does not maintain cursor position
         * In hide mode, ins should not move down
@@ -1273,6 +1273,7 @@ def parse_command_line():
     parser.add_argument('-b', '--branch', type=str, help='Compare the specified commit to branch point on specified branch')
     parser.add_argument('-C', '--change', action='store_true', help='Compare the current commit with its parent')
     parser.add_argument('-d', '--debug', action='store_true', help='Start a debug session over Telnet using pudb')
+    parser.add_argument('--dir', action='store', help='Work in the specified directory')
     parser.add_argument('--difftool', type=str, default=None, help='Override the default git diff tool')
 
     parser.add_argument('commits', nargs='*', help='Commit(s) or paths to compare')
@@ -1284,6 +1285,11 @@ def parse_command_line():
     if args.debug:
         from pudb.remote import set_trace
         set_trace()
+        
+    # Move to a new directory, if required
+    
+    if args.dir:
+        os.chdir(args.dir)
 
     # Make sure that we're actually in a git working tree
 

{skilleter_thingy-0.0.26 → skilleter_thingy-0.0.28}/skilleter_thingy/readable.py

@@ -29,8 +29,8 @@ from skilleter_thingy import files
 TF_OBJECTS_CHANGED_END = 'Terraform detected the following changes made outside of Terraform since the last "terraform apply":'
 TF_IGNORE_MSG = 'Unless you have made equivalent changes to your configuration, or ignored the relevant attributes using ignore_changes, the following plan may include actions to undo or respond to these changes.'
 
-TF_REFRESHING_AND_READING = re.compile(r'.*: (?:Refreshing state\.\.\.|Reading\.\.\.|Read complete after ).*')
-TF_FINDING_AND_INSTALLING = re.compile(r'- (?:Finding .*[.]{3}|Installing .*[.]{3}|Installed .*)') 
+TF_REFRESHING_AND_READING = re.compile(r'.*: (?:Refreshing state\.\.\.|Reading\.\.\.|Read complete after |Preparing import\.\.\.).*')
+TF_FINDING_AND_INSTALLING = re.compile(r'- (?:Finding .*[.]{3}|Installing .*[.]{3}|Installed .*)')
 
 TF_HAS_CHANGED = re.compile(r'  # .* has changed')
 TF_READ_DURING_APPLY = re.compile(r' +# [-a-z_.0-9\[\]]+ will be read during apply')

{skilleter_thingy-0.0.26 → skilleter_thingy-0.0.28/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.26
+Version: 0.0.28
 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