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

Unified Diff: git_cl/git_cl.py

Issue 6690012: Better revert (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl/git_cl.py
===================================================================
--- git_cl/git_cl.py (revision 78027)
+++ git_cl/git_cl.py (working copy)
@@ -711,20 +711,18 @@
fileobj.close()
# Open up the default editor in the system to get the CL description.
- result = None
- try:
- subprocess.check_call(['env', editor, filename], shell=True)
- fileobj = open(filename)
- result = fileobj.read()
- fileobj.close()
- finally:
+ ret = subprocess.call(editor + ' ' + filename, shell=True)
+ if ret != 0:
os.remove(filename)
-
- if not result:
return
+ fileobj = open(filename)
+ text = fileobj.read()
+ fileobj.close()
+ os.remove(filename)
+
stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
- return stripcomment_re.sub('', result).strip()
+ return stripcomment_re.sub('', text).strip()
def ConvertToInteger(inputval):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698