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

Unified Diff: trunk/src/tools/metrics/common/diff_util.py

Issue 188793003: Revert 255357 "Change the user action file format from .txt to ...." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/tools/metrics/actions/print_style.py ('k') | trunk/src/tools/metrics/common/pretty_print_xml.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/tools/metrics/common/diff_util.py
===================================================================
--- trunk/src/tools/metrics/common/diff_util.py (revision 255402)
+++ trunk/src/tools/metrics/common/diff_util.py (working copy)
@@ -1,47 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Utility functions for prompting user if changes automatically applied to some
-user-managed files are correct.
-"""
-
-import logging
-import os
-import webbrowser
-
-from difflib import HtmlDiff
-from tempfile import NamedTemporaryFile
-
-
-def PromptUserToAcceptDiff(old_text, new_text, prompt):
- """Displays a difference in two strings (old and new file contents) to the
- user and asks whether the new version is acceptable.
-
- Args:
- old_text: A string containing old file contents.
- new_text: A string containing new file contents.
- prompt: Text that should be displayed to the user, asking whether the new
- file contents should be accepted.
-
- Returns:
- True is user accepted the changes or there were no changes, False otherwise.
- """
- logging.info('Computing diff...')
- if old_text == new_text:
- logging.info('No changes detected')
- return True
- html_diff = HtmlDiff(wrapcolumn=80).make_file(
- old_text.splitlines(), new_text.splitlines(), fromdesc='Original',
- todesc='Updated', context=True, numlines=5)
- temp = NamedTemporaryFile(suffix='.html', delete=False)
- try:
- temp.write(html_diff)
- temp.close() # Close the file so the browser process can access it.
- webbrowser.open('file://' + temp.name)
- print prompt
- response = raw_input('(Y/n): ').strip().lower()
- finally:
- temp.close() # May be called on already closed file.
- os.remove(temp.name)
- return response == 'y' or response == ''
« no previous file with comments | « trunk/src/tools/metrics/actions/print_style.py ('k') | trunk/src/tools/metrics/common/pretty_print_xml.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698