From 2f3c3316e497faafa1e6f3e9cb40828d0eeb9812 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@arista.com>
Date: Tue, 21 Jul 2020 19:40:38 -0700
Subject: [PATCH] Update revisionId if required when using extend-project

When a hard revision ID is provided in a regular project tag then the
revisionId is updated as well if it is a commit hash.  The difference
is that if the revisionExpr is a commit, git-repo needs to update
refs/remotes/m/master with update-ref not symbolic-ref, as the latter
must refer to another ref, not to a specific commit.

Change-Id: I215a62dabb30225e480ad2c731416d775fc0c750
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/310963
Tested-by: Michael Kelly <mkelly@arista.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
---
 manifest_xml.py |  8 +++-----
 project.py      | 17 +++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/manifest_xml.py b/manifest_xml.py
index 39656975..68ead53c 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -887,13 +887,11 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
           if groups:
             p.groups.extend(groups)
           if revision:
-            p.revisionExpr = revision
-            if IsId(revision):
-              p.revisionId = revision
-            else:
-              p.revisionId = None
+            p.SetRevision(revision)
+
           if remote:
             p.remote = remote.ToRemoteSpec(name)
+
           if dest_path:
             del self._paths[p.relpath]
             relpath, worktree, gitdir, objdir, _ = self.GetProjectPaths(name, dest_path)
diff --git a/project.py b/project.py
index 9ff9df0b..5b26b64c 100644
--- a/project.py
+++ b/project.py
@@ -520,14 +520,7 @@ class Project(object):
     self.name = name
     self.remote = remote
     self.UpdatePaths(relpath, worktree, gitdir, objdir)
-    self.revisionExpr = revisionExpr
-
-    if revisionId is None \
-            and revisionExpr \
-            and IsId(revisionExpr):
-      self.revisionId = revisionExpr
-    else:
-      self.revisionId = revisionId
+    self.SetRevision(revisionExpr, revisionId=revisionId)
 
     self.rebase = rebase
     self.groups = groups
@@ -557,6 +550,14 @@ class Project(object):
     # project containing repo hooks.
     self.enabled_repo_hooks = []
 
+  def SetRevision(self, revisionExpr, revisionId=None):
+    """Set revisionId based on revision expression and id"""
+    self.revisionExpr = revisionExpr
+    if revisionId is None and revisionExpr and IsId(revisionExpr):
+      self.revisionId = self.revisionExpr
+    else:
+      self.revisionId = revisionId
+
   def UpdatePaths(self, relpath, worktree, gitdir, objdir):
     """Update paths used by this project"""
     self.gitdir = gitdir.replace('\\', '/')