Merge tag 'v2.45'
repo v2.45
* tag 'v2.45':
project: Check if dotgit exists w/out symlink check
git: raise soft version to 2.7.4
git: raise hard version to 1.7.9
docs: release: add recent git/python/ssh/debian info
main: Stringify project name in error_info
diff --git a/docs/release-process.md b/docs/release-process.md
index 2441d3d..8cec2b4 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -202,7 +202,7 @@
Things in italics are things we used to care about but probably don't anymore.
| Date | EOL | [Git][rel-g] | [Python][rel-p] | [SSH][rel-o] | [Ubuntu][rel-u] / [Debian][rel-d] | Git | Python | SSH |
-|:--------:|:------------:|:------------:|:---------------:|:------------:|-----------------------------------|-----|--------|-----|
+|:--------:|:------------:|:------------:|:---------------:|:------------:|-----------------------------------|:---:|:------:|:---:|
| Apr 2008 | | | | 5.0 |
| Jun 2008 | | | | 5.1 |
| Oct 2008 | *Oct 2013* | | 2.6.0 | | *10.04 Lucid* - 10.10 Maverick / *Squeeze* |
@@ -241,7 +241,7 @@
| Feb 2014 | *Dec 2014* | **1.9.0** | | | *14.04 Trusty* |
| Mar 2014 | *Mar 2019* | | *3.4.0* | | *14.04 Trusty* - 15.10 Wily / *Jessie* |
| Mar 2014 | | | | 6.6 | *14.04 Trusty* - 14.10 Utopic |
-| Apr 2014 | *Apr 2022* | | | | *14.04 Trusty* | 1.9.1 | 2.7.5 3.4.0 | 6.6 |
+| Apr 2014 | *Apr 2024* | | | | *14.04 Trusty* | 1.9.1 | 2.7.5 3.4.0 | 6.6 |
| May 2014 | *Dec 2014* | 2.0.0 |
| Aug 2014 | *Dec 2014* | *2.1.0* | | | 14.10 Utopic - 15.04 Vivid / *Jessie* |
| Oct 2014 | | | | 6.7 | 15.04 Vivid |
@@ -262,7 +262,7 @@
| Jan 2016 | *Jul 2017* | *2.7.0* | | | *16.04 Xenial* |
| Feb 2016 | | | | 7.2 | *16.04 Xenial* |
| Mar 2016 | *Jul 2017* | 2.8.0 |
-| Apr 2016 | *Apr 2024* | | | | *16.04 Xenial* | 2.7.4 | 2.7.11 3.5.1 | 7.2 |
+| Apr 2016 | *Apr 2026* | | | | *16.04 Xenial* | 2.7.4 | 2.7.11 3.5.1 | 7.2 |
| Jun 2016 | *Jul 2017* | 2.9.0 | | | 16.10 Yakkety |
| Jul 2016 | | | | 7.3 | 16.10 Yakkety |
| Sep 2016 | *Sep 2017* | 2.10.0 |
@@ -312,14 +312,33 @@
| Oct 2020 | | | | | 20.10 Groovy | 2.27.0 | 2.7.18 3.8.6 | 8.3 |
| Oct 2020 | **Oct 2025** | | 3.9.0 | | 21.04 Hirsute / **Bullseye** |
| Dec 2020 | *Mar 2021* | 2.30.0 | | | 21.04 Hirsute / **Bullseye** |
-| Mar 2021 | | 2.31.0 |
-| Mar 2021 | | | | 8.5 |
+| Mar 2021 | | 2.31.0 | | 8.5 |
| Apr 2021 | | | | 8.6 |
| Apr 2021 | *Jan 2022* | | | | 21.04 Hirsute | 2.30.2 | 2.7.18 3.9.4 | 8.4 |
| Jun 2021 | | 2.32.0 |
-| Aug 2021 | | 2.33.0 |
-| Aug 2021 | | | | 8.7 |
+| Aug 2021 | | 2.33.0 | | 8.7 |
| Aug 2021 | **Aug 2026** | | | | **Debian 11 Bullseye** | 2.30.2 | 2.7.18 3.9.2 | 8.4 |
+| Sep 2021 | | | | 8.8 |
+| Oct 2021 | | 2.34.0 | 3.10.0 | | **22.04 Jammy** |
+| Jan 2022 | | 2.35.0 |
+| Feb 2022 | | | | 8.9 | **22.04 Jammy** |
+| Apr 2022 | | 2.36.0 | | 9.0 |
+| Apr 2022 | **Apr 2032** | | | | **22.04 Jammy** | 2.34.1 | 2.7.18 3.10.6 | 8.9 |
+| Jun 2022 | | 2.37.0 |
+| Oct 2022 | | 2.38.0 | | 9.1 |
+| Oct 2022 | | | 3.11.0 | | **Bookworm** |
+| Dec 2022 | | 2.39.0 | | | **Bookworm** |
+| Feb 2023 | | | | 9.2 | **Bookworm** |
+| Mar 2023 | | 2.40.0 | | 9.3 |
+| Jun 2023 | | 2.41.0 |
+| Jun 2023 | **Jun 2028** | | | | **Debian 12 Bookworm** | 2.39.2 | 3.11.2 | 9.2 |
+| Aug 2023 | | 2.42.0 | | 9.4 |
+| Oct 2023 | | | 3.12.0 | 9.5 |
+| Nov 2022 | | 2.43.0 |
+| Dec 2023 | | | | 9.6 |
+| Feb 2024 | | 2.44.0 |
+| Mar 2024 | | | | 9.7 |
+| Oct 2024 | | | 3.13.0 |
| **Date** | **EOL** | **[Git][rel-g]** | **[Python][rel-p]** | **[SSH][rel-o]** | **[Ubuntu][rel-u] / [Debian][rel-d]** | **Git** | **Python** | **SSH** |
@@ -328,7 +347,7 @@
[rel-g]: https://en.wikipedia.org/wiki/Git#Releases
[rel-o]: https://www.openssh.com/releasenotes.html
[rel-p]: https://en.wikipedia.org/wiki/History_of_Python#Table_of_versions
-[rel-u]: https://en.wikipedia.org/wiki/Ubuntu_version_history#Table_of_versions
+[rel-u]: https://wiki.ubuntu.com/Releases
[example announcement]: https://groups.google.com/d/topic/repo-discuss/UGBNismWo1M/discussion
[repo-discuss@googlegroups.com]: https://groups.google.com/forum/#!forum/repo-discuss
[go/repo-release]: https://goto.google.com/repo-release
diff --git a/main.py b/main.py
index 2e1058d..b00aadb 100755
--- a/main.py
+++ b/main.py
@@ -425,7 +425,7 @@
error_info = json.dumps(
{
"ErrorType": type(error).__name__,
- "Project": project,
+ "Project": str(project),
"Message": str(error),
}
)
diff --git a/project.py b/project.py
index 8726af8..9563e7d 100644
--- a/project.py
+++ b/project.py
@@ -1909,11 +1909,11 @@
)
else:
msg = (
- "error: %s: Cannot remove project: uncommitted"
+ "error: %s: Cannot remove project: uncommitted "
"changes are present.\n" % self.RelPath(local=False)
)
logger.error(msg)
- raise DeleteDirtyWorktreeError(msg, project=self)
+ raise DeleteDirtyWorktreeError(msg, project=self.name)
if verbose:
print(f"{self.RelPath(local=False)}: Deleting obsolete checkout.")
@@ -3437,7 +3437,7 @@
if not platform_utils.islink(dotgit) and platform_utils.isdir(dotgit):
self._MigrateOldWorkTreeGitDir(dotgit, project=self.name)
- init_dotgit = not os.path.exists(dotgit)
+ init_dotgit = not os.path.lexists(dotgit)
if self.use_git_worktrees:
if init_dotgit:
self._InitGitWorktree()
diff --git a/repo b/repo
index adcfb6e..98fd5f7 100755
--- a/repo
+++ b/repo
@@ -124,7 +124,7 @@
BUG_URL = "https://issues.gerritcodereview.com/issues/new?component=1370071"
# increment this whenever we make important changes to this script
-VERSION = (2, 42)
+VERSION = (2, 45)
# increment this if the MAINTAINER_KEYS block is modified
KEYRING_VERSION = (2, 3)
@@ -210,9 +210,8 @@
# NB: The version of git that the repo launcher requires may be much older than
# the version of git that the main repo source tree requires. Keeping this at
# an older version also makes it easier for users to upgrade/rollback as needed.
-#
-# git-1.7 is in (EOL) Ubuntu Precise.
-MIN_GIT_VERSION = (1, 7, 2) # minimum supported git version
+# See requirements.json for versions.
+MIN_GIT_VERSION = (1, 7, 9) # minimum supported git version
repodir = ".repo" # name of repo's private directory
S_repo = "repo" # special repo repository
S_manifests = "manifests" # special manifest repository
diff --git a/requirements.json b/requirements.json
index cb55cd2..dac9a4f 100644
--- a/requirements.json
+++ b/requirements.json
@@ -46,12 +46,16 @@
# Supported git versions.
#
- # git-1.7.2 is in Debian Squeeze.
# git-1.7.9 is in Ubuntu Precise.
- # git-1.9.1 is in Ubuntu Trusty.
# git-1.7.10 is in Debian Wheezy.
+ # git-1.9.1 is in Ubuntu Trusty.
+ # git-2.1.4 is in Debian Jessie.
+ # git-2.7.4 is in Ubuntu Xenial.
+ # git-2.11.0 is in Debian Stretch.
+ # git-2.17.0 is in Ubuntu Bionic.
+ # git-2.20.1 is in Debian Buster.
"git": {
- "hard": [1, 7, 2],
- "soft": [1, 9, 1]
+ "hard": [1, 7, 9],
+ "soft": [2, 7, 4]
}
}
