skilleter-thingy 0.0.26__py3-none-any.whl → 0.0.28__py3-none-any.whl

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/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/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.dist-info → skilleter_thingy-0.0.28.dist-info}/METADATA

@@ -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.dist-info → skilleter_thingy-0.0.28.dist-info}/RECORD

@@ -14,7 +14,7 @@ skilleter_thingy/ffind.py,sha256=jiTPjsIvFaQHdiC9xosQGUs-8PDZ9wks0aX9yDv8Sy8,193
 skilleter_thingy/files.py,sha256=jGFITALK6OPqxJWw3q1vY7mvcxD_JtwMYUMNYnAWqhw,4261
 skilleter_thingy/ggit.py,sha256=LpXtis78r46MpSizbFh_9YWsrL6tn94tRQYoXJi0M-4,2493
 skilleter_thingy/ggrep.py,sha256=dGJv8gHC7bGgFBSrXsPYbwy_1Y40Rz7-Sw7R99G01NE,5876
-skilleter_thingy/git.py,sha256=MxD9y0pPcmZ7nAEE32OFxG16xqYbHacvASm5SksAj9Y,37887
+skilleter_thingy/git.py,sha256=cVUeQvoYD-2-zLUI-cNtODCmzdJAtVVs8cLNPPIlvvU,38049
 skilleter_thingy/git2.py,sha256=Ni1eigoOYAeps2YbTaQWYCpL6WjZMKSv4CqiiFi0nJg,35764
 skilleter_thingy/git_br.py,sha256=cLtQJPqpPmBxlheKSHTl-DlzRGb1m8QZUfupWvaof68,5812
 skilleter_thingy/git_ca.py,sha256=Lh4BgZR_m6wRlbWdw84qMrW-y6vqMWkbDAR08uoQVGE,4981
@@ -24,7 +24,7 @@ skilleter_thingy/git_common.py,sha256=sjCRCNfyDhLPtxajjiq1l0SCEqB7d1L2uAgnuxLqc1
 skilleter_thingy/git_hold.py,sha256=i-mbY6wBZ-lRx6rS2kGyWlTCWqK6suhKape7Dnc4OAo,4630
 skilleter_thingy/git_mr.py,sha256=ik3uVecNos_73aYANgnaHutPdnW3PlGmWiAw9EJ9IGk,3100
 skilleter_thingy/git_parent.py,sha256=1VHbh_iH4tnw6vpafqHWEeZwHZVL_sZOIVZMojKTwlk,2696
-skilleter_thingy/git_review.py,sha256=4pNf8DSVu3V2l9CDo97OIsEHaBIGxfINREbAYU9thg4,51566
+skilleter_thingy/git_review.py,sha256=hYbKls2ut_Cw40g4fKsQkSyIPs9kl-92W4Wi1kf6a_w,51796
 skilleter_thingy/git_update.py,sha256=comv8CR1j9W8yuCIeoksAKxH8fPTiROkIXVrHdpXWl4,13985
 skilleter_thingy/git_wt.py,sha256=VAcOgEAqVUUdmmkZ-zxaHi0Xp6LAt9NvZAZzUoJM3AU,3143
 skilleter_thingy/gitcmp_helper.py,sha256=rFCZiivZfYmd1_-0_3YwmYSfGDLWu6e6rK0I9hFXCUY,11279
@@ -41,7 +41,7 @@ skilleter_thingy/phototidier.py,sha256=1uj1XbUemJOalNC3PwTG2-_yUQp4WMAcmwRr7QXPn
 skilleter_thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dOeu8,2529
 skilleter_thingy/process.py,sha256=RmXj2RrzwqP_mugeVejtjgF_T3PD7M10XsWuAnc99t0,3565
 skilleter_thingy/py_audit.py,sha256=ZyKN8O0fM4xnwVspk1qH_Dnv5ujM7lJfKxC87xWilr0,4395
-skilleter_thingy/readable.py,sha256=4tUyAWUZpryPYOqaBa3CaiTfuwg4A8zsOl9qoPAQqvE,9465
+skilleter_thingy/readable.py,sha256=fk0p9E50I6TeC8fZBtBNfoefsOmYQAl5Sn2tIPwtpq8,9487
 skilleter_thingy/remdir.py,sha256=zp5Nr0IMGXQ-b5iT48O5arqWoSjW65Xnr-SpKuav1Ac,4620
 skilleter_thingy/rmdupe.py,sha256=tcX3w8XvliGwBMdSt9BUu07kuDtQEc0IiU8sCxmgzHA,17117
 skilleter_thingy/rpylint.py,sha256=na39x0yNXDwDkG9yP48BoM5FeTut-OS4AVsYixE0YZU,2639
@@ -57,9 +57,9 @@ skilleter_thingy/trimpath.py,sha256=SAfOB75_dTldQHjam4kQy1J42209NYPYi8vVAaNn1e8,
 skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63sqJK8,3128
 skilleter_thingy/xchmod.py,sha256=F9_lxKuLqVlHHr3oBI3dkMoFOuwRzYDlpQMTmDcjpBI,4590
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
-skilleter_thingy-0.0.26.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.26.dist-info/METADATA,sha256=tn3FjCTFSjHBom9bV7v__U8UFJ9QdVDCwtO9B7vhvy8,5210
-skilleter_thingy-0.0.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-skilleter_thingy-0.0.26.dist-info/entry_points.txt,sha256=jf7hVfH0dojLxk0D4TjIazKoqdToditCGdCfyhIotME,1971
-skilleter_thingy-0.0.26.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.26.dist-info/RECORD,,
+skilleter_thingy-0.0.28.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.28.dist-info/METADATA,sha256=POd3McT57J8obbLafSetdtI00liUyEOTjOSdAUwKRe0,5210
+skilleter_thingy-0.0.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+skilleter_thingy-0.0.28.dist-info/entry_points.txt,sha256=jf7hVfH0dojLxk0D4TjIazKoqdToditCGdCfyhIotME,1971
+skilleter_thingy-0.0.28.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.28.dist-info/RECORD,,