skilleter-thingy 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of skilleter-thingy might be problematic. Click here for more details.

Files changed (7) hide show
  1. skilleter_thingy/git_update.py +3 -0
  2. {skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/METADATA +1 -1
  3. {skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/RECORD +7 -7
  4. {skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/LICENSE +0 -0
  5. {skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/WHEEL +0 -0
  6. {skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/entry_points.txt +0 -0
  7. {skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/top_level.txt +0 -0
skilleter_thingy/git_update.py CHANGED
@@ -17,6 +17,7 @@
17
17
  fixed branches first then rebase everything in no particular order.
18
18
 
19
19
  TODO: Avoid lots of pulls - should be able to fetch then updated each local branch.
20
+ TODO: Add option to specify name of master branch or additional names to add to the list
20
21
  """
21
22
  ################################################################################
22
23
 
@@ -108,6 +109,8 @@ def branch_rebase(args, results, branch):
108
109
  parent = 'main'
109
110
  elif 'develop' in parents:
110
111
  parent = 'develop'
112
+ elif 'scv-poc' in parents:
113
+ parent = 'scv-poc'
111
114
  else:
112
115
  colour.write(f'[RED:WARNING]: Unable to rebase [BLUE:{branch}] branch as unable to determine its parent (could be any of {", ".join(parents)})',
113
116
  indent=4)
{skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: skilleter_thingy
3
- Version: 0.1.1
3
+ Version: 0.1.2
4
4
  Summary: A collection of useful utilities, mainly aimed at making Git more friendly
5
5
  Author-email: John Skilleter <john@skilleter.org.uk>
6
6
  Project-URL: Home, https://skilleter.org.uk
{skilleter_thingy-0.1.1.dist-info → skilleter_thingy-0.1.2.dist-info}/RECORD RENAMED
@@ -16,7 +16,7 @@ skilleter_thingy/git_hold.py,sha256=Zk6YUhr08znUOdpVJkJAt0rOtrCXnKE0NHoZzoaEEGo,
16
16
  skilleter_thingy/git_mr.py,sha256=g33FaRtJTbIQI0tfXv_a042YpGwtbg5fKw072aqjAdw,3086
17
17
  skilleter_thingy/git_parent.py,sha256=DLy38mo06R0YDyJWQjrP8pQS-qc7tvLYcn8unKqzEiQ,2774
18
18
  skilleter_thingy/git_review.py,sha256=e0yvDD9fIVhscnEP7hY26Od8VUbPEb7iMVMbY63Xjbc,52462
19
- skilleter_thingy/git_update.py,sha256=jJt66M_rVD-CJzozMgvFPp5DFjmt4yu2cU9fzlI5wFc,14184
19
+ skilleter_thingy/git_update.py,sha256=nw-bnDFrMi7yNf7P6gGF8gzmJUjXU5PhWhOYPgApcX4,14350
20
20
  skilleter_thingy/git_wt.py,sha256=Xm4VBBXMI4GxNtH3QvF-QL9rtvo4RrlWSbNQDFpGZu8,2954
21
21
  skilleter_thingy/gitcmp_helper.py,sha256=wutDHpBPOX8ZsXbsC5ApHxMY5tOKgD3P0eyFVs_mSAI,11214
22
22
  skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
@@ -60,9 +60,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
60
60
  skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
61
61
  skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
62
62
  skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
63
- skilleter_thingy-0.1.1.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
64
- skilleter_thingy-0.1.1.dist-info/METADATA,sha256=cISmCXOJL7ZhvMm0atPeBzrXCgf1t4V4riAEGetxDjs,29433
65
- skilleter_thingy-0.1.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
66
- skilleter_thingy-0.1.1.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
67
- skilleter_thingy-0.1.1.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
68
- skilleter_thingy-0.1.1.dist-info/RECORD,,
63
+ skilleter_thingy-0.1.2.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
64
+ skilleter_thingy-0.1.2.dist-info/METADATA,sha256=zUFUpTX9EpfB6kcP84OawVF5kaVibq9FfKJftpDBJSE,29433
65
+ skilleter_thingy-0.1.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
66
+ skilleter_thingy-0.1.2.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
67
+ skilleter_thingy-0.1.2.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
68
+ skilleter_thingy-0.1.2.dist-info/RECORD,,