diff --git a/git-pull-request/git-pull-request.py b/git-pull-request/git-pull-request.py
index 892a2e5568..5fe0630940 100755
--- a/git-pull-request/git-pull-request.py
+++ b/git-pull-request/git-pull-request.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
 
 """
 Git command to automate many common tasks involving pull requests.
@@ -107,86 +108,69 @@
 """
 
 import base64
+import codecs
 import getopt
+import getpass
 import json
 import os
 import re
 import sys
+import sys
+import tempfile
 import urllib
 import urllib2
 import urlparse
-import getpass
-import tempfile
 import webbrowser
-# import isodate
-# from datetime import date
 
-import codecs
-import sys
+from string import Template
+from textwrap import fill
 
-UTF8Writer = codecs.getwriter('utf8')
+UTF8Writer = codecs.getwriter("utf8")
 sys.stdout = UTF8Writer(sys.stdout)
 
-# Connecting through a proxy,
-# requires: socks.py from http://socksipy.sourceforge.net/ next to this file
-
-#import socket
-#import socks
-
-#socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, "localhost", 8181)
-#socket.socket = socks.socksocket
-
-from textwrap import fill
-from string import Template
-
 options = {
-	'debug-mode': False,
+	"debug-mode": False,
 	# Color Scheme
-	'color-success': 'green',
-	'color-status': 'blue',
-	'color-error': 'red',
-	'color-warning': 'red',
-	'color-display-title-url': 'cyan',
-	'color-display-title-number': 'magenta',
-	'color-display-title-text': 'red',
-	'color-display-title-user': 'blue',
-	'color-display-info-repo-title': 'default',
-	'color-display-info-repo-count': 'magenta',
-	'color-display-info-total-title': 'green',
-	'color-display-info-total-count': 'magenta',
-	'color-stats-added': 'yellow',
-	'color-stats-average-change': 'magenta',
-	'color-stats-deleted': 'red',
-	'color-stats-total': 'blue',
-
+	"color-success": "green",
+	"color-status": "blue",
+	"color-error": "red",
+	"color-warning": "red",
+	"color-display-title-url": "cyan",
+	"color-display-title-number": "magenta",
+	"color-display-title-text": "red",
+	"color-display-title-user": "blue",
+	"color-display-info-repo-title": "default",
+	"color-display-info-repo-count": "magenta",
+	"color-display-info-total-title": "green",
+	"color-display-info-total-count": "magenta",
+	"color-stats-added": "yellow",
+	"color-stats-average-change": "magenta",
+	"color-stats-deleted": "red",
+	"color-stats-total": "blue",
 	# Disable the color scheme
-	'enable-color': True,
-
+	"enable-color": True,
 	# Sets the default comment to post when closing a pull request.
-	'close-default-comment': None,
-
+	"close-default-comment": None,
+	# Limit the number of characters from the description of the pull
+	"description-char-limit": 500,
 	# Set the indent character(s) used to indent the description
-	'description-indent': '	',
-
+	"description-indent": "	",
+	# Limit the number of lines from the description of the pull
+	"description-line-limit": 1,
 	# Set to true to remove the newlines from the description of the pull
 	# (this will format it as it used to)
-	'description-strip-newlines': False,
-
+	"description-strip-newlines": False,
 	# Determines whether fetch will automatically checkout the new branch.
-	'fetch-auto-checkout': False,
-
+	"fetch-auto-checkout": False,
 	# Determines whether to automatically update a fetched pull request branch.
 	# Setting this option to true will also cause the new branch to be checked
 	# out.
-	'fetch-auto-update': False,
-
+	"fetch-auto-update": False,
 	# Whether to show pull requests for the entire repo or just the update-branch.
-	'filter-by-update-branch': True,
-
+	"filter-by-update-branch": True,
 	# Determines whether to automatically close pull requests after merging
 	# them.
-	'merge-auto-close': True,
-
+	"merge-auto-close": True,
 	# A string to be used to append to the end of each result of the stats command.
 	# It's passed the merge_base SHA, the branch name of the fetched pull, as well as
 	# a list of the committers that contributed to the pull.
@@ -196,8 +180,7 @@
 	# of the string as a shell script. However, the merge_base, branch_name and committers
 	# are still substituted in, allowing you to send them to another script in any order
 	# Example: '`git log --oneline ${merge_base}..${branch_name} && echo "${committers}"'
-	'stats-footer': None,
-
+	"stats-footer": None,
 	# A string to be used to format the message sent with a submitted pull.
 	# Available variables:
 	# ${merge_base}: SHA of the merge base of this branch
@@ -212,61 +195,59 @@
 	# of the string as a shell script. However, the variables are still substituted in,
 	# allowing you to send them to another script in any order
 	# Example: '`echo "${pull_body}" | tr "[:upper:]" "[:lower:]"'
-	'format-submit-body': None,
-
+	"format-submit-body": None,
 	# Sets the branch to use where updates are merged from or to.
-	'update-branch': 'master',
-
+	"update-branch": "master",
 	# Sets the method to use when updating pull request branches with changes
 	# in the update-branch.
 	# Possible options: 'merge', 'rebase'
-	'update-method': 'merge',
-
+	"update-method": "merge",
 	# The organization to update users from (set to None or an empty string to update from the current fork)
-	'user-organization': 'liferay',
-
+	"user-organization": "liferay",
 	# Determines whether to open newly submitted pull requests on github
-	'submit-open-github': True,
-
+	"submit-open-github": True,
 	# Sets a directory to be used for performing updates to prevent
 	# excessive rebuilding by IDE's. Warning: This directory will be hard reset
 	# every time an update is performed, so do not do any work other than
 	# conflict merges in the work directory.
-	'work-dir': None
+	"work-dir": None,
 }
 
 URL_BASE = "https://api.github.com/%s"
-SCRIPT_NOTE = 'GitPullRequest Script (by Liferay)'
-TMP_PATH = tempfile.gettempdir() + '/%s'
+SCRIPT_NOTE = "GitPullRequest Script (by Liferay)"
+TMP_PATH = tempfile.gettempdir() + "/%s"
 
 MAP_RESPONSE = {}
 
-def authorize_request(req, token=None, auth_type="token"):
+
+def authorize_request(req, token=None):
 	"""Add the Authorize header to the request"""
 
 	if token == None:
 		token = auth_token
 
-	req.add_header("Authorization", "%s %s" % (auth_type, token))
+	req.add_header("Authorization", "token %s" % (token))
+
 
 def build_branch_name(pull_request):
 	"""Returns the local branch name that a pull request should be fetched into"""
-	ref = pull_request['head']['ref']
+	ref = pull_request["head"]["ref"]
 
-	request_id = pull_request['number']
+	request_id = pull_request["number"]
 
-	branch_name = 'pull-request-%s' % request_id
+	branch_name = "pull-request-%s" % request_id
 
 	jira_ticket = get_jira_ticket(ref)
 
 	if not jira_ticket:
-		jira_ticket = get_jira_ticket(pull_request['title'])
+		jira_ticket = get_jira_ticket(pull_request["title"])
 
 	if jira_ticket:
-		branch_name = '%s-%s' % (branch_name, jira_ticket)
+		branch_name = "%s-%s" % (branch_name, jira_ticket)
 
 	return branch_name
 
+
 def build_pull_request_title(branch_name):
 	"""Returns the default title to use for a pull request for the branch with
 	the name"""
@@ -278,70 +259,76 @@ def build_pull_request_title(branch_name):
 
 	return branch_name
 
-def get_jira_ticket(text):
-	"""Returns a JIRA ticket id from the passed text, or a blank string otherwise"""
-	m = re.search("[A-Z]{3,}-\d+", text)
-
-	jira_ticket = ''
-
-	if m != None and m.group(0) != '':
-		jira_ticket = m.group(0)
-
-	return jira_ticket
 
 def chdir(dir):
-	f = open(get_tmp_path('git-pull-request-chdir'), 'wb')
+	f = open(get_tmp_path("git-pull-request-chdir"), "wb")
 	f.write(dir)
 	f.close()
 
-def close_pull_request(repo_name, pull_request_ID, comment = None):
-	default_comment = options['close-default-comment']
+
+def close_pull_request(repo_name, pull_request_ID, comment=None):
+	default_comment = options["close-default-comment"]
 
 	if comment is None:
 		comment = default_comment
 
 	if comment is None or comment == default_comment:
 		try:
-			f = open(get_tmp_path('git-pull-request-treeish-%s' % pull_request_ID), 'r')
+			f = open(get_tmp_path("git-pull-request-treeish-%s" % pull_request_ID), "r")
 			branch_info = json.load(f)
 			f.close()
 
-			username = branch_info['username']
+			username = branch_info["username"]
 
-			updated_parent_commit = ''
-			updated_head_commit = ''
-			original_parent_commit = ''
-			original_head_commit = ''
+			updated_parent_commit = ""
+			updated_head_commit = ""
+			original_parent_commit = ""
+			original_head_commit = ""
 
-			if 'original' in branch_info:
-				original = branch_info['original']
-				original_parent_commit = original['parent_commit']
-				original_head_commit = original['head_commit']
+			if "original" in branch_info:
+				original = branch_info["original"]
+				original_parent_commit = original["parent_commit"]
+				original_head_commit = original["head_commit"]
 
-			if 'updated' in branch_info:
-				updated = branch_info['updated']
-				updated_parent_commit = updated['parent_commit']
-				updated_head_commit = updated['head_commit']
+			if "updated" in branch_info:
+				updated = branch_info["updated"]
+				updated_parent_commit = updated["parent_commit"]
+				updated_head_commit = updated["head_commit"]
 
-			current_head_commit = os.popen('git rev-parse HEAD').read().strip()[0:10]
+			current_head_commit = os.popen("git rev-parse HEAD").read().strip()[0:10]
 
-			my_diff_comment = ''
+			my_diff_comment = ""
 
 			diff_commit = False
 
 			if original_head_commit != current_head_commit:
-				current_diff_tree = os.popen('git diff-tree -r -c -M -C --no-commit-id HEAD').read().strip()
-				original_diff_tree = os.popen('git diff-tree -r -c -M -C --no-commit-id %s' % original_head_commit).read().strip()
-
-				current_tree_commits = current_diff_tree.split('\n')
-				original_tree_commits = original_diff_tree.split('\n')
+				current_diff_tree = (
+					os.popen("git diff-tree -r -c -M -C --no-commit-id HEAD")
+					.read()
+					.strip()
+				)
+				original_diff_tree = (
+					os.popen(
+						"git diff-tree -r -c -M -C --no-commit-id %s"
+						% original_head_commit
+					)
+					.read()
+					.strip()
+				)
+
+				current_tree_commits = current_diff_tree.split("\n")
+				original_tree_commits = original_diff_tree.split("\n")
 
 				if len(current_tree_commits) == len(original_tree_commits):
 					for index, commit in enumerate(current_tree_commits):
