Commit 0e305557 authored by Martin v. Löwis's avatar Martin v. Löwis

Backport of r61263:

#1725737: ignore other VC directories other than CVS and SVN's too.
parent bc89897e
...@@ -1213,7 +1213,8 @@ fully processed the manifest template, we remove files that should not ...@@ -1213,7 +1213,8 @@ fully processed the manifest template, we remove files that should not
be included in the source distribution: be included in the source distribution:
\begin{itemize} \begin{itemize}
\item all files in the Distutils ``build'' tree (default \file{build/}) \item all files in the Distutils ``build'' tree (default \file{build/})
\item all files in directories named \file{RCS}, \file{CVS} or \file{.svn} \item all files in directories named \file{RCS}, \file{CVS}, \file{.svn},
\file{.hg}, \file{.git}, \file{.bzr}, or \file{\_darcs}
\end{itemize} \end{itemize}
Now we have our complete list of files, which is written to the manifest Now we have our complete list of files, which is written to the manifest
for future reference, and then used to build the source distribution for future reference, and then used to build the source distribution
...@@ -1246,7 +1247,8 @@ Distutils source distribution: ...@@ -1246,7 +1247,8 @@ Distutils source distribution:
\code{prune} command in the manifest template comes after the \code{prune} command in the manifest template comes after the
\code{recursive-include} command \code{recursive-include} command
\item exclude the entire \file{build} tree, and any \file{RCS}, \item exclude the entire \file{build} tree, and any \file{RCS},
\file{CVS} and \file{.svn} directories \file{CVS}, \file{.svn}, \file{.hg}, \file{.git}, \file{.bzr}, or
\file{\_darcs} directories
\end{enumerate} \end{enumerate}
Just like in the setup script, file and directory names in the manifest Just like in the setup script, file and directory names in the manifest
template should always be slash-separated; the Distutils will take care template should always be slash-separated; the Distutils will take care
......
...@@ -347,14 +347,14 @@ class sdist (Command): ...@@ -347,14 +347,14 @@ class sdist (Command):
* the build tree (typically "build") * the build tree (typically "build")
* the release tree itself (only an issue if we ran "sdist" * the release tree itself (only an issue if we ran "sdist"
previously with --keep-temp, or it aborted) previously with --keep-temp, or it aborted)
* any RCS, CVS and .svn directories * any RCS, CVS, .svn, .hg, .git, .bzr, _darcs directories
""" """
build = self.get_finalized_command('build') build = self.get_finalized_command('build')
base_dir = self.distribution.get_fullname() base_dir = self.distribution.get_fullname()
self.filelist.exclude_pattern(None, prefix=build.build_base) self.filelist.exclude_pattern(None, prefix=build.build_base)
self.filelist.exclude_pattern(None, prefix=base_dir) self.filelist.exclude_pattern(None, prefix=base_dir)
self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1) self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
def write_manifest (self): def write_manifest (self):
......
...@@ -15,6 +15,9 @@ Core and builtins ...@@ -15,6 +15,9 @@ Core and builtins
Library Library
------- -------
- Bug #1725737: In distutil's sdist, exclude RCS, CVS etc. also in the
root directory, and also exclude .hg, .git, .bzr, and _darcs.
- Bug #1389051: imaplib causes excessive memory fragmentation when reading - Bug #1389051: imaplib causes excessive memory fragmentation when reading
large messages. large messages.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment