From: Patrick Mézard <patrick@mezard.eu>
Date: Mon, 24 Feb 2014 15:11:37 +0000 (-0500)
Subject: codereview: remove unused upload_options.revision
X-Git-Tag: go1.3beta1~617
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=dd449a1cfa02c908393c927920474c1fe017558f;p=gostls13.git

codereview: remove unused upload_options.revision

LGTM=rsc
R=golang-codereviews, rsc
CC=golang-codereviews
https://golang.org/cl/60640052
---

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index e19d601ffd..67341ebc37 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -2656,7 +2656,6 @@ def RietveldSetup(ui, repo):
 	upload_options.message = None
 	upload_options.issue = None
 	upload_options.download_base = False
-	upload_options.revision = None
 	upload_options.send_mail = False
 	upload_options.vcs = None
 	upload_options.server = server
@@ -3435,18 +3434,16 @@ class MercurialVCS(VersionControlSystem):
 		cwd = os.path.normpath(os.getcwd())
 		assert cwd.startswith(self.repo_dir)
 		self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/")
-		if self.options.revision:
-			self.base_rev = self.options.revision
+		mqparent, err = RunShellWithReturnCode(['hg', 'log', '--rev', 'qparent', '--template={node}'])
+		if not err and mqparent != "":
+			self.base_rev = mqparent
 		else:
-			mqparent, err = RunShellWithReturnCode(['hg', 'log', '--rev', 'qparent', '--template={node}'])
-			if not err and mqparent != "":
-				self.base_rev = mqparent
-			else:
-				out = RunShell(["hg", "parents", "-q"], silent_ok=True).strip()
-				if not out:
-					# No revisions; use 0 to mean a repository with nothing.
-					out = "0:0"
-				self.base_rev = out.split(':')[1].strip()
+			out = RunShell(["hg", "parents", "-q"], silent_ok=True).strip()
+			if not out:
+				# No revisions; use 0 to mean a repository with nothing.
+				out = "0:0"
+			self.base_rev = out.split(':')[1].strip()
+
 	def _GetRelPath(self, filename):
 		"""Get relative path of a file according to the current directory,
 		given its logical path in the repo."""