Mercurial > public > mercurial-scm > hg
diff mercurial/archival.py @ 18967:88d1b59f6906
archive: raise error.Abort if the file pattern matches no files
Note that we could raise this exception even if no pattern were specified, but
the revision contained no files. However this should not happen in practice
since in that case commands.py/archive would exit earlier with an "no working
directory: please specify a revision" error message instead.
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Thu, 21 Mar 2013 22:09:15 +0100 |
| parents | 6252b4f1c4b4 |
| children | a2f139d25845 |
line wrap: on
line diff
--- a/mercurial/archival.py Sat Feb 09 14:22:52 2013 -0500 +++ b/mercurial/archival.py Thu Mar 21 22:09:15 2013 +0100 @@ -13,6 +13,7 @@ import cStringIO, os, tarfile, time, zipfile import zlib, gzip import struct +import error # from unzip source code: _UNX_IFREG = 0x8000 @@ -288,20 +289,25 @@ files = [f for f in ctx.manifest().keys() if matchfn(f)] else: files = ctx.manifest().keys() - files.sort() total = len(files) - repo.ui.progress(_('archiving'), 0, unit=_('files'), total=total) - for i, f in enumerate(files): - ff = ctx.flags(f) - write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data) - repo.ui.progress(_('archiving'), i + 1, item=f, - unit=_('files'), total=total) - repo.ui.progress(_('archiving'), None) + if total: + files.sort() + repo.ui.progress(_('archiving'), 0, unit=_('files'), total=total) + for i, f in enumerate(files): + ff = ctx.flags(f) + write(f, 'x' in ff and 0755 or 0644, 'l' in ff, ctx[f].data) + repo.ui.progress(_('archiving'), i + 1, item=f, + unit=_('files'), total=total) + repo.ui.progress(_('archiving'), None) if subrepos: for subpath in sorted(ctx.substate): sub = ctx.sub(subpath) submatch = matchmod.narrowmatcher(subpath, matchfn) - sub.archive(repo.ui, archiver, prefix, submatch) + total += sub.archive(repo.ui, archiver, prefix, submatch) + + if total == 0: + raise error.Abort(_('no files match the archive pattern')) archiver.done() + return total