Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 00a6a12

Browse filesBrowse files
authored
Merge pull request #13 from wilson8507/update/fix_diff
Update/fix diff
2 parents f2a1078 + 3765d1d commit 00a6a12
Copy full SHA for 00a6a12

File tree

Expand file treeCollapse file tree

1 file changed

+15
-5
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+15
-5
lines changed

‎scripts/fix_diffs.py

Copy file name to clipboardExpand all lines: scripts/fix_diffs.py
+15-5Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ def get_msgs(lines):
5353
lineno += 1
5454
return msgids, msgstrs
5555

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

9595
if __name__ == '__main__':
9696
import sys
97+
9798
if len(sys.argv) < 2:
98-
print('Usage: python fix_diffs.py <po_file_path>')
99+
print('Usage:')
100+
print('\tpython fix_diffs.py <po_file_path> [<original_po_file_commit>]')
101+
print('Option:')
102+
print('\t<original_po_file_commit>: The original .po file(s) commit record (default to HEAD).')
103+
sys.exit(1)
99104

100-
fp = sys.argv[1]
101-
output_lines = main(fp)
105+
fp = './' + sys.argv[1]
106+
output_lines = None
107+
if len(sys.argv) == 3:
108+
original_commit = sys.argv[2]
109+
output_lines = main(fp, original_commit)
110+
else:
111+
output_lines = main(fp)
102112

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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.