Version: use git_identifier in vcs_url (#12459)

- This was duplicating the logic from git_identifier
- Our `latest` version already has the name of the branch/tag in the
identifier, no need to use `get_default_branch`
- We no longer create branches or tags with the origin prefix.


I'm doing small refactors to rely less on get_default_branch, as that
contains some extra logic that we already run to have `latest` always in
sync.

Author: stsewd

readthedocs/builds/models.py

@@ -261,18 +261,10 @@ def ref(self):
 
     @property
     def vcs_url(self):
-        version_name = self.verbose_name
-        if self.slug == STABLE and self.machine:
-            stable_version = self.project.get_original_stable_version()
-            if stable_version:
-                version_name = stable_version.verbose_name
-        elif self.slug == LATEST and self.machine:
-            version_name = self.project.get_default_branch()
-
         return get_vcs_url(
             project=self.project,
             version_type=self.type,
-            version_name=version_name,
+            version_name=self.git_identifier,
         )
 
     @property
@@ -329,9 +321,10 @@ def git_identifier(self):
         - If the version is stable (machine created), we resolve to the branch that the stable version points to.
         - If the version is external, we return the PR identifier, since we don't have access to the name of the branch.
         """
-        # Latest is special as it doesn't contain the actual name in verbose_name.
+        # Latest is special as it doesn't contain the actual name in verbose_name,
+        # but in the identifier field.
         if self.slug == LATEST and self.machine:
-            return self.project.get_default_branch()
+            return self.identifier
 
         # Stable is special as it doesn't contain the actual name in verbose_name.
         if self.slug == STABLE and self.machine:

readthedocs/proxito/tests/responses/v1.json

@@ -46,7 +46,7 @@
       "built": true,
       "downloads": {},
       "id": 1,
-      "identifier": "a1b2c3",
+      "identifier": "master",
       "privacy_level": "public",
       "ref": null,
       "slug": "latest",
@@ -68,7 +68,7 @@
         "downloads": {},
         "hidden": false,
         "id": 1,
-        "identifier": "a1b2c3",
+        "identifier": "master",
         "privacy_level": "public",
         "ref": null,
         "slug": "latest",

readthedocs/proxito/tests/test_hosting.py

@@ -73,6 +73,8 @@ def setUp(self):
             identifier="a1b2c3",
         )
         self.version = self.project.versions.get(slug=LATEST)
+        self.version.identifier = "master"
+        self.version.save()
         self.build = fixture.get(
             Build,
             project=self.project,

readthedocs/rtd_tests/tests/test_version.py

@@ -35,7 +35,7 @@ def setUp(self):
         )
         self.tag_version = get(
             Version,
-            identifier="origin/master",
+            identifier="master",
             verbose_name="latest",
             slug="latest",
             project=self.pip,

readthedocs/rtd_tests/tests/test_version_commit_name.py

@@ -110,7 +110,7 @@ def test_git_latest_branch(self):
         version = new(
             Version,
             project=git_project,
-            identifier="origin/master",
+            identifier="master",
             slug=LATEST,
             verbose_name=LATEST,
             type=BRANCH,