-						current_commits = commit.split(' ')
-						original_commits = original_tree_commits[index].split(' ')
-
-						if len(current_commits) >= 4 and len(original_commits) >= 4 and current_commits[3] != original_commits[3]:
+						current_commits = commit.split(" ")
+						original_commits = original_tree_commits[index].split(" ")
+
+						if (
+							len(current_commits) >= 4
+							and len(original_commits) >= 4
+							and current_commits[3] != original_commits[3]
+						):
 							diff_commit = True
 							break
 				else:
@@ -351,113 +338,84 @@ def close_pull_request(repo_name, pull_request_ID, comment = None):
 				diff_commit = False
 
 			if diff_commit:
-				my_diff_comment = "\n\nView just my changes: https://github.com/%s/compare/%s:%s...%s" % (repo_name, username, updated_head_commit or original_head_commit, current_head_commit)
+				my_diff_comment = (
+					"\n\nView just my changes: https://github.com/%s/compare/%s:%s...%s"
+					% (
+						repo_name,
+						username,
+						updated_head_commit or original_head_commit,
+						current_head_commit,
+					)
+				)
 
 			if comment is None:
-				comment = ''
+				comment = ""
 
-			new_pr_url = meta('new_pr_url')
+			new_pr_url = meta("new_pr_url")
 
-			if new_pr_url and new_pr_url != '':
+			if new_pr_url and new_pr_url != "":
 				comment += "\nPull request submitted at: %s" % new_pr_url
 
 			comment += my_diff_comment
 
-			comment += "\nView total diff: https://github.com/%s/compare/%s...%s" % (repo_name, (updated_parent_commit or original_parent_commit), current_head_commit)
+			comment += "\nView total diff: https://github.com/%s/compare/%s...%s" % (
+				repo_name,
+				(updated_parent_commit or original_parent_commit),
+				current_head_commit,
+			)
 		except Exception:
 			pass
 
-	if comment is not None and comment != '':
+	if comment is not None and comment != "":
 		post_comment(repo_name, pull_request_ID, comment)
 
 	url = get_api_url("repos/%s/pulls/%s" % (repo_name, pull_request_ID))
 
-	params = {
-		'state': 'closed'
-	}
+	params = {"state": "closed"}
 
 	github_json_request(url, params)
 
-def color_text(text, token, bold = False):
+
+def color_text(text, token, bold=False):
 	"""Return the given text in ANSI colors"""
 
 	# http://travelingfrontiers.wordpress.com/2010/08/22/how-to-add-colors-to-linux-command-line-output/
 
-	if options['enable-color'] == True:
+	if options["enable-color"] == True:
 		color_name = options["color-%s" % token]
 
-		if color_name == 'default' or (not FORCE_COLOR and not sys.stdout.isatty()):
+		if color_name == "default" or (not FORCE_COLOR and not sys.stdout.isatty()):
 			return text
 
-		colors = (
-			'black', 'red', 'green', 'yellow',
-			'blue', 'magenta', 'cyan', 'white'
-		)
+		colors = ("black", "red", "green", "yellow", "blue", "magenta", "cyan", "white")
 
 		if color_name in colors:
 			return u"\033[{0};{1}m{2}\033[0m".format(
-				int(bold),
-				colors.index(color_name) + 30,
-				text)
+				int(bold), colors.index(color_name) + 30, text
+			)
 		else:
 			return text
 	else:
 		return text
 
+
 def command_alias(alias, githubname, filename):
 	try:
 		users[alias] = githubname
 	except Exception:
-		raise UserWarning('Error while updating the alias for %s' % alias)
+		raise UserWarning("Error while updating the alias for %s" % alias)
 
-	github_users_file = open(filename, 'w')
+	github_users_file = open(filename, "w")
 	json.dump(users, github_users_file)
 
 	github_users_file.close()
 
-def command_fetch(repo_name, pull_request_ID, auto_update = False):
-	"""Fetches a pull request into a local branch"""
-
-	print color_text("Fetching pull request", 'status')
-	print
-
-	pull_request = get_pull_request(repo_name, pull_request_ID)
-	display_pull_request(pull_request)
-	branch_name = fetch_pull_request(pull_request, repo_name)
-
-	parent_commit = pull_request['base']['sha']
-	head_commit = pull_request['head']['sha']
-	username = pull_request['user']['login']
-
-	branch_info = {
-		'username': username,
-		'original': {
-			'parent_commit': parent_commit[0:10],
-			'head_commit': head_commit[0:10],
-		}
-	}
-
-	f = open(get_tmp_path('git-pull-request-treeish-%s' % pull_request_ID), 'w')
-	branch_treeish = json.dump(branch_info, f)
-	f.close()
-
-	if auto_update:
-		update_branch(branch_name)
-	elif options['fetch-auto-checkout']:
-		ret = os.system('git checkout %s' % branch_name)
-		if ret != 0:
-			raise UserWarning("Could not checkout %s" % branch_name)
-
-	print
-	print color_text("Fetch completed", 'success')
-	print
-	display_status()
 
-def command_close(repo_name, comment = None):
+def command_close(repo_name, comment=None):
 	"""Closes the current pull request on github with the optional comment, then
 	deletes the branch."""
 
-	print color_text("Closing pull request", 'status')
+	print color_text("Closing pull request", "status")
 	print
 
 	branch_name = get_current_branch_name()
@@ -468,36 +426,88 @@ def command_close(repo_name, comment = None):
 
 	close_pull_request(repo_name, pull_request_ID, comment)
 
-	update_branch_option = options['update-branch']
+	update_branch_option = options["update-branch"]
 
-	ret = os.system('git checkout %s' % update_branch_option)
+	ret = os.system("git checkout %s" % update_branch_option)
 	if ret != 0:
 		raise UserWarning("Could not checkout %s" % update_branch_option)
 
-	print color_text("Deleting branch %s" % branch_name, 'status')
-	ret = os.system('git branch -D %s' % branch_name)
+	print color_text("Deleting branch %s" % branch_name, "status")
+	ret = os.system("git branch -D %s" % branch_name)
 	if ret != 0:
 		raise UserWarning("Could not delete branch")
 
 	print
-	print color_text("Pull request closed", 'success')
+	print color_text("Pull request closed", "success")
 	print
 	display_status()
 
+
+def command_comment(repo_name, comment=None, pull_request_ID=None):
+	if pull_request_ID is None:
+		branch_name = get_current_branch_name()
+		pull_request_ID = get_pull_request_ID(branch_name)
+
+	if comment is not None and comment != "":
+		post_comment(repo_name, pull_request_ID, comment)
+	else:
+		raise UserWarning("Please include a comment")
+
+
 def command_continue_update():
-	print color_text("Continuing update from %s" % options['update-branch'], 'status')
+	print color_text("Continuing update from %s" % options["update-branch"], "status")
 
 	continue_update()
 	print
 	display_status()
 
+
+def command_fetch(repo_name, pull_request_ID, auto_update=False):
+	"""Fetches a pull request into a local branch"""
+
+	print color_text("Fetching pull request", "status")
+	print
+
+	pull_request = get_pull_request(repo_name, pull_request_ID)
+	display_pull_request(pull_request)
+	branch_name = fetch_pull_request(pull_request, repo_name)
+
+	parent_commit = pull_request["base"]["sha"]
+	head_commit = pull_request["head"]["sha"]
+	username = pull_request["user"]["login"]
+
+	branch_info = {
+		"username": username,
+		"original": {
+			"parent_commit": parent_commit[0:10],
+			"head_commit": head_commit[0:10],
+		},
+	}
+
+	f = open(get_tmp_path("git-pull-request-treeish-%s" % pull_request_ID), "w")
+	branch_treeish = json.dump(branch_info, f)
+	f.close()
+
+	if auto_update:
+		update_branch(branch_name)
+	elif options["fetch-auto-checkout"]:
+		ret = os.system("git checkout %s" % branch_name)
+		if ret != 0:
+			raise UserWarning("Could not checkout %s" % branch_name)
+
+	print
+	print color_text("Fetch completed", "success")
+	print
+	display_status()
+
+
 def command_fetch_all(repo_name):
 	"""Fetches all pull requests into local branches"""
 
-	print color_text("Fetching all pull requests", 'status')
+	print color_text("Fetching all pull requests", "status")
 	print
 
-	pull_requests = get_pull_requests(repo_name, options['filter-by-update-branch'])
+	pull_requests = get_pull_requests(repo_name, options["filter-by-update-branch"])
 
 	for pull_request in pull_requests:
 		fetch_pull_request(pull_request, repo_name)
@@ -506,11 +516,13 @@ def command_fetch_all(repo_name):
 
 	display_status()
 
+
 def command_help():
 	print __doc__
 
-def command_info(username, detailed = False):
-	print color_text("Loading information on repositories for %s" % username, 'status')
+
+def command_info(username, detailed=False):
+	print color_text("Loading information on repositories for %s" % username, "status")
 	print
 
 	# Change URL depending on if info user is passed in
@@ -522,87 +534,104 @@ def command_info(username, detailed = False):
 
 	url = get_api_url(url)
 
-	url += '?per_page=100'
+	url += "?per_page=100&type=owner"
 
 	repos = github_json_request(url)
 
 	total = 0
 
-	current_base_name = ''
+	current_base_name = ""
 
 	for pull_request_info in repos:
-		issue_count = pull_request_info['open_issues']
+		issue_count = pull_request_info["open_issues"]
 
 		if issue_count > 0:
-			base_name = pull_request_info['name']
+			base_name = pull_request_info["name"]
 
 			if base_name != current_base_name:
 				current_base_name = base_name
 				print ""
-				print '%s:' % color_text(base_name, 'display-title-text')
+				print "%s:" % color_text(base_name, "display-title-text")
 				print "---------"
 
-			repo_name = "%s/%s" % (pull_request_info['owner']['login'], base_name)
+			repo_name = "%s/%s" % (pull_request_info["owner"]["login"], base_name)
 
-			print "  %s: %s" % (color_text(base_name, 'display-info-repo-title'), color_text(issue_count, 'display-info-repo-count'))
+			print "  %s: %s" % (
+				color_text(base_name, "display-info-repo-title"),
+				color_text(issue_count, "display-info-repo-count"),
+			)
 
 			if detailed:
 				pull_requests = get_pull_requests(repo_name, False)
 
-				current_branch_name = ''
+				current_branch_name = ""
 
 				for pull_request in pull_requests:
-					branch_name = pull_request['base']['ref']
+					branch_name = pull_request["base"]["ref"]
 					if branch_name != current_branch_name:
 						current_branch_name = branch_name
 						print ""
