Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Side by Side Diff: git_cl/git_cl.py

Issue 6684022: Revert 77913 - Regression: Editor Linux Fix for gcl.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gcl.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # git-cl -- a git-command for integrating reviews on Rietveld 2 # git-cl -- a git-command for integrating reviews on Rietveld
3 # Copyright (C) 2008 Evan Martin <martine@danga.com> 3 # Copyright (C) 2008 Evan Martin <martine@danga.com>
4 4
5 import errno 5 import errno
6 import logging 6 import logging
7 import optparse 7 import optparse
8 import os 8 import os
9 import re 9 import re
10 import StringIO 10 import StringIO
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 703
704 def UserEditedLog(starting_text): 704 def UserEditedLog(starting_text):
705 """Given some starting text, let the user edit it and return the result.""" 705 """Given some starting text, let the user edit it and return the result."""
706 editor = os.getenv('EDITOR', 'vi') 706 editor = os.getenv('EDITOR', 'vi')
707 707
708 (file_handle, filename) = tempfile.mkstemp() 708 (file_handle, filename) = tempfile.mkstemp()
709 fileobj = os.fdopen(file_handle, 'w') 709 fileobj = os.fdopen(file_handle, 'w')
710 fileobj.write(starting_text) 710 fileobj.write(starting_text)
711 fileobj.close() 711 fileobj.close()
712 712
713 result = None
713 try: 714 try:
714 subprocess.check_call(['env', editor, filename]) 715 subprocess.check_call(['env', editor, filename], shell=True)
715 fileobj = open(filename) 716 fileobj = open(filename)
716 result = fileobj.read() 717 result = fileobj.read()
717 fileobj.close() 718 fileobj.close()
718 finally: 719 finally:
719 os.remove(filename) 720 os.remove(filename)
720 721
721 if not result: 722 if not result:
722 return 723 return
723 724
724 stripcomment_re = re.compile(r'^#.*$', re.MULTILINE) 725 stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith ' 1408 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
1408 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))) 1409 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
1409 1410
1410 # Not a known command. Default to help. 1411 # Not a known command. Default to help.
1411 GenUsage(parser, 'help') 1412 GenUsage(parser, 'help')
1412 return CMDhelp(parser, argv) 1413 return CMDhelp(parser, argv)
1413 1414
1414 1415
1415 if __name__ == '__main__': 1416 if __name__ == '__main__':
1416 sys.exit(main(sys.argv[1:])) 1417 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « gcl.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698