This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10918

Backed out changeset 9b8f326731ac
ClosedPublic

Authored by Mathiasdm on Jun 30 2021, 8:17 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG65a8d60e74fb: contrib: backed out changeset 9b8f326731ac
rHG25d36300ba8e: Backed out changeset 9b8f326731ac
Summary

Unfortunately, disabling the rust extensions means newer
Mercurial versions no longer have the persistent-nodemap
feature enabled.
This means a Mercurial 5.8.1 on RPM-based Linux distributions
will no longer be able to read repositories created
by a Mercurial 5.8 on RPM-based Linux distributions.

This violates the compatibility rules
(see https://www.mercurial-scm.org/wiki/CompatibilityRules ).

For this reason, I have to backout this change.
I'll try to find another solution to the 'hg purge' crashes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Mathiasdm created this revision.Jun 30 2021, 8:17 AM
Alphare accepted this revision.Jul 1 2021, 5:48 AM
Alphare added a subscriber: Alphare.

I should have caught this. Thank you for keeping this going, don't hesitate to reach out for help with any new information on your issue.

This revision is now accepted and ready to land.Jul 1 2021, 5:48 AM

Revision Contents
Changeset List

Diff 28716

contrib/packaging/docker/centos7

make \ make \
python3-devel \ python3-devel \
python36-docutils \ python36-docutils \
rpm-build \ rpm-build \
tar tar
# For creating repo meta data # For creating repo meta data
RUN yum install -y createrepo RUN yum install -y createrepo
# For rust extensions
RUN yum install -y cargo

contrib/packaging/docker/centos8

FROM centos:centos8 FROM centos:centos8
RUN groupadd -g %GID% build && \ RUN groupadd -g %GID% build && \
useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
RUN yum install -y \ RUN yum install -y \
gcc \ gcc \
gettext \ gettext \
make \ make \
python3-devel \ python3-devel \
python3-docutils \ python3-docutils \
rpm-build rpm-build
# For creating repo meta data # For creating repo meta data
RUN yum install -y createrepo RUN yum install -y createrepo
# For rust extensions
RUN yum install -y cargo

contrib/packaging/mercurial.spec

# these .a are not necessary and they are readonly and strip fails - kill them! # these .a are not necessary and they are readonly and strip fails - kill them!
rm -f %{buildroot}%{hgpyprefix}/lib/{,python2.*/config}/libpython2.*.a rm -f %{buildroot}%{hgpyprefix}/lib/{,python2.*/config}/libpython2.*.a
cd - cd -
cd %{docutilsname} cd %{docutilsname}
LD_LIBRARY_PATH=$PYPATH $PYPATH/python setup.py install --root="$RPM_BUILD_ROOT" LD_LIBRARY_PATH=$PYPATH $PYPATH/python setup.py install --root="$RPM_BUILD_ROOT"
cd - cd -
PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{hgpyprefix} MANDIR=%{_mandir} PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{hgpyprefix} MANDIR=%{_mandir} PURE="--rust"
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . ) ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . )
( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} ) ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} )
%else %else
make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir} make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir} PURE="--rust"
%endif %endif
install -m 755 contrib/chg/chg $RPM_BUILD_ROOT%{_bindir}/ install -m 755 contrib/chg/chg $RPM_BUILD_ROOT%{_bindir}/
install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}/ install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}/
install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}/ install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}/
bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d