[ADD] update documentation
- How to update all repo with source - Missing dependancy openupgradelib
This commit is contained in:
parent
1db7d6bba7
commit
db4b145e72
6 changed files with 144 additions and 4 deletions
|
|
@ -25,7 +25,7 @@ Access to a new repo, add your URL to file [source_repo_addons.csv](../source_re
|
||||||
Execute script:
|
Execute script:
|
||||||
```bash
|
```bash
|
||||||
./script/git_repo_manifest.py
|
./script/git_repo_manifest.py
|
||||||
git checkout -b new_branch
|
git checkout -b NEW_BRANCH
|
||||||
git commit -am "Add new repo"
|
git commit -am "Add new repo"
|
||||||
./script/install_locally_dev.sh
|
./script/install_locally_dev.sh
|
||||||
```
|
```
|
||||||
|
|
|
||||||
24
doc/UPDATE.md
Normal file
24
doc/UPDATE.md
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
# Update ERPLibre
|
||||||
|
## Update all repo from origin source
|
||||||
|
The update is done on branch 12.0, you need to validate this branch exist.
|
||||||
|
|
||||||
|
1. Make sure all repo git is conform, remove all argument depth from manifest and regenerate.
|
||||||
|
You can clean all and regenerate
|
||||||
|
```bash
|
||||||
|
./script/clean_repo_manifest.sh
|
||||||
|
./script/install_locally_dev.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Update all remote with ssh/git
|
||||||
|
```bash
|
||||||
|
./script/git_change_remote_https_to_git.py
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Run update script
|
||||||
|
```bash
|
||||||
|
./script/git_update_repo.py
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Push force all needed repo, manage rebase conflict
|
||||||
|
|
||||||
|
5. Test a clone with dev, check file [DEVELOPMENT.md](./DEVELOPMENT.md)
|
||||||
|
|
@ -3,4 +3,5 @@ agithub
|
||||||
gitpython
|
gitpython
|
||||||
PyYAML
|
PyYAML
|
||||||
retrying
|
retrying
|
||||||
xmltodict
|
xmltodict
|
||||||
|
openupgradelib
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,8 @@ def get_config():
|
||||||
help="Path of repo to change remote, including submodule.")
|
help="Path of repo to change remote, including submodule.")
|
||||||
parser.add_argument('--clear', action="store_true",
|
parser.add_argument('--clear', action="store_true",
|
||||||
help="Create a new manifest and clear old configuration.")
|
help="Create a new manifest and clear old configuration.")
|
||||||
|
parser.add_argument('-m', '--manifest', default="manifest/default.dev.xml",
|
||||||
|
help="The manifest file path to generate.")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
return args
|
return args
|
||||||
|
|
||||||
|
|
@ -53,7 +55,7 @@ def main():
|
||||||
dct_remote = {}
|
dct_remote = {}
|
||||||
dct_project = {}
|
dct_project = {}
|
||||||
git_tool.generate_repo_manifest(lst_repo_organization,
|
git_tool.generate_repo_manifest(lst_repo_organization,
|
||||||
output=f"{config.dir}manifest/default.dev.xml",
|
output=f"{config.dir}{config.manifest}",
|
||||||
dct_remote=dct_remote, dct_project=dct_project)
|
dct_remote=dct_remote, dct_project=dct_project)
|
||||||
git_tool.generate_install_locally()
|
git_tool.generate_install_locally()
|
||||||
|
|
||||||
|
|
|
||||||
113
script/git_update_repo.py
Executable file
113
script/git_update_repo.py
Executable file
|
|
@ -0,0 +1,113 @@
|
||||||
|
#!./venv/bin/python
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import argparse
|
||||||
|
import logging
|
||||||
|
from git import Repo # pip install gitpython
|
||||||
|
from retrying import retry # pip install retrying
|
||||||
|
|
||||||
|
new_path = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
|
||||||
|
sys.path.append(new_path)
|
||||||
|
|
||||||
|
from script.git_tool import GitTool
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def get_config():
|
||||||
|
"""Parse command line arguments, extracting the config file name,
|
||||||
|
returning the union of config file and command line arguments
|
||||||
|
|
||||||
|
:return: dict of config file settings and command line arguments
|
||||||
|
"""
|
||||||
|
# TODO update description
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
formatter_class=argparse.RawDescriptionHelpFormatter,
|
||||||
|
description='''\
|
||||||
|
''',
|
||||||
|
epilog='''\
|
||||||
|
'''
|
||||||
|
)
|
||||||
|
parser.add_argument('-d', '--dir', dest="dir", default="./",
|
||||||
|
help="Path of repo to change remote, including submodule.")
|
||||||
|
args = parser.parse_args()
|
||||||
|
return args
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
config = get_config()
|
||||||
|
git_tool = GitTool()
|
||||||
|
|
||||||
|
lst_repo = git_tool.get_source_repo_addons(repo_path=config.dir,
|
||||||
|
add_repo_root=False)
|
||||||
|
lst_repo_organization = [git_tool.get_transformed_repo_info_from_url(
|
||||||
|
a.get("url"), repo_path=config.dir, get_obj=True,
|
||||||
|
is_submodule=a.get("is_submodule"), sub_path=a.get("sub_path"),
|
||||||
|
revision=a.get("revision"), clone_depth=a.get("clone_depth"))
|
||||||
|
for a in lst_repo]
|
||||||
|
|
||||||
|
i = 0
|
||||||
|
total = len(lst_repo)
|
||||||
|
for repo in lst_repo_organization:
|
||||||
|
i += 1
|
||||||
|
print(f"\nNb element {i}/{total} - {repo.path}")
|
||||||
|
|
||||||
|
# TODO validate with default to ignore duplicate url, if same remote repo
|
||||||
|
if not repo.is_submodule:
|
||||||
|
continue
|
||||||
|
upstream_name = f"ERPLibre_update_12/{git_tool.default_branch}"
|
||||||
|
remote_branch_name = f"{upstream_name}/{git_tool.default_branch}"
|
||||||
|
git_repo = Repo(repo.relative_path)
|
||||||
|
# 1. Add remote if not exist
|
||||||
|
try:
|
||||||
|
upstream_remote = git_repo.remote(upstream_name)
|
||||||
|
print(f'Remote "{upstream_name}" already exists in {repo.relative_path}')
|
||||||
|
except ValueError:
|
||||||
|
upstream_remote = retry(
|
||||||
|
wait_exponential_multiplier=1000,
|
||||||
|
stop_max_delay=15000
|
||||||
|
)(git_repo.create_remote)(upstream_name, repo.url_https)
|
||||||
|
print('Remote "%s" created for %s' % (upstream_name, repo.url_https))
|
||||||
|
|
||||||
|
# 2. Fetch the remote source
|
||||||
|
retry(wait_exponential_multiplier=1000, stop_max_delay=15000)(
|
||||||
|
upstream_remote.fetch)()
|
||||||
|
print('Remote "%s" fetched' % upstream_name)
|
||||||
|
|
||||||
|
# 3. Rebase actual branch with new branch
|
||||||
|
rev = repo.revision if repo.revision else git_tool.default_branch
|
||||||
|
try:
|
||||||
|
git_repo.git.checkout(rev)
|
||||||
|
except:
|
||||||
|
if repo.revision:
|
||||||
|
rev = f"{repo.original_organization}/{repo.revision}"
|
||||||
|
else:
|
||||||
|
rev = f"{repo.original_organization}/{git_tool.default_branch}"
|
||||||
|
|
||||||
|
git_repo.git.checkout("--track", rev)
|
||||||
|
actual_commit = git_repo.git.rev_parse("HEAD")
|
||||||
|
try:
|
||||||
|
git_repo.git.rebase(remote_branch_name)
|
||||||
|
except Exception as e:
|
||||||
|
print(e, file=sys.stderr)
|
||||||
|
new_commit = git_repo.git.rev_parse("HEAD")
|
||||||
|
|
||||||
|
if actual_commit == new_commit:
|
||||||
|
print("== No diff ==")
|
||||||
|
else:
|
||||||
|
print(f"== Old commit {actual_commit} - new commit {new_commit}")
|
||||||
|
# push
|
||||||
|
try:
|
||||||
|
retry(wait_exponential_multiplier=1000, stop_max_delay=15000)(
|
||||||
|
git_repo.git.push)(repo.organization, rev)
|
||||||
|
except:
|
||||||
|
print("Cannot push, maybe need to push force or resolv rebase conflict",
|
||||||
|
file=sys.stderr)
|
||||||
|
print(f"cd {repo.path}")
|
||||||
|
print(f"git diff ERPLibre/v#.#.#..HEAD")
|
||||||
|
print(f"git push --force {repo.organization} {rev}")
|
||||||
|
print(f"cd -")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
|
|
@ -81,7 +81,7 @@ https://github.com/OCA/timesheet.git,addons,12.0_support_project_agile_timesheet
|
||||||
https://github.com/OCA/web.git,addons,,
|
https://github.com/OCA/web.git,addons,,
|
||||||
https://github.com/OCA/website.git,addons,12.0_dev,
|
https://github.com/OCA/website.git,addons,12.0_dev,
|
||||||
https://github.com/OCA/wms.git,addons,,
|
https://github.com/OCA/wms.git,addons,,
|
||||||
https://github.com/odoo/odoo.git,.,12.0_feature_5_star_CRM,1
|
https://github.com/odoo/odoo.git,.,ERPLibre/12.0,1
|
||||||
https://github.com/odooaktiv/QuotationRevision.git,addons,,
|
https://github.com/odooaktiv/QuotationRevision.git,addons,,
|
||||||
https://github.com/openeducat/openeducat_erp.git,addons,,
|
https://github.com/openeducat/openeducat_erp.git,addons,,
|
||||||
https://github.com/SanteLibre/santelibre_addons.git,addons,master,
|
https://github.com/SanteLibre/santelibre_addons.git,addons,master,
|
||||||
|
|
|
||||||
|
Loading…
Reference in a new issue