Skip to content
Snippets Groups Projects
Commit 9da97f49 authored by Gregory Szorc's avatar Gregory Szorc
Browse files

packaging: establish hgpackaging package

Previously, contrib/packaging behaved as a root to a
package directory and we had a "packagingutil" module. As I
work more on packaging code, we'll want to have more code
shared between different packaging tools. I think it makes
sense to have a single package containing multiple modules
than multiple top-level modules.

This commit establishes an "hgpackaging" package by moving
the existing packagingutil code to it.

Differential Revision: https://phab.mercurial-scm.org/D6083
parent 2b21c7fb
No related branches found
No related tags found
No related merge requests found
# packagingutil.py - Common packaging utility code.
# util.py - Common packaging utility code.
#
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
#
......
......@@ -87,7 +87,7 @@
for finding the Python 2.7 toolchain. So, we require the environment
to already be configured with an active toolchain.
"""
from packagingutil import (
from hgpackaging.util import (
download_entry,
extract_tar_to_directory,
extract_zip_to_directory,
......
......@@ -12,4 +12,5 @@
> -X hgext/fsmonitor/pywatchman \
> -X mercurial/thirdparty \
> | sed 's-\\-/-g' | "$check_code" --warnings --per-file=0 - || false
Skipping contrib/packaging/hgpackaging/util.py it has no-che?k-code (glob)
Skipping contrib/packaging/inno/build.py it has no-che?k-code (glob)
......@@ -15,5 +16,4 @@
Skipping contrib/packaging/inno/build.py it has no-che?k-code (glob)
Skipping contrib/packaging/packagingutil.py it has no-che?k-code (glob)
Skipping i18n/polib.py it has no-che?k-code (glob)
Skipping mercurial/statprof.py it has no-che?k-code (glob)
Skipping tests/badserverext.py it has no-che?k-code (glob)
......
......@@ -21,4 +21,5 @@
> -X contrib/debugshell.py \
> -X contrib/hgweb.fcgi \
> -X contrib/packaging/hg-docker \
> -X contrib/packaging/hgpackaging/ \
> -X contrib/packaging/inno/ \
......@@ -24,5 +25,4 @@
> -X contrib/packaging/inno/ \
> -X contrib/packaging/packagingutil.py \
> -X contrib/python-zstandard/ \
> -X contrib/win32/hgwebdir_wsgi.py \
> -X contrib/perf-utils/perf-revlog-write-plot.py \
......
......@@ -5,4 +5,5 @@
#if no-py3
$ testrepohg files 'set:(**.py)' \
> -X contrib/packaging/hgpackaging/ \
> -X contrib/packaging/inno/ \
......@@ -8,5 +9,4 @@
> -X contrib/packaging/inno/ \
> -X contrib/packaging/packagingutil.py \
> -X hgdemandimport/demandimportpy2.py \
> -X mercurial/thirdparty/cbor \
> | sed 's|\\|/|g' | xargs "$PYTHON" contrib/check-py3-compat.py
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment