Skip to content
This repository was archived by the owner on Sep 2, 2018. It is now read-only.

Update/fix diff #13

Merged
merged 4 commits into from
Jun 11, 2018
Merged

Update/fix diff #13

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52bb30c
Update git show to take an arbitrary hash
josix Jun 7, 2018
703baf7
Add current working directory to file path
josix Jun 7, 2018
d9d9612
Update to using f-string in Popen command
josix Jun 10, 2018
3765d1d
Update usage message
josix Jun 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions scripts/fix_diffs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def get_msgs(lines):
lineno += 1
return msgids, msgstrs

def main(fp):
p = subprocess.Popen(['git', 'show', 'HEAD:' + fp], stdout=subprocess.PIPE)
def main(fp, original_po_commit='HEAD'):
p = subprocess.Popen(['git', 'show', f'{original_po_commit}:{fp}'], stdout=subprocess.PIPE)
out, err = p.communicate()
head_po = out.decode().splitlines()
msgids, msgstrs = get_msgs(head_po)
Expand Down Expand Up @@ -94,11 +94,21 @@ def main(fp):

if __name__ == '__main__':
import sys

if len(sys.argv) < 2:
print('Usage: python fix_diffs.py <po_file_path>')
print('Usage:')
print('\tpython fix_diffs.py <po_file_path> [<original_po_file_commit>]')
print('Option:')
print('\t<original_po_file_commit>: The original .po file(s) commit record (default to HEAD).')
sys.exit(1)

fp = sys.argv[1]
output_lines = main(fp)
fp = './' + sys.argv[1]
output_lines = None
if len(sys.argv) == 3:
original_commit = sys.argv[2]
output_lines = main(fp, original_commit)
else:
output_lines = main(fp)

with open(fp, 'w') as f:
f.writelines([s + '\n' for s in output_lines])