# HG changeset patch # User Mike Miller # Date 1530559944 25200 # Node ID 115db34f35fba3c182ef96bda891322e8543e61b # Parent 517c7317301196f79993127dd35c7f9acb66ea09 .hgignore: fix prefix to ignore files that may be in or out of tree (bug #54216) * .hgignore: Use '(^|/)' idiom to anchor ignored files that may be generated in the source tree or in a build subdirectory depending on the user's preference. diff -r 517c73173011 -r 115db34f35fb .hgignore --- a/.hgignore Thu Jun 21 10:52:44 2018 +0200 +++ b/.hgignore Mon Jul 02 12:32:24 2018 -0700 @@ -8,7 +8,7 @@ .~$ # This directory gets created by gnulib during the build. # It contains no Octave files. -^libgnu($|/) +(^|/)libgnu($|/) ## m4 related files # This directory mostly contains cruft during build time, but it does @@ -20,12 +20,12 @@ ^autom4te\.cache($|/) ^config\.in\.h$ ^configure$ -^config.cache$ -^config.h$ -^config.log$ -^config.status$ +(^|/)config.cache$ +(^|/)config.h$ +(^|/)config.log$ +(^|/)config.status$ -(/|^)Makefile\.in$ +^Makefile\.in$ ^INSTALL$ ## Emacs associated files @@ -34,22 +34,22 @@ ## Scripts associated with building Octave ^build-aux/config\.(guess|rpath|sub)$ -^build-aux/check-subst-vars\.sh$ +(^|/)build-aux/check-subst-vars\.sh$ ^build-aux/depcomp$ ^build-aux/install-sh$ ^build-aux/ltmain\.sh$ ^build-aux/mdate-sh$ ^build-aux/missing$ ^build-aux/move-if-change$ -^build-aux/subst-config-vals\.sh$ -^build-aux/subst-cross-config-vals\.sh$ -^build-aux/subst-default-vals\.sh$ -^build-aux/subst-script-vals\.sh$ +(^|/)build-aux/subst-config-vals\.sh$ +(^|/)build-aux/subst-cross-config-vals\.sh$ +(^|/)build-aux/subst-default-vals\.sh$ +(^|/)build-aux/subst-script-vals\.sh$ ^build-aux/texinfo\.tex$ ^build-aux/ylwrap$ ## Mercurial associated files -^HG-ID$ +(^|/)HG-ID$ ## Timestamp files used in build process .*/\.dirstamp$ @@ -64,8 +64,8 @@ ## DLDFCN associated files ^libinterp/dldfcn/module\.mk$ -^libinterp/dldfcn/PKG_ADD$ -^libinterp/dldfcn/.*\.oct$ +(^|/)libinterp/dldfcn/PKG_ADD$ +(^|/)libinterp/dldfcn/.*\.oct$ ## liboctave/ directory associated patterns # E.g., liboctave/operators/smx-op-inc.mk @@ -73,15 +73,15 @@ ## scripts/ directory associated patterns # Package files -^scripts/.*/PKG_ADD$ +(^|/)scripts/.*/PKG_ADD$ # Java files -^scripts/java/octave\.jar$ -^scripts/java/org/octave/.*\.class$ +(^|/)scripts/java/octave\.jar$ +(^|/)scripts/java/org/octave/.*\.class$ ## libgui/ associated patterns # Files generated by moc tool -^libgui/.*/moc-.*\.(cc|h)$ -^libgui/languages/.*\.qm$ +(^|/)libgui/.*/moc-.*\.(cc|h)$ +(^|/)libgui/languages/.*\.qm$ ## Ignore patterns associated with documentation # Info generated files @@ -89,29 +89,29 @@ ^doc/\w+/\w+\.info(-\d+)?$ # Texinfo created temporary directories -^doc/(interpreter|liboctave)/(octave|liboctave)\.t2(d|p)/ +(^|/)doc/(interpreter|liboctave)/(octave|liboctave)\.t2(d|p)/ # Texinfo created files -^doc/interpreter/.*\.texi$ +(^|/)doc/interpreter/.*\.texi$ # DOCSTRINGS files built in the source tree -^(libinterp|scripts)/DOCSTRINGS$ +(^|/)(libinterp|scripts)/DOCSTRINGS$ # Generated HTML directories -^doc/interpreter/octave\.html/ -^doc/liboctave/liboctave\.html/ +(^|/)doc/interpreter/octave\.html/ +(^|/)doc/liboctave/liboctave\.html/ # Miscellaneous auto-generated files -^doc/interpreter/octave\.dvi$ -^doc/interpreter/octave\.ps$ -^doc/interpreter/doc-cache$ -^doc/interpreter/octave_interpreter\.q(ch|hc)$ +(^|/)doc/interpreter/octave\.dvi$ +(^|/)doc/interpreter/octave\.ps$ +(^|/)doc/interpreter/doc-cache$ +(^|/)doc/interpreter/octave_interpreter\.q(ch|hc)$ # Images and scripts for documentation ^doc/interpreter/images\.mk$ -^doc/interpreter/.*\.eps$ -^doc/interpreter/.*\.pdf$ -^doc/interpreter/.*\.png$ -^doc/interpreter/.*\.txt$ +(^|/)doc/interpreter/.*\.eps$ +(^|/)doc/interpreter/.*\.pdf$ +(^|/)doc/interpreter/.*\.png$ +(^|/)doc/interpreter/.*\.txt$ # timestamps for doc directory ^doc/\w+/stamp-(vti|\d+)$