-						print '    %s:' % color_text(current_branch_name, 'display-title-user')
+						print "	%s:" % color_text(
+							current_branch_name, "display-title-user"
+						)
 
-					print "        %s" % display_pull_request_minimal(pull_request, True)
+					print "		%s" % display_pull_request_minimal(
+						pull_request, True
+					)
 
 			total += issue_count
 
 	print "-"
-	out = "%s: %s" % (color_text("Total pull requests", 'display-info-total-title', True), color_text(total, 'display-info-total-count', True))
+	out = "%s: %s" % (
+		color_text("Total pull requests", "display-info-total-title", True),
+		color_text(total, "display-info-total-count", True),
+	)
 	print
 	display_status()
 	return out
 
-def command_merge(repo_name, comment = None):
+
+def command_merge(repo_name, comment=None):
 	"""Merges changes from the local pull request branch into the update-branch and deletes
 	the pull request branch"""
 
 	branch_name = get_current_branch_name()
 	pull_request_ID = get_pull_request_ID(branch_name)
 
-	update_branch_option = options['update-branch']
+	update_branch_option = options["update-branch"]
 
-	print color_text("Merging %s into %s" % (branch_name, update_branch_option), 'status')
+	print color_text(
+		"Merging %s into %s" % (branch_name, update_branch_option), "status"
+	)
 	print
 
-	ret = os.system('git checkout %s' % update_branch_option)
+	ret = os.system("git checkout %s" % update_branch_option)
 	if ret != 0:
 		raise UserWarning("Could not checkout %s" % update_branch_option)
 
-	ret = os.system('git merge %s' % branch_name)
+	ret = os.system("git merge %s" % branch_name)
 	if ret != 0:
-		raise UserWarning("Merge with %s failed. Resolve conflicts, switch back into the pull request branch, and merge again" % update_branch_option)
+		raise UserWarning(
+			"Merge with %s failed. Resolve conflicts, switch back into the pull request branch, and merge again"
+			% update_branch_option
+		)
 
-	print color_text("Deleting branch %s" % branch_name, 'status')
-	ret = os.system('git branch -D %s' % branch_name)
+	print color_text("Deleting branch %s" % branch_name, "status")
+	ret = os.system("git branch -D %s" % branch_name)
 	if ret != 0:
 		raise UserWarning("Could not delete branch")
 
-	if options['merge-auto-close']:
-		print color_text("Closing pull request", 'status')
+	if options["merge-auto-close"]:
+		print color_text("Closing pull request", "status")
 		close_pull_request(repo_name, pull_request_ID, comment)
 
 	print
-	print color_text("Merge completed", 'success')
+	print color_text("Merge completed", "success")
 	print
 	display_status()
 
-def command_open(repo_name, pull_request_ID = None):
+
+def command_open(repo_name, pull_request_ID=None):
 	"""Open a pull request in the browser"""
 
 	if pull_request_ID is None:
@@ -611,7 +640,39 @@ def command_open(repo_name, pull_request_ID = None):
 
 	pull_request = get_pull_request(repo_name, pull_request_ID)
 
-	open_URL(pull_request.get('html_url'))
+	open_URL(pull_request.get("html_url"))
+
+
+def command_pull(repo_name):
+	"""Pulls changes from the remote branch into the local branch of the pull
+	request"""
+
+	branch_name = get_current_branch_name()
+
+	print color_text("Pulling remote changes into %s" % branch_name, "status")
+
+	pull_request_ID = get_pull_request_ID(branch_name)
+
+	pull_request = get_pull_request(repo_name, pull_request_ID)
+	repo_url = get_repo_url(pull_request, repo_name)
+
+	branch_name = build_branch_name(pull_request)
+	remote_branch_name = "refs/pull/%s/head" % pull_request["number"]
+
+	print color_text(
+		"Pulling from %s (%s)" % (repo_url, pull_request["head"]["ref"]), "status"
+	)
+
+	ret = os.system("git pull %s %s" % (repo_url, remote_branch_name))
+
+	if ret != 0:
+		raise UserWarning("Pull failed, resolve conflicts")
+
+	print
+	print color_text("Updating %s from remote completed" % branch_name, "success")
+	print
+	display_status()
+
 
 def command_show(repo_name):
 	"""List open pull requests
@@ -619,15 +680,18 @@ def command_show(repo_name):
 	Queries the github API for open pull requests in the current repo.
 	"""
 
-	update_branch_name = options['update-branch']
-	filter_by_update_branch = options['filter-by-update-branch']
+	update_branch_name = options["update-branch"]
+	filter_by_update_branch = options["filter-by-update-branch"]
 
 	if not filter_by_update_branch:
 		update_branch_name = "across all branches"
 	else:
 		update_branch_name = "on branch '%s'" % update_branch_name
 
-	print color_text("Loading open pull requests for %s %s" % (repo_name, update_branch_name), 'status')
+	print color_text(
+		"Loading open pull requests for %s %s" % (repo_name, update_branch_name),
+		"status",
+	)
 	print
 
 	pull_requests = get_pull_requests(repo_name, filter_by_update_branch)
@@ -640,11 +704,14 @@ def command_show(repo_name):
 
 	display_status()
 
+
 def command_show_alias(alias):
-	""" Shows the username where the alias points to
-	"""
+	"""Shows the username where the alias points to"""
 
-	user_item = next((user for user in users.iteritems() if user[0] == alias or user[1] == alias), None)
+	user_item = next(
+		(user for user in users.iteritems() if user[0] == alias or user[1] == alias),
+		None,
+	)
 
 	if user_item:
 		print "The user alias %s points to %s " % user_item
@@ -652,183 +719,109 @@ def command_show_alias(alias):
 		print "There is no user alias or github name matching %s in the current mapping file" % alias
 
 
-def get_pr_stats(repo_name, pull_request_ID):
-	if pull_request_ID != None:
-		try:
-			pull_request_ID = int(pull_request_ID)
-			pull_request = get_pull_request(repo_name, pull_request_ID)
-		except Exception, e:
-			pull_request = pull_request_ID
-
-		display_pull_request_minimal(pull_request)
-
-		branch_name = build_branch_name(pull_request)
-		ret = os.system('git show-ref --verify -q refs/heads/%s' % branch_name)
-
-		if ret != 0:
-			branch_name = fetch_pull_request(pull_request, repo_name)
-
-			ret = os.system('git show-ref --verify -q refs/heads/%s' % branch_name)
-
-			if  ret != 0:
-				raise UserWarning("Fetch failed")
-
-		merge_base = os.popen('git merge-base %s %s' % (options['update-branch'], branch_name)).read().strip()
-
-		shortstat = os.popen('git --no-pager diff --shortstat {0}..{1}'.format(merge_base, branch_name)).read().strip()
-		stat_fragments = shortstat.split(', ')
-		stats_arr = shortstat.split(' ')
-
-		has_color = False
-		for index, frag in enumerate(stat_fragments):
-			color_type = None
-			if 'changed' in frag:
-				color_type = 'total'
-			elif 'insertions' in frag:
-				color_type = 'added'
-			elif 'deletions' in frag:
-				color_type = 'deleted'
-
-			if color_type:
-				has_color = True
-				stat_fragments[index] = color_text(frag, 'stats-%s' % color_type)
-
-		if has_color:
-			shortstat = ', '.join(stat_fragments)
-
-		dels = 0
-		if len(stats_arr) > 5:
-			dels = int(stats_arr[5])
-
-		stats = (int(stats_arr[3]) + dels) / int(stats_arr[0])
-
-		stats = color_text('Average %d change(s) per file' % stats, 'stats-average-change')
-
-		ret = os.popen("echo '{2}, {3}' && git diff --numstat --pretty='%H' --no-renames {0}..{1} | xargs -0n1 echo -n | cut -f 3- | sed -e 's/^.*\.\(.*\)$/\\1/' | sort | uniq -c | tr '\n' ',' | sed 's/,$//'".format(merge_base, branch_name, shortstat, stats)).read().strip()
-
-		print ret
-
-		stats_footer = options['stats-footer']
-
-		if stats_footer:
-			committers = os.popen("git log {0}..{1} --pretty='%an' --reverse | awk ' !x[$0]++'".format(merge_base, branch_name)).read().strip()
-			committers = committers.split(os.linesep)
-			committers = ', '.join(committers)
-
-			fn = False
-
-			if stats_footer.startswith('`'):
-				stats_footer = stats_footer[1:]
-				fn = True
-
-			footer_tpl = Template(stats_footer)
-
-			committers = committers.decode('utf-8')
-
-			pr_obj = pull_request.copy()
-			pr_obj.update(
-				{
-					'merge_base': merge_base[0:8],
-					'branch_name': branch_name,
-					'committers': committers,
-					'NEWLINE': os.linesep
-				}
-			)
-
-			footer_result = footer_tpl.safe_substitute(**pr_obj)
-
-			if fn:
-				footer_result = os.popen(footer_result.encode('utf-8')).read().strip().decode('utf-8')
-
-			print footer_result
-
-		print
-	else:
-		pull_requests = get_pull_requests(repo_name, options['filter-by-update-branch'])
-
-		for pull_request in pull_requests:
-			get_pr_stats(repo_name, pull_request)
-
-
-def command_submit(repo_name, username, reviewer_repo_name = None, pull_body = None, pull_title = None, submitOpenGitHub = True):
+def command_submit(
+	repo_name,
+	username,
+	reviewer_repo_name=None,
+	pull_body=None,
+	pull_title=None,
+	submitOpenGitHub=True,
+):
 	"""Push the current branch and create a pull request to your github reviewer
 	(or upstream)"""
 
 	branch_name = get_current_branch_name(False)
 
-	print color_text("Submitting pull request for %s" % branch_name, 'status')
+	print color_text("Submitting pull request for %s" % branch_name, "status")
 
-	if reviewer_repo_name is None or reviewer_repo_name == '':
-		reviewer_repo_name = get_repo_name_for_remote('upstream')
+	if reviewer_repo_name is None or reviewer_repo_name == "":
+		reviewer_repo_name = get_repo_name_for_remote("upstream")
 
-	if reviewer_repo_name is None or reviewer_repo_name == '':
+	if reviewer_repo_name is None or reviewer_repo_name == "":
 		raise UserWarning("Could not determine a repo to submit this pull request to")
 
-	if '/' not in reviewer_repo_name:
+	if "/" not in reviewer_repo_name:
 		reviewer_repo_name = repo_name.replace(username, reviewer_repo_name)
 
-	print color_text("Pushing local branch %s to origin" % branch_name, 'status')
+	print color_text("Pushing local branch %s to origin" % branch_name, "status")
 
-	ret = os.system('git push origin %s' % branch_name)
+	ret = os.system("git push origin %s" % branch_name)
 
 	if ret != 0:
 		raise UserWarning("Could not push this branch to your origin")
 
 	url = get_api_url("repos/%s/pulls" % reviewer_repo_name)
 
-	if pull_title == None or pull_title == '':
+	if pull_title == None or pull_title == "":
 		pull_title = build_pull_request_title(branch_name)
 
-	format_submit_body = options['format-submit-body']
+	format_submit_body = options["format-submit-body"]
 
 	if format_submit_body:
-		merge_base = os.popen('git merge-base %s %s' % (options['update-branch'], branch_name)).read().strip()
-		committers = os.popen("git log {0}..{1} --pretty='%an' --reverse | awk ' !x[$0]++'".format(merge_base, branch_name)).read().strip()
+		merge_base = (
+			os.popen("git merge-base %s %s" % (options["update-branch"], branch_name))
+			.read()
+			.strip()
+		)
+		committers = (
+			os.popen(
+				"git log {0}..{1} --pretty='%an' --reverse | awk ' !x[$0]++'".format(
+					merge_base, branch_name
+				)
+			)
+			.read()
+			.strip()
+		)
 		committers = committers.split(os.linesep)
-		committers = ', '.join(committers)
+		committers = ", ".join(committers)
 
 		fn = False
 
-		if format_submit_body.startswith('`'):
+		if format_submit_body.startswith("`"):
 			format_submit_body = format_submit_body[1:]
 			fn = True
 
 		pull_body_tpl = Template(format_submit_body)
 
-		committers = committers.decode('utf-8')
+		committers = committers.decode("utf-8")
 
-		reviewer_repo_pieces = reviewer_repo_name.split('/')
+		reviewer_repo_pieces = reviewer_repo_name.split("/")
 		reviewer = reviewer_repo_pieces[0]
 
 		variables = {
-			'merge_base': merge_base[0:8],
-			'branch_name': branch_name,
-			'committers': committers,
-			'pull_body': pull_body or '',
-			'reviewer': reviewer,
-			'repo_name': reviewer_repo_pieces[1],
-			'NEWLINE': os.linesep
+			"merge_base": merge_base[0:8],
+			"branch_name": branch_name,
+			"committers": committers,
+			"pull_body": pull_body or "",
+			"reviewer": reviewer,
+			"repo_name": reviewer_repo_pieces[1],
+			"NEWLINE": os.linesep,
 		}
 
 		pull_body_result = pull_body_tpl.safe_substitute(**variables)
 
 		if fn:
-			pull_body_result = os.popen(pull_body_result.encode('utf-8')).read().strip().decode('utf-8')
+			pull_body_result = (
+				os.popen(pull_body_result.encode("utf-8"))
+				.read()
+				.strip()
+				.decode("utf-8")
+			)
 
 		if pull_body_result:
 			pull_body = pull_body_result
 
 	if pull_body == None:
-		pull_body = ''
+		pull_body = ""
 
 	params = {
-		'base': options['update-branch'],
-		'head': "%s:%s" % (username, branch_name),
-		'title': pull_title,
-		'body': pull_body
+		"base": options["update-branch"],
+		"head": "%s:%s" % (username, branch_name),
+		"title": pull_title,
+		"body": pull_body,
 	}
 
-	print color_text("Sending pull request to %s" % reviewer_repo_name, 'status')
+	print color_text("Sending pull request to %s" % reviewer_repo_name, "status")
 
 	pull_request = None
 
@@ -843,29 +836,33 @@ def command_submit(repo_name, username, reviewer_repo_name = None, pull_body = N
 		reviewer_pulls = get_pull_requests(reviewer_repo_name, True)
 
 		for pr in reviewer_pulls:
-			if pr.get('user').get('login') == DEFAULT_USERNAME and pr.get('head').get('ref') == branch_name:
+			if (
+				pr.get("user").get("login") == DEFAULT_USERNAME
+				and pr.get("head").get("ref") == branch_name
+			):
 				pull_request = pr
 
 	if not pull_request:
 		raise msg
 
-	new_pr_url = pull_request.get('html_url')
+	new_pr_url = pull_request.get("html_url")
 
-	if new_pr_url and new_pr_url != '':
-		meta('new_pr_url', new_pr_url)
+	if new_pr_url and new_pr_url != "":
+		meta("new_pr_url", new_pr_url)
 
 	print
 	display_pull_request(pull_request)
 	print
 
-	print color_text("Pull request submitted", 'success')
+	print color_text("Pull request submitted", "success")
 	print
 	display_status()
 
 	if submitOpenGitHub:
 		open_URL(new_pr_url)
 
-def command_update(repo_name, target = None):
+
+def command_update(repo_name, target=None):
 	if target == None:
 		branch_name = get_current_branch_name()
 	else:
@@ -876,22 +873,31 @@ def command_update(repo_name, target = None):
 		except ValueError:
 			branch_name = target
 
-	print color_text("Updating %s from %s" % (branch_name, options['update-branch']), 'status')
+	print color_text(
+		"Updating %s from %s" % (branch_name, options["update-branch"]), "status"
+	)
 
 	update_branch(branch_name)
 	print
 	display_status()
 
-def command_update_users(filename, url = None, github_users = None, total_pages = 0, all_pages = True):
+
+def command_update_meta():
+	update_meta()
+
+
+def command_update_users(
+	filename, url=None, github_users=None, total_pages=0, all_pages=True
+):
 	if url is None:
-		user_organization = options['user-organization']
+		user_organization = options["user-organization"]
 
 		if user_organization:
 			url = get_api_url("orgs/%s/members" % user_organization)
 		else:
 			url = get_api_url("repos/%s/forks" % get_repo_name_for_remote("upstream"))
 
-			params = {'per_page': '100', 'sort': 'oldest'}
+			params = {"per_page": "100", "sort": "oldest"}
 
 			url_parts = list(urlparse.urlparse(url))
 			query = dict(urlparse.parse_qsl(url_parts[4]))
@@ -906,22 +912,24 @@ def command_update_users(filename, url = None, github_users = None, total_pages
 
 	items = github_json_request(url)
 
-	m = re.search('[?&]page=(\d+)', url)
+	m = re.search("[?&]page=(\d+)", url)
 
-	if m is not None and m.group(1) != '':
+	if m is not None and m.group(1) != "":
 		print "Doing another request for page: %s of %s" % (m.group(1), total_pages)
 	else:
-		print "There are more than %s users, this could take a few minutes..." % len(items)
+		print "There are more than %s users, this could take a few minutes..." % len(
+			items
+		)
 
 	user_api_url = get_api_url("users")
 
 	for item in items:
 		user_info = item
 
-		if 'owner' in item:
-			user_info = item['owner']
+		if "owner" in item:
+			user_info = item["owner"]
 
-		login = user_info['login']
+		login = user_info["login"]
 
 		github_user_info = github_json_request("%s/%s" % (user_api_url, login))
 		email = login
@@ -932,183 +940,167 @@ def command_update_users(filename, url = None, github_users = None, total_pages
 			github_users[email] = login
 
 	if all_pages:
-		link_header = MAP_RESPONSE[url].info().getheader('Link')
+		link_header = MAP_RESPONSE[url].info().getheader("Link")
 
 		if link_header is not None:
 			m = re.search('<([^>]+)>; rel="next",', link_header)
 
-			if m is not None and m.group(1) != '':
+			if m is not None and m.group(1) != "":
 				url = m.group(1)
 
 				if total_pages == 0:
-					m1 = re.search('<[^>]+[&?]page=(\d+)[^>]*>; rel="last"', link_header)
+					m1 = re.search(
+						'<[^>]+[&?]page=(\d+)[^>]*>; rel="last"', link_header
+					)
 
-					if m1 is not None and m1.group(1) != '':
+					if m1 is not None and m1.group(1) != "":
 						total_pages = m1.group(1)
 
 				command_update_users(filename, url, github_users, total_pages)
 
-	github_users_file = open(filename, 'w')
+	github_users_file = open(filename, "w")
 	json.dump(github_users, github_users_file)
 
 	github_users_file.close()
 
 	return github_users
 
-def get_user_email(github_user_info):
-	email = None
 
-	if 'email' in github_user_info:
-		email = github_user_info['email']
+def complete_update(branch_name):
+	update_branch_option = options["update-branch"]
 
-		if email != None and email.endswith('@liferay.com'):
-			email = email[:-12]
+	if in_work_dir():
+		ret = os.system("git checkout %s" % update_branch_option)
+		if ret != 0:
+			raise UserWarning(
+				"Could not checkout %s branch in work directory" % update_branch_option
+			)
 
-			if email.isdigit():
-				email = None
-		else:
-			email = None
+		original_dir_path = get_original_dir_path()
 
-	if email == None:
-		if 'name' in github_user_info and ' ' in github_user_info['name']:
-			email = github_user_info['name'].lower()
-			email = email.replace(' ', '.')
-			email = email.replace('(', '.')
-			email = email.replace(')', '.')
+		print color_text(
+			"Switching to original directory: '%s'" % original_dir_path, "status"
+		)
 
-			email = re.sub('\.+', '.', email)
+		os.chdir(original_dir_path)
+		chdir(original_dir_path)
 
-			# Unicode characters usually do not appear in Liferay emails, so
-			# we'll replace them with the closest ASCII equivalent
+		if get_current_branch_name(False) == branch_name:
+			ret = os.system("git reset --hard && git clean -f")
+			if ret != 0:
+				raise UserWarning(
+					"Syncing branch %s with work directory failed" % branch_name
+				)
+		else:
+			ret = os.system("git checkout %s" % branch_name)
+			if ret != 0:
+				raise UserWarning("Could not checkout %s" % branch_name)
 
-			email = email.replace(u'\u00e1', 'a')
-			email = email.replace(u'\u00e3', 'a')
-			email = email.replace(u'\u00e9', 'e')
-			email = email.replace(u'\u00f3', 'o')
-			email = email.replace(u'\u00fd', 'y')
-			email = email.replace(u'\u0107', 'c')
-			email = email.replace(u'\u010d', 'c')
-			email = email.replace(u'\u0151', 'o')
-			email = email.replace(u'\u0161', 's')
+	update_branch_option = options["update-branch"]
 
-	return email
+	branch_treeish = update_meta()
 
-def command_pull(repo_name):
-	"""Pulls changes from the remote branch into the local branch of the pull
-	request"""
+	print
+	print color_text(
+		"Updating %s from %s complete" % (branch_name, update_branch_option), "success"
+	)
 
-	branch_name = get_current_branch_name()
 
-	print color_text("Pulling remote changes into %s" % branch_name, 'status')
-
-	pull_request_ID = get_pull_request_ID(branch_name)
-
-	pull_request = get_pull_request(repo_name, pull_request_ID)
-	repo_url = get_repo_url(pull_request, repo_name)
-
-	branch_name = build_branch_name(pull_request)
-	remote_branch_name = 'refs/pull/%s/head' % pull_request['number']
-
-	print color_text("Pulling from %s (%s)" % (repo_url, pull_request['head']['ref']), 'status')
-
-	ret = os.system('git pull %s %s' % (repo_url, remote_branch_name))
+def continue_update():
+	if options["update-method"] == "merge":
+		ret = os.system("git commit")
+	elif options["update-method"] == "rebase":
+		ret = os.system("git rebase --continue")
 
 	if ret != 0:
-		raise UserWarning("Pull failed, resolve conflicts")
-
-	print
-	print color_text("Updating %s from remote completed" % branch_name, 'success')
-	print
-	display_status()
-
-def complete_update(branch_name):
-	update_branch_option = options['update-branch']
-
-	if in_work_dir():
-		ret = os.system('git checkout %s' % update_branch_option)
-		if ret != 0:
-			raise UserWarning("Could not checkout %s branch in work directory" % update_branch_option)
-
-		original_dir_path = get_original_dir_path()
-
-		print color_text("Switching to original directory: '%s'" % original_dir_path, 'status')
-
-		os.chdir(original_dir_path)
-		chdir(original_dir_path)
-
-		if get_current_branch_name(False) == branch_name:
-			ret = os.system('git reset --hard && git clean -f')
-			if ret != 0:
-				raise UserWarning("Syncing branch %s with work directory failed" % branch_name)
-		else:
-			ret = os.system('git checkout %s' % branch_name)
-			if ret != 0:
-				raise UserWarning("Could not checkout %s" % branch_name)
-
-	update_branch_option = options['update-branch']
-
-	branch_treeish = update_meta()
-
-	print
-	print color_text("Updating %s from %s complete" % (branch_name, update_branch_option), 'success')
-
-def command_update_meta():
-	update_meta()
-
-def continue_update():
-	if options['update-method'] == 'merge':
-		ret = os.system('git commit')
-	elif options['update-method'] == 'rebase':
-		ret = os.system('git rebase --continue')
-
-	if ret != 0:
-		raise UserWarning("Updating from %s failed\nResolve conflicts and 'git add' files, then run 'gitpr continue-update'" % options['update-branch'])
+		raise UserWarning(
+			"Updating from %s failed\nResolve conflicts and 'git add' files, then run 'gitpr continue-update'"
+			% options["update-branch"]
+		)
 
 	# The branch name will not be correct until the merge/rebase is complete
 	branch_name = get_current_branch_name()
 
 	complete_update(branch_name)
 
+
 def display_pull_request(pull_request):
 	"""Nicely display_pull_request info about a given pull request"""
 
 	display_pull_request_minimal(pull_request)
 
-	description_indent = options['description-indent']
+	description_indent = options["description-indent"]
 
-	print "%s%s" % (description_indent, color_text(pull_request.get('html_url'), 'display-title-url'))
+	print "%s%s" % (
+		description_indent,
+		color_text(pull_request.get("html_url"), "display-title-url"),
+	)
 
-	pr_body = pull_request.get('body')
+	pr_body = pull_request.get("body")
 
 	if pr_body and pr_body.strip():
-		pr_body = re.sub('(<br\s?/?>)', '\n', pr_body.strip())
+		pr_body = strip_html_tags(pr_body)
+
+		pr_body = re.sub("(<br\s?/?>)", "\n", pr_body.strip())
 
-		if options['description-strip-newlines']:
-			pr_body = fill(pr_body, initial_indent=description_indent, subsequent_indent=description_indent, width=80)
+		if options["description-strip-newlines"]:
+			pr_body = fill(
+				pr_body,
+				initial_indent=description_indent,
+				subsequent_indent=description_indent,
+				width=80,
+			)
 		else:
 			# Normalize newlines
-			pr_body = re.sub('\r?\n', '\n', pr_body)
+			pr_body = re.sub("\r?\n", "\n", pr_body)
 
 			pr_body = pr_body.splitlines()
 
-			pr_body = [fill(line.strip(), initial_indent=description_indent, subsequent_indent=description_indent, width=80) for line in pr_body]
+			pr_body = [
+				fill(
+					line.strip(),
+					initial_indent=description_indent,
+					subsequent_indent=description_indent,
+					width=80,
+				)
+				for line in pr_body
+			]
+
+			pr_body = "\n".join(pr_body)
 
-			pr_body = '\n'.join(pr_body)
+		pr_body = strip_empty_lines(pr_body)
+
+		if ((options["description-line-limit"] >= 0) and (len(pr_body.splitlines()) > options["description-line-limit"])):
+			pr_body = pr_body.splitlines()
+			pr_body = pr_body[:options["description-line-limit"]]
+			pr_body = "\n".join(pr_body)
+			#pr_body += "..."
+
+		if ((options["description-char-limit"] >= 0) and (len(pr_body) > options["description-char-limit"])):
+			pr_body = pr_body[:options["description-char-limit"]] # + '...'
 
 		print pr_body
 
 	print
 
+
 def display_pull_request_minimal(pull_request, return_text=False):
 	"""Display minimal info about a given pull request"""
 
-	text = "%s - %s (%s)" % (color_text("REQUEST %s" % pull_request.get('number'), 'display-title-number', True), color_text(pull_request.get('title'), 'display-title-text', True), color_text(pull_request['user'].get('login'), 'display-title-user'))
+	text = "%s - %s (%s)" % (
+		color_text(
+			"REQUEST %s" % pull_request.get("number"), "display-title-number", True
+		),
+		color_text(pull_request.get("title"), "display-title-text", True),
+		color_text(pull_request["user"].get("login"), "display-title-user"),
+	)
 
 	if return_text:
 		return text
 
 	print text
 
+
 def display_status():
 	"""Displays the current branch name"""
 
@@ -1117,6 +1109,7 @@ def display_status():
 	print out
 	return out
 
+
 def fetch_pull_request(pull_request, repo_name):
 	"""Fetches a pull request into a local branch, and returns the name of the
 	local branch"""
@@ -1124,104 +1117,236 @@ def fetch_pull_request(pull_request, repo_name):
 	branch_name = build_branch_name(pull_request)
 	repo_url = get_repo_url(pull_request, repo_name)
 
-	remote_branch_name = 'refs/pull/%s/head' % pull_request['number']
+	remote_branch_name = "refs/pull/%s/head" % pull_request["number"]
 
-	ret = os.system('git show-ref --verify -q refs/heads/%s' % branch_name)
+	ret = os.system("git show-ref --verify -q refs/heads/%s" % branch_name)
 	# sha = os.popen('git rev-parse --abbrev-ref refs/heads/%s' % branch_name).read().strip()
 
 	# log(pull_request)
 
 	if ret != 0:
-		ret = os.system('git fetch %s "%s":%s' % (repo_url, remote_branch_name, branch_name))
-
+		ret = os.system(
+			'git fetch %s "%s":%s' % (repo_url, remote_branch_name, branch_name)
+		)
 
 	if ret != 0:
-		ret = os.system('git show-ref --verify refs/heads/%s' % branch_name)
+		ret = os.system("git show-ref --verify refs/heads/%s" % branch_name)
 
 	if ret != 0:
-		print "Could not get from refs/pull/%s/head, trying to brute force the fetch" % pull_request['number']
+		print "Could not get from refs/pull/%s/head, trying to brute force the fetch" % pull_request[
+			"number"
+		]
 
 		repo_url = get_repo_url(pull_request, repo_name, True)
-		remote_branch_name = pull_request['head']['ref']
+		remote_branch_name = pull_request["head"]["ref"]
 
-		ret = os.system('git fetch %s "%s":%s' % (repo_url, remote_branch_name, branch_name))
+		ret = os.system(
+			'git fetch %s "%s":%s' % (repo_url, remote_branch_name, branch_name)
+		)
 
 		if ret != 0:
-			ret = os.system('git show-ref --verify refs/heads/%s' % branch_name)
+			ret = os.system("git show-ref --verify refs/heads/%s" % branch_name)
 
 		if ret != 0:
 			raise UserWarning("Fetch failed")
 
 	try:
-		os.remove(get_tmp_path('git-pull-request-treeish-%s' % pull_request['number']))
+		os.remove(get_tmp_path("git-pull-request-treeish-%s" % pull_request["number"]))
 	except OSError:
 		pass
 
 	return branch_name
 
-def get_current_branch_name(ensure_pull_request = True):
+
+def get_api_url(command):
+	return URL_BASE % command
+
+
+def get_current_branch_name(ensure_pull_request=True):
 	"""Returns the name of the current pull request branch"""
-	branch_name = os.popen('git rev-parse --abbrev-ref HEAD').read().strip()
+	branch_name = os.popen("git rev-parse --abbrev-ref HEAD").read().strip()
 
-	if ensure_pull_request and branch_name[0:13] != 'pull-request-':
+	if ensure_pull_request and branch_name[0:13] != "pull-request-":
 		raise UserWarning("Invalid branch: not a pull request")
 
 	return branch_name
 
+
 def get_default_repo_name():
-	repo_name = os.popen('git config github.repo').read().strip()
+	repo_name = os.popen("git config github.repo").read().strip()
 
 	# get repo name from origin
-	if repo_name is None or repo_name == '':
-		repo_name = get_repo_name_for_remote('origin')
+	if repo_name is None or repo_name == "":
+		repo_name = get_repo_name_for_remote("origin")
 
-	if repo_name is None or repo_name == '':
+	if repo_name is None or repo_name == "":
 		raise UserWarning("Failed to determine github repository name")
 
 	return repo_name
 
+
 def get_git_base_path():
-	return os.popen('git rev-parse --show-toplevel').read().strip()
+	return os.popen("git rev-parse --show-toplevel").read().strip()
+
+
+def get_jira_ticket(text):
+	"""Returns a JIRA ticket id from the passed text, or a blank string otherwise"""
+	m = re.search("[A-Z]{3,}-\d+", text)
+
+	jira_ticket = ""
+
+	if m != None and m.group(0) != "":
+		jira_ticket = m.group(0)
+
+	return jira_ticket
+
 
 def get_original_dir_path():
 	git_base_path = get_git_base_path()
 
-	f = open(os.path.join(get_work_dir(), '.git', 'original_dir_path'), 'rb')
+	f = open(os.path.join(get_work_dir(), ".git", "original_dir_path"), "rb")
 	original_dir_path = f.read()
 	f.close()
 
-	if original_dir_path == None or original_dir_path == '':
-		config_path = os.readlink(os.path.join(git_base_path, '.git', 'config'))
+	if original_dir_path == None or original_dir_path == "":
+		config_path = os.readlink(os.path.join(git_base_path, ".git", "config"))
 		original_dir_path = os.path.dirname(os.path.dirname(config_path))
 
 	return original_dir_path
 
-def get_work_dir():
-	global _work_dir
 
-	if (_work_dir == None):
-		symbolic_ref = os.popen('git symbolic-ref HEAD').read().strip().replace('refs/heads/', '')
-		work_dir_global = options['work-dir']
+def get_pr_stats(repo_name, pull_request_ID):
+	if pull_request_ID != None:
+		try:
+			pull_request_ID = int(pull_request_ID)
+			pull_request = get_pull_request(repo_name, pull_request_ID)
+		except Exception, e:
+			pull_request = pull_request_ID
 
-		work_dir_option = None
+		display_pull_request_minimal(pull_request)
 
-		if symbolic_ref:
-			work_dir_option = 'work-dir-%s' % symbolic_ref
+		branch_name = build_branch_name(pull_request)
+		ret = os.system("git show-ref --verify -q refs/heads/%s" % branch_name)
 
-		if work_dir_option:
-			_work_dir = os.popen('git config git-pull-request.%s' % work_dir_option).read().strip()
-			options[work_dir_option] = _work_dir
+		if ret != 0:
+			branch_name = fetch_pull_request(pull_request, repo_name)
 
-		if not _work_dir or not os.path.exists(_work_dir):
-			_work_dir = False
+			ret = os.system("git show-ref --verify -q refs/heads/%s" % branch_name)
 
-		if not _work_dir:
-			if work_dir_global and os.path.exists(work_dir_global):
-				_work_dir = work_dir_global
-			else:
-				_work_dir = False
+			if ret != 0:
+				raise UserWarning("Fetch failed")
+
+		merge_base = (
+			os.popen("git merge-base %s %s" % (options["update-branch"], branch_name))
+			.read()
+			.strip()
+		)
+
+		shortstat = (
+			os.popen(
+				"git --no-pager diff --shortstat {0}..{1}".format(
+					merge_base, branch_name
+				)
+			)
+			.read()
+			.strip()
+		)
+		stat_fragments = shortstat.split(", ")
+		stats_arr = shortstat.split(" ")
+
+		has_color = False
+		for index, frag in enumerate(stat_fragments):
+			color_type = None
+			if "changed" in frag:
+				color_type = "total"
+			elif "insertions" in frag:
+				color_type = "added"
+			elif "deletions" in frag:
+				color_type = "deleted"
+
+			if color_type:
+				has_color = True
+				stat_fragments[index] = color_text(frag, "stats-%s" % color_type)
+
+		if has_color:
+			shortstat = ", ".join(stat_fragments)
+
+		dels = 0
+		if len(stats_arr) > 5:
+			dels = int(stats_arr[5])
+
+		stats = (int(stats_arr[3]) + dels) / int(stats_arr[0])
+
+		stats = color_text(
+			"Average %d change(s) per file" % stats, "stats-average-change"
+		)
+
+		ret = (
+			os.popen(
+				"echo '{2}, {3}' && git diff --numstat --pretty='%H' --no-renames {0}..{1} | xargs -0n1 echo -n | cut -f 3- | sed -e 's/^.*\.\(.*\)$/\\1/' | sort | uniq -c | tr '\n' ',' | sed 's/,$//'".format(
+					merge_base, branch_name, shortstat, stats
+				)
+			)
+			.read()
+			.strip()
+		)
+
+		print ret
+
+		stats_footer = options["stats-footer"]
+
+		if stats_footer:
+			committers = (
+				os.popen(
+					"git log {0}..{1} --pretty='%an' --reverse | awk ' !x[$0]++'".format(
+						merge_base, branch_name
+					)
+				)
+				.read()
+				.strip()
+			)
+			committers = committers.split(os.linesep)
+			committers = ", ".join(committers)
+
+			fn = False
+
+			if stats_footer.startswith("`"):
+				stats_footer = stats_footer[1:]
+				fn = True
+
+			footer_tpl = Template(stats_footer)
+
+			committers = committers.decode("utf-8")
+
+			pr_obj = pull_request.copy()
+			pr_obj.update(
+				{
+					"merge_base": merge_base[0:8],
+					"branch_name": branch_name,
+					"committers": committers,
+					"NEWLINE": os.linesep,
+				}
+			)
+
+			footer_result = footer_tpl.safe_substitute(**pr_obj)
+
+			if fn:
+				footer_result = (
+					os.popen(footer_result.encode("utf-8"))
+					.read()
+					.strip()
+					.decode("utf-8")
+				)
+
+			print footer_result
+
+		print
+	else:
+		pull_requests = get_pull_requests(repo_name, options["filter-by-update-branch"])
+
+		for pull_request in pull_requests:
+			get_pr_stats(repo_name, pull_request)
 
-	return _work_dir
 
 def get_pull_request(repo_name, pull_request_ID):
 	"""Returns information retrieved from github about the pull request"""
@@ -1232,6 +1357,20 @@ def get_pull_request(repo_name, pull_request_ID):
 
 	return data
 
+
+def get_pull_request_ID(branch_name):
+	"""Returns the pull request number of the branch with the name"""
+
+	m = re.search("^pull-request-(\d+)", branch_name)
+
+	pull_request_ID = None
+
+	if m and m.group(1) != "":
+		pull_request_ID = int(m.group(1))
+
+	return pull_request_ID
+
+
 def get_pull_requests(repo_name, filter_by_update_branch=False):
 	"""Returns information retrieved from github about the open pull requests on
 	the repository"""
@@ -1241,57 +1380,133 @@ def get_pull_requests(repo_name, filter_by_update_branch=False):
 	pulls = github_json_request(url)
 
 	if filter_by_update_branch:
-		update_branch = options['update-branch']
+		update_branch = options["update-branch"]
 
-		pull_requests = [pull for pull in pulls if pull['base']['ref'] == update_branch]
+		pull_requests = [pull for pull in pulls if pull["base"]["ref"] == update_branch]
 	else:
 		pull_requests = pulls
 
 	return pull_requests
 
-def get_pull_request_ID(branch_name):
-	"""Returns the pull request number of the branch with the name"""
-
-	m = re.search("^pull-request-(\d+)", branch_name)
-
-	pull_request_ID = None
-
-	if m and m.group(1) != '':
-		pull_request_ID = int(m.group(1))
-
-	return pull_request_ID
 
 def get_repo_name_for_remote(remote_name):
 	"""Returns the repository name for the remote with the name"""
 
-	remotes = os.popen('git remote -v').read()
+	remotes = os.popen("git remote -v").read()
 
-	m = re.search("^%s[^\n]+?github\.com[^\n]*?[:/]([^\n]+?)\.git" % remote_name, remotes, re.MULTILINE)
+	m = re.search(
+		"^%s[^\n]+?github\.com[^\n]*?[:/]([^\n]+?)\.git" % remote_name,
+		remotes,
+		re.MULTILINE,
+	)
 
-	if m is not None and m.group(1) != '':
+	if m is not None and m.group(1) != "":
 		return m.group(1)
 
-def get_repo_url(pull_request, repo_name, force = False):
+
+def get_repo_url(pull_request, repo_name, force=False):
 	"""Returns the git URL of the repository the pull request originated from"""
 
 	if force is False:
-		repo_url = 'git@github.com:%s.git' % repo_name
+		repo_url = "git@github.com:%s.git" % repo_name
 	else:
-		repo_url = pull_request['head']['repo']['html_url'].replace('https', 'git')
-		private_repo = pull_request['head']['repo']['private']
+		repo_url = pull_request["head"]["repo"]["html_url"].replace("https", "git")
+		private_repo = pull_request["head"]["repo"]["private"]
 
 		if private_repo:
-			repo_url = pull_request['head']['repo']['ssh_url']
+			repo_url = pull_request["head"]["repo"]["ssh_url"]
 
 	return repo_url
 
-def get_api_url(command):
-	return URL_BASE % command
 
 def get_tmp_path(filename):
 	return TMP_PATH % filename
 
-def github_request(url, params = None, authenticate = True):
+
+def get_user_email(github_user_info):
+	email = None
+
+	if "email" in github_user_info:
+		email = github_user_info["email"]
+
+		if email != None and email.endswith("@liferay.com"):
+			email = email[:-12]
+
+			if email.isdigit():
+				email = None
+		else:
+			email = None
+
+	if email == None:
+		if (
+			"name" in github_user_info
+			and github_user_info["name"] != None
+			and " " in github_user_info["name"]
+		):
+			email = github_user_info["name"].lower()
+			email = email.replace(" ", ".")
+			email = email.replace("(", ".")
+			email = email.replace(")", ".")
+
+			email = re.sub("\.+", ".", email)
+
+			# Unicode characters usually do not appear in Liferay emails, so
+			# we'll replace them with the closest ASCII equivalent
+
+			email = email.replace(u"\u00e1", "a")
+			email = email.replace(u"\u00e3", "a")
+			email = email.replace(u"\u00e9", "e")
+			email = email.replace(u"\u00f3", "o")
+			email = email.replace(u"\u00fd", "y")
+			email = email.replace(u"\u0107", "c")
+			email = email.replace(u"\u010d", "c")
+			email = email.replace(u"\u0151", "o")
+			email = email.replace(u"\u0161", "s")
+
+	return email
+
+
+def get_work_dir():
+	global _work_dir
+
+	if _work_dir == None:
+		symbolic_ref = (
+			os.popen("git symbolic-ref HEAD").read().strip().replace("refs/heads/", "")
+		)
+		work_dir_global = options["work-dir"]
+
+		work_dir_option = None
+
+		if symbolic_ref:
+			work_dir_option = "work-dir-%s" % symbolic_ref
+
+		if work_dir_option:
+			_work_dir = (
+				os.popen("git config git-pull-request.%s" % work_dir_option)
+				.read()
+				.strip()
+			)
+			options[work_dir_option] = _work_dir
+
+		if not _work_dir or not os.path.exists(_work_dir):
+			_work_dir = False
+
+		if not _work_dir:
+			if work_dir_global and os.path.exists(work_dir_global):
+				_work_dir = work_dir_global
+			else:
+				_work_dir = False
+
+	return _work_dir
+
+
+def github_json_request(url, params=None):
+	data = json.loads(github_request(url, params))
+
+	return data
+
+
+def github_request(url, params=None, token=None):
 	if params is not None:
 		encode_data = params
 
@@ -1302,81 +1517,80 @@ def github_request(url, params = None, authenticate = True):
 	else:
 		req = urllib2.Request(url)
 
-	if authenticate == 'basic':
-		passwd = getpass.getpass("Github password: ").strip()
-
-		auth_string = base64.encodestring('%s:%s' % (auth_username, passwd)).strip()
-
-		authorize_request(req, auth_string, "Basic")
-	elif authenticate == True:
-		authorize_request(req)
+	authorize_request(req, token)
 
 	if DEBUG:
 		print url
 
+	req.add_header("Accept", "application/vnd.github.v3+json")
+
 	try:
 		response = urllib2.urlopen(req)
 	except urllib2.URLError, msg:
-		if authenticate and msg.code == 401 and auth_token:
-			print ""
-			print color_text('Could not authorize you to connect with Github. Try running "git config --global --unset github.oauth-token" and running your command again to reauthenticate.', 'error')
-			print ""
+		if msg.code == 401 and auth_token:
+			raise UserWarning(
+				'Could not authorize you to connect with Github. Try running "git config --global --unset github.oauth-token" and running your command again to reauthenticate.'
+			)
 
-		raise UserWarning("Error communicating with github: \n%s\n%s" % (url, msg))
+		raise UserWarning("Could not authorize you to connect with Github.")
 
 	data = response.read()
 
 	MAP_RESPONSE[url] = response
 
-	if data == '':
+	if data == "":
 		raise UserWarning("Invalid response from github")
 
 	return data
 
-def github_json_request(url, params = None, authenticate = True):
-	data = json.loads(github_request(url, params, authenticate))
-
-	return data
 
 def in_work_dir():
 	git_base_path = get_git_base_path()
 
 	work_dir = get_work_dir()
 
-	return isinstance(work_dir, str) and git_base_path.lower() == work_dir.lower() and os.path.islink(os.path.join(git_base_path, '.git', 'config'))
+	return (
+		isinstance(work_dir, str)
+		and git_base_path.lower() == work_dir.lower()
+		and os.path.islink(os.path.join(git_base_path, ".git", "config"))
+	)
+
 
 def load_options():
-	all_config = os.popen('git config -l').read().strip()
-	git_base_path = os.popen('git rev-parse --show-toplevel').read().strip()
+	all_config = os.popen("git config -l").read().strip()
+	git_base_path = os.popen("git rev-parse --show-toplevel").read().strip()
 
 	path_prefix = "%s." % git_base_path
 
 	overrides = {}
 
-	matches = re.findall("^git-pull-request\.([^=]+)=([^\n]*)$", all_config, re.MULTILINE)
+	matches = re.findall(
+		"^git-pull-request\.([^=]+)=([^\n]*)$", all_config, re.MULTILINE
+	)
 
 	for k in matches:
 		key = k[0]
 		value = k[1]
 
-		if value.lower() in ('f', 'false', 'no'):
+		if value.lower() in ("f", "false", "no"):
 			value = False
-		elif value.lower() in ('t', 'true', 'yes'):
+		elif value.lower() in ("t", "true", "yes"):
 			value = True
-		elif value.lower() in ('', 'none', 'null', 'nil'):
+		elif value.lower() in ("", "none", "null", "nil"):
 			value = None
 
 		if key.find(path_prefix) == -1:
 			options[key] = value
 		else:
-			key = key.replace(path_prefix, '')
+			key = key.replace(path_prefix, "")
 			overrides[key] = value
 
 	options.update(overrides)
 
+
 def load_users(filename):
 	try:
-		github_users_file = open(filename, 'r')
+		github_users_file = open(filename, "r")
 	except IOError:
 		print "File %s could not be found. Using email names will not be available. Run the update-users command to enable this functionality" % filename
 		return {}
@@ -1387,79 +1601,51 @@ def load_users(filename):
 
 	return github_users
 
-def meta(key = None, value = None):
-	branch_name = get_current_branch_name(False)
-
-	pull_request_ID = get_pull_request_ID(branch_name)
-
-	val = None
-
-	if pull_request_ID is not None:
-		meta_data_path = get_tmp_path('git-pull-request-treeish-%s' % pull_request_ID)
-
-		try:
-			f = open(meta_data_path, 'r+')
-			current_value = json.load(f)
-			current_obj = current_value
-
-			val = current_value
-
-			if key != None:
-				pieces = key.split('.')
-
-				key = pieces.pop()
-
-				for word in pieces:
-					current_obj = current_obj[word]
-
-				if value == None:
-					if key in current_obj:
-						val = current_obj[key]
-					else:
-						val = ''
-
-			if value != None:
-				val = value
-				current_obj[key] = value
-				f.seek(0)
-				f.truncate(0)
-				json.dump(current_value, f)
-
-			f.close()
-
-			return val
-
-		except Exception, e:
-			log("Could not update '%s' with '%s'" % (key, value))
 
+def log(*args):
+	for arg in args:
+		print json.dumps(arg, sort_keys=True, indent=4)
+		print "/---"
 
 
-def update_meta():
-	branch_name = get_current_branch_name()
-	update_branch_option = options['update-branch']
-	parent_commit = os.popen('git merge-base %s %s' % (update_branch_option, branch_name)).read().strip()[0:10]
-	head_commit = os.popen('git rev-parse HEAD').read().strip()[0:10]
+def lookup_alias(key):
+	user_alias = key
 
-	updated = {
-		'parent_commit': parent_commit,
-		'head_commit': head_commit
-	}
+	try:
+		if users and (key in users) and users[key]:
+			user_alias = users[key]
+	except Exception, e:
+		pass
 
-	meta('updated', updated)
+	return user_alias
 
-	if parent_commit == head_commit:
-		branch_treeish = head_commit
-	else:
-		branch_treeish = '%s..%s' % (parent_commit, head_commit)
 
-	print color_text("Original commits: %s" % branch_treeish, 'status')
+def main():
+	global DEBUG
+	global FORCE_COLOR
 
-	return branch_treeish
+	FORCE_COLOR = False
 
-def main():
 	# parse command line options
 	try:
-		opts, args = getopt.gnu_getopt(sys.argv[1:], 'hqar:u:l:b:', ['help', 'quiet', 'all', 'repo=', 'reviewer=', 'update', 'no-update', 'user=', 'update-branch=', 'authenticate', 'debug', 'force-color'])
+		opts, args = getopt.gnu_getopt(
+			sys.argv[1:],
+			"hqar:u:l:b:",
+			[
+				"help",
+				"quiet",
+				"all",
+				"repo=",
+				"reviewer=",
+				"update",
+				"no-update",
+				"user=",
+				"update-branch=",
+				"authenticate",
+				"debug",
+				"force-color",
+			],
+		)
 	except getopt.GetoptError, e:
 		raise UserWarning("%s\nFor help use --help" % e)
 
@@ -1469,7 +1655,7 @@ def main():
 	if arg_length > 0:
 		command = args[0]
 
-	if command == 'help':
+	if command == "help":
 		command_help()
 		sys.exit(0)
 
@@ -1478,28 +1664,28 @@ def main():
 
 	global users, DEFAULT_USERNAME
 	global _work_dir
-	global DEBUG, FORCE_COLOR
-	global auth_username, auth_token
+	global auth_token
 
-	DEBUG = options['debug-mode']
-	FORCE_COLOR = False
+	DEBUG = options["debug-mode"]
 
 	_work_dir = None
 
 	repo_name = None
 	reviewer_repo_name = None
 
-	username = os.popen('git config github.user').read().strip()
+	username = os.popen("git config github.user").read().strip()
 
-	auth_token = os.popen('git config github.oauth-token').read().strip()
+	auth_token = os.popen("git config github.oauth-token").read().strip()
 
-	fetch_auto_update = options['fetch-auto-update']
+	fetch_auto_update = options["fetch-auto-update"]
 
 	info_user = username
-	submitOpenGitHub = options['submit-open-github']
+	submitOpenGitHub = options["submit-open-github"]
 
 	# manage github usernames
-	users_alias_file = os.popen('git config git-pull-request.users-alias-file').read().strip()
+	users_alias_file = (
+		os.popen("git config git-pull-request.users-alias-file").read().strip()
+	)
 
 	if len(users_alias_file) == 0:
 		users_alias_file = "git-pull-request.users"
@@ -1509,132 +1695,111 @@ def main():
 
 	# process options
 	for o, a in opts:
-		if o in ('-h', '--help'):
+		if o in ("-h", "--help"):
 			command_help()
 			sys.exit(0)
-		elif o in ('-q', '--quiet'):
+		elif o in ("-q", "--quiet"):
 			submitOpenGitHub = False
-		elif o in ('-a', '--all'):
-			options['filter-by-update-branch'] = False
-		elif o in ('-r', '--repo'):
-			if re.search('/', a):
+		elif o in ("-a", "--all"):
+			options["filter-by-update-branch"] = False
+		elif o in ("-r", "--repo"):
+			if re.search("/", a):
 				repo_name = a
 			else:
 				repo_name = get_repo_name_for_remote(a)
-		elif o in ('-b', '--update-branch'):
-			options['update-branch'] = a
-		elif o in ('-u', '--user', '--reviewer'):
+		elif o in ("-b", "--update-branch"):
+			options["update-branch"] = a
+		elif o in ("-u", "--user", "--reviewer"):
 			reviewer_repo_name = a
 			info_user = lookup_alias(a)
-		elif o == '--update':
+		elif o == "--update":
 			fetch_auto_update = True
-		elif o == '--no-update':
+		elif o == "--no-update":
 			fetch_auto_update = False
-		elif o == '--authenticate':
-			username = ''
-			auth_token = ''
-		elif o == '--debug':
+		elif o == "--authenticate":
+			username = ""
+			auth_token = ""
+		elif o == "--debug":
 			DEBUG = True
-		elif o == '--force-color':
+		elif o == "--force-color":
 			FORCE_COLOR = True
 
-	if len(username) == 0:
-		username = raw_input("Github username: ").strip()
-		os.system("git config --global github.user %s" % username)
-
-	auth_username = username
-
 	if len(auth_token) == 0:
-		# Get a list of the current authorized apps and check if we already have a token
-		current_oauth_list = github_json_request('https://api.github.com/authorizations', None, 'basic')
-		oauth_token = None
-
-		for cur in current_oauth_list:
-			if cur['note'] == SCRIPT_NOTE:
-				oauth_token = cur['token']
-
-		# If we don't have a token, let's create one
-		if not oauth_token:
-			oauth_data = github_json_request(
-				'https://api.github.com/authorizations',
-				'{"scopes": ["repo"],"note": "%s"}' % SCRIPT_NOTE,
-				'basic'
-			)
+		token = getpass.getpass("Github token: ").strip()
 
-			oauth_token = oauth_data['token']
+		# check if the token is valid
+		github_request("https://api.github.com/user/repos", None, token)
 
-		if oauth_token:
-			auth_token = oauth_token
-			os.system("git config --global github.oauth-token %s" % oauth_token)
-		else:
-			raise UserWarning('Could not authenticate you with Github')
+		auth_token = token
+
+		os.system("git config --global github.oauth-token %s" % auth_token)
 
-	# get repo name from git config
-	if repo_name is None or repo_name == '':
+		# get repo name from git config
+	if repo_name is None or repo_name == "":
 		repo_name = get_default_repo_name()
 
-	if (not reviewer_repo_name) and (command == 'submit'):
-		reviewer_repo_name = os.popen('git config github.reviewer').read().strip()
+	if (not reviewer_repo_name) and (command == "submit"):
+		reviewer_repo_name = os.popen("git config github.reviewer").read().strip()
 
 	if reviewer_repo_name:
 		reviewer_repo_name = lookup_alias(reviewer_repo_name)
 
 		if command != "submit":
-			repo_name = reviewer_repo_name + '/' + repo_name.split('/')[1]
+			repo_name = reviewer_repo_name + "/" + repo_name.split("/")[1]
 
 	DEFAULT_USERNAME = username
 
 	# process arguments
-	if command == 'show':
+	if command == "show":
 		command_show(repo_name)
 	elif arg_length > 0:
-		if command == 'alias':
+		if command == "alias":
 			if arg_length >= 2:
 				command_alias(args[1], args[2], users_alias_file)
-		elif command == 'close':
+		elif command == "close":
 			if arg_length >= 2:
 				comment = args[1]
 				pull_request_ID = comment
 
 				if comment.isdigit():
-					comment = ''
+					comment = ""
 
 					if arg_length == 3:
 						comment = args[2]
 
-					print color_text("Closing pull request", 'status')
+					print color_text("Closing pull request", "status")
 					close_pull_request(repo_name, pull_request_ID, comment)
 				else:
 					command_close(repo_name, comment)
 			else:
 				command_close(repo_name)
-		elif command in ('continue-update', 'cu'):
+		elif command in ("continue-update", "cu"):
 			command_continue_update()
-		elif command == 'fetch':
+		elif command == "fetch":
 			command_fetch(repo_name, args[1], fetch_auto_update)
-		elif command == 'fetch-all':
+		elif command == "fetch-all":
 			command_fetch_all(repo_name)
-		elif command == 'help':
+		elif command == "help":
 			command_help()
-		elif command == 'info':
+		elif command == "info":
 			command_info(info_user)
-		elif command == 'info-detailed':
+		elif command == "info-detailed":
 			command_info(info_user, True)
-		elif command == 'merge':
+		elif command == "merge":
 			if arg_length >= 2:
 				command_merge(repo_name, args[1])
 			else:
 				command_merge(repo_name)
-		elif command == 'open':
+		elif command == "open":
 			if arg_length >= 2:
 				command_open(repo_name, args[1])
 			else:
 				command_open(repo_name)
-		elif command == 'pull':
+		elif command == "pull":
 			command_pull(repo_name)
-		elif command == 'update-meta':
+		elif command == "update-meta":
 			command_update_meta()
-		elif command == 'submit':
+		elif command == "submit":
 			pull_body = None
 			pull_title = None
 
@@ -1644,18 +1809,27 @@ def main():
 			if arg_length >= 3:
 				pull_title = args[2]
 
-			command_submit(repo_name, username, reviewer_repo_name, pull_body, pull_title, submitOpenGitHub)
-		elif command == 'update':
+			command_submit(
+				repo_name,
+				username,
+				reviewer_repo_name,
+				pull_body,
+				pull_title,
+				submitOpenGitHub,
+			)
+		elif command == "update":
 			if arg_length >= 2:
-					command_update(repo_name, args[1])
+				command_update(repo_name, args[1])
 			else:
-				command_update(repo_name, options['update-branch'])
-		elif command == 'update-users':
+				command_update(repo_name, options["update-branch"])
+		elif command == "update-users":
 			command_update_users(users_alias_file)
-		elif command == 'show-alias':
+		elif command == "show-alias":
 			if arg_length >= 2:
 				command_show_alias(args[1])
-		elif command == 'stats' or args[0] == 'stat':
+		elif command == "comment":
+			command_comment(repo_name, *args[1:])
+		elif command == "stats" or args[0] == "stat":
 			pull_request_ID = None
 
 			if arg_length >= 2:
@@ -1665,24 +1839,60 @@ def main():
 		else:
 			command_fetch(repo_name, args[0], fetch_auto_update)
 
-def lookup_alias(key):
-	user_alias = key
 
-	try:
-		if users and (key in users) and users[key]:
-			user_alias = users[key]
-	except Exception, e:
-		pass
+def meta(key=None, value=None):
+	branch_name = get_current_branch_name(False)
+
+	pull_request_ID = get_pull_request_ID(branch_name)
+
+	val = None
+
+	if pull_request_ID is not None:
+		meta_data_path = get_tmp_path("git-pull-request-treeish-%s" % pull_request_ID)
+
+		try:
+			f = open(meta_data_path, "r+")
+			current_value = json.load(f)
+			current_obj = current_value
+
+			val = current_value
+
+			if key != None:
+				pieces = key.split(".")
+
+				key = pieces.pop()
+
+				for word in pieces:
+					current_obj = current_obj[word]
+
+				if value == None:
+					if key in current_obj:
+						val = current_obj[key]
+					else:
+						val = ""
+
+			if value != None:
+				val = value
+				current_obj[key] = value
+				f.seek(0)
+				f.truncate(0)
+				json.dump(current_value, f)
+
+			f.close()
+
+			return val
+
+		except Exception, e:
+			log("Could not update '%s' with '%s'" % (key, value))
 
-	return user_alias
 
 def open_URL(url):
-	if (os.popen('command -v open').read().strip() != ''):
+	if os.popen("command -v open").read().strip() != "":
 		ret = os.system('open -g "%s" 2>/dev/null' % url)
 
 		if ret != 0:
 			os.system('open "%s"' % url)
-	elif (os.popen('command -v cygstart').read().strip() != ''):
+	elif os.popen("command -v cygstart").read().strip() != "":
 		os.system('cygstart "%s"' % url)
 	else:
 		try:
@@ -1690,59 +1900,117 @@ def open_URL(url):
 		except Exception:
 			pass
 
+
 def post_comment(repo_name, pull_request_ID, comment):
 	url = get_api_url("repos/%s/issues/%s/comments" % (repo_name, pull_request_ID))
-	params = {'body': comment}
+	params = {"body": comment}
 
 	github_json_request(url, params)
 
+
+def strip_empty_lines(text):
+	lines = text.splitlines()
+	while lines and not lines[0].strip():
+		lines.pop(0)
+	while lines and not lines[-1].strip():
+		lines.pop()
+	return "\n".join(lines)
+
+
+def strip_html_tags(html_raw):
+	html = ""
+	quote = False
+	tag = False
+
+	for line in re.sub("<html>([\s\S]*?)</html>", "", html_raw):
+			if line == '<' and not quote:
+				tag = True
+			elif line == '>' and not quote:
+				tag = False
+			elif (line == '"' or line == "'") and tag:
+				quote = not quote
+			elif not tag:
+				html += line
+
+	return html
+
+
 def update_branch(branch_name):
 	if in_work_dir():
-		raise UserWarning("Cannot perform an update from within the work directory.\nIf you are done fixing conflicts run 'gitpr continue-update' to complete the update.")
+		raise UserWarning(
+			"Cannot perform an update from within the work directory.\nIf you are done fixing conflicts run 'gitpr continue-update' to complete the update."
+		)
 
 	work_dir = get_work_dir()
 
 	if work_dir:
 		original_dir_path = get_git_base_path()
 
-		print color_text("Switching to work directory %s" % work_dir, 'status')
+		print color_text("Switching to work directory %s" % work_dir, "status")
 		os.chdir(work_dir)
 
-		f = open(os.path.join(work_dir, '.git', 'original_dir_path'), 'wb')
+		f = open(os.path.join(work_dir, ".git", "original_dir_path"), "wb")
 		f.write(original_dir_path)
 		f.close()
 
-		ret = os.system('git reset --hard && git clean -f')
+		ret = os.system("git reset --hard && git clean -f")
 		if ret != 0:
 			raise UserWarning("Cleaning up work directory failed, update not performed")
 
-	ret = os.system('git checkout %s' % branch_name)
+	ret = os.system("git checkout %s" % branch_name)
 	if ret != 0:
 		if work_dir:
-			raise UserWarning("Could not checkout %s in the work directory, update not performed" % branch_name)
+			raise UserWarning(
+				"Could not checkout %s in the work directory, update not performed"
+				% branch_name
+			)
 		else:
-			raise UserWarning("Could not checkout %s, update not performed" % branch_name)
+			raise UserWarning(
+				"Could not checkout %s, update not performed" % branch_name
+			)
 
-	update_branch_option = options['update-branch']
+	update_branch_option = options["update-branch"]
 
-	ret = os.system('git %(update-method)s %(update-branch)s' % (options))
+	ret = os.system("git %(update-method)s %(update-branch)s" % (options))
 
 	if ret != 0:
 		if work_dir:
 			chdir(work_dir)
-		raise UserWarning("Updating %s from %s failed\nResolve conflicts and 'git add' files, then run 'gitpr continue-update'" % (branch_name, update_branch_option))
+		raise UserWarning(
+			"Updating %s from %s failed\nResolve conflicts and 'git add' files, then run 'gitpr continue-update'"
+			% (branch_name, update_branch_option)
+		)
 
 	complete_update(branch_name)
 
 
-def log(*args):
-	for arg in args:
-		print json.dumps(arg, sort_keys=True, indent=4)
-		print "/---"
+def update_meta():
+	branch_name = get_current_branch_name()
+	update_branch_option = options["update-branch"]
+	parent_commit = (
+		os.popen("git merge-base %s %s" % (update_branch_option, branch_name))
+		.read()
+		.strip()[0:10]
+	)
+	head_commit = os.popen("git rev-parse HEAD").read().strip()[0:10]
+
+	updated = {"parent_commit": parent_commit, "head_commit": head_commit}
+
+	meta("updated", updated)
+
+	if parent_commit == head_commit:
+		branch_treeish = head_commit
+	else:
+		branch_treeish = "%s..%s" % (parent_commit, head_commit)
+
+	print color_text("Original commits: %s" % branch_treeish, "status")
+
+	return branch_treeish
+
 
 if __name__ == "__main__":
 	try:
 		main()
 	except UserWarning, e:
-		print color_text(e, 'error')
+		print color_text(e, "error")
 		sys.exit(1)
\ No newline at end of file