MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

RUBY-15889: restoring workarounds for merge/diff/line commands to make "launcher ." work on Mac again

Browse Source
This commit is contained in:
Oleg Sukhodolsky
2014-10-28 12:57:55 +03:00
parent 81f8131451
commit 004eae148d
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/launcher.py
+20 -9
View File
@@ -22,16 +22,27 @@ for i, arg in enumerate(sys.argv[1:]):
' {0} diff <left> <right>' +
' {0} merge <local> <remote> [base] <merged>').format(sys.argv[0]))
exit(0)
elif ':' in arg:
file_path, line_number = arg.rsplit(':', 1)
if line_number.isdigit():
args.append('-l')
args.append(line_number)
args.append(file_path)
else:
args.append(arg)
else:
elif arg == 'diff' and i == 0:
args.append(arg)
elif arg == 'merge' and i == 0:
args.append(arg)
elif arg == '-l' or arg == '--line':
args.append(arg)
skip_next = True
elif skip_next:
args.append(arg)
skip_next = False
else:
if ':' in arg:
file_path, line_number = arg.rsplit(':', 1)
if line_number.isdigit():
args.append('-l')
args.append(line_number)
args.append(os.path.abspath(file_path))
else:
args.append(os.path.abspath(arg))
else:
args.append(os.path.abspath(arg))
def launch_with_port(port):