Files
@ ee1da602b590
Branch filter:
Location: kallithea/scripts/i18n
ee1da602b590
5.4 KiB
text/plain
repo_groups: fix deletion of subgroups
Deletion of a repository group that has a parent group (i.e. is not at the
root of the repository group tree) failed as follows:
Traceback (most recent call last):
[...]
File ".../lib/python3.9/site-packages/tg/configurator/components/dispatch.py", line 114, in _call_controller
return controller(*remainder, **params)
File "<decorator-gen-5>", line 2, in delete
File "/home/tdescham/repo/contrib/kallithea/kallithea-release/kallithea/lib/auth.py", line 572, in __wrapper
return func(*fargs, **fkwargs)
File "/home/tdescham/repo/contrib/kallithea/kallithea-release/kallithea/controllers/admin/repo_groups.py", line 271, in delete
if gr.parent_group:
File ".../lib/python3.9/site-packages/sqlalchemy/orm/attributes.py", line 294, in __get__
return self.impl.get(instance_state(instance), dict_)
File ".../lib/python3.9/site-packages/sqlalchemy/orm/attributes.py", line 730, in get
value = self.callable_(state, passive)
File ".../lib/python3.9/site-packages/sqlalchemy/orm/strategies.py", line 717, in _load_for_state
raise orm_exc.DetachedInstanceError(
sqlalchemy.orm.exc.DetachedInstanceError: Parent instance <RepoGroup at 0x7f1f2664f4c0> is not bound to a Session; lazy load operation of attribute 'parent_group' cannot proceed (Background on this error at: http://sqlalche.me/e/13/bhk3)
In the reference 'gr.parent_group', 'gr' is an SQLAlchemy object referring
to the group being deleted, and 'gr.parent_group' is a lazy reference to its
parent group. The 'lazy' means that the parent group object is not loaded
automatically when 'gr' is assigned, but instead will be loaded on-the-fly
when the parent group is actually accessed. See [1] and [2] for more
information.
The problem was that the lazy 'parent_group' attribute was accessed _after_
deleting the database object it was part of.
Fix this by obtaining a handle to the parent group _before_ deleting the
subgroup.
Reported-by: André Klitzing (via mailing list)
[1] https://docs.sqlalchemy.org/en/13/errors.html#error-bhk3
[2] https://docs.sqlalchemy.org/en/13/orm/loading_relationships.html
Deletion of a repository group that has a parent group (i.e. is not at the
root of the repository group tree) failed as follows:
Traceback (most recent call last):
[...]
File ".../lib/python3.9/site-packages/tg/configurator/components/dispatch.py", line 114, in _call_controller
return controller(*remainder, **params)
File "<decorator-gen-5>", line 2, in delete
File "/home/tdescham/repo/contrib/kallithea/kallithea-release/kallithea/lib/auth.py", line 572, in __wrapper
return func(*fargs, **fkwargs)
File "/home/tdescham/repo/contrib/kallithea/kallithea-release/kallithea/controllers/admin/repo_groups.py", line 271, in delete
if gr.parent_group:
File ".../lib/python3.9/site-packages/sqlalchemy/orm/attributes.py", line 294, in __get__
return self.impl.get(instance_state(instance), dict_)
File ".../lib/python3.9/site-packages/sqlalchemy/orm/attributes.py", line 730, in get
value = self.callable_(state, passive)
File ".../lib/python3.9/site-packages/sqlalchemy/orm/strategies.py", line 717, in _load_for_state
raise orm_exc.DetachedInstanceError(
sqlalchemy.orm.exc.DetachedInstanceError: Parent instance <RepoGroup at 0x7f1f2664f4c0> is not bound to a Session; lazy load operation of attribute 'parent_group' cannot proceed (Background on this error at: http://sqlalche.me/e/13/bhk3)
In the reference 'gr.parent_group', 'gr' is an SQLAlchemy object referring
to the group being deleted, and 'gr.parent_group' is a lazy reference to its
parent group. The 'lazy' means that the parent group object is not loaded
automatically when 'gr' is assigned, but instead will be loaded on-the-fly
when the parent group is actually accessed. See [1] and [2] for more
information.
The problem was that the lazy 'parent_group' attribute was accessed _after_
deleting the database object it was part of.
Fix this by obtaining a handle to the parent group _before_ deleting the
subgroup.
Reported-by: André Klitzing (via mailing list)
[1] https://docs.sqlalchemy.org/en/13/errors.html#error-bhk3
[2] https://docs.sqlalchemy.org/en/13/orm/loading_relationships.html
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | #!/usr/bin/env python3
# -*- coding: utf-8 -*-
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import shutil
import sys
import click
import i18n_utils
"""
Tool for maintenance of .po and .pot files
Normally, the i18n-related files contain for each translatable string a
reference to all the source code locations where this string is found. This
meta data is useful for translators to assess how strings are used, but is not
relevant for normal development nor for running Kallithea. Such meta data, or
derived data like kallithea.pot, will inherently be outdated, and create
unnecessary churn and repository growth, making it harder to spot actual and
important changes.
"""
@click.group()
@click.option('--debug/--no-debug', default=False)
def cli(debug):
if (debug):
i18n_utils.do_debug = True
pass
@cli.command()
@click.argument('po_files', nargs=-1)
@click.option('--merge-pot-file', default=None)
@click.option('--strip/--no-strip', default=False)
def normalize_po_files(po_files, merge_pot_file, strip):
"""Normalize the specified .po and .pot files.
By default, only actual translations and essential headers will be
preserved, just as we want it in the main branches with minimal noise.
If a .pot file is specified, the po files will instead be updated by
running GNU msgmerge with this .pot file, thus updating source code
references and preserving comments and outdated translations.
"""
for po_file in po_files:
i18n_utils._normalize_po_file(po_file, merge_pot_file=merge_pot_file, strip=strip)
@cli.command()
@click.argument('local')
@click.argument('base')
@click.argument('other')
@click.argument('output')
@click.option('--merge-pot-file', default=None)
@click.option('--strip/--no-strip', default=False)
def normalized_merge(local, base, other, output, merge_pot_file, strip):
"""Merge tool for use with 'hg merge/rebase/graft --tool'
i18n files are partially manually editored original source of content, and
partially automatically generated and updated. That create a lot of churn
and often cause a lot of merge conflicts.
To avoid that, this merge tool wrapper will normalize .po content before
running the merge tool.
By default, only actual translations and essential headers will be
preserved, just as we want it in the main branches with minimal noise.
If a .pot file is specified, the po files will instead be updated by
running GNU msgmerge with this .pot file, thus updating source code
references and preserving comments and outdated translations.
Add the following to your user or repository-specific .hgrc file to use it:
[merge-tools]
i18n.executable = /path/to/scripts/i18n
i18n.args = normalized-merge $local $base $other $output
and then invoke merge/rebase/graft with the additional argument '--tool i18n'.
"""
from mercurial import context, simplemerge
from mercurial import ui as uimod
print('i18n normalized-merge: normalizing and merging %s' % output)
i18n_utils._normalize_po_file(local, merge_pot_file=merge_pot_file, strip=strip)
i18n_utils._normalize_po_file(base, merge_pot_file=merge_pot_file, strip=strip)
i18n_utils._normalize_po_file(other, merge_pot_file=merge_pot_file, strip=strip)
i18n_utils._normalize_po_file(output, merge_pot_file=merge_pot_file, strip=strip)
# simplemerge will write markers to 'local' if it fails, keep a copy without markers
localkeep = local + '.keep'
shutil.copyfile(local, localkeep)
ret = simplemerge.simplemerge(uimod.ui.load(),
context.arbitraryfilectx(local.encode('utf-8')),
context.arbitraryfilectx(base.encode('utf-8')),
context.arbitraryfilectx(other.encode('utf-8')),
label=[b'local', b'other', b'base'],
mode='merge',
)
shutil.copyfile(local, output) # simplemerge wrote to local - either resolved or with conflict markers
if ret:
shutil.copyfile(localkeep, local)
basekeep = base + '.keep'
otherkeep = other + '.keep'
shutil.copyfile(base, basekeep)
shutil.copyfile(other, otherkeep)
sys.stderr.write("Error: simple merge failed and %s is left with conflict markers. Resolve the conflicts, then use 'hg resolve -m'.\n" % output)
sys.stderr.write('Resolve with e.g.: kdiff3 %s %s %s -o %s\n' % (basekeep, localkeep, otherkeep, output))
sys.exit(ret)
os.remove(localkeep)
@cli.command()
@click.argument('file1')
@click.argument('file2')
@click.option('--merge-pot-file', default=None)
@click.option('--strip/--no-strip', default=False)
def normalized_diff(file1, file2, merge_pot_file, strip):
"""Compare two files while transparently normalizing them."""
sys.exit(i18n_utils._normalized_diff(file1, file2, merge_pot_file=merge_pot_file, strip=strip))
if __name__ == '__main__':
cli()
|