2014-08-06 20:43:59 +04:00
|
|
|
#require serve
|
2011-11-07 06:24:53 +04:00
|
|
|
|
2011-04-19 14:04:44 +04:00
|
|
|
$ hg init test
|
2010-08-14 04:22:10 +04:00
|
|
|
$ cd test
|
|
|
|
$ echo foo>foo
|
|
|
|
$ hg commit -Am 1 -d '1 0'
|
|
|
|
adding foo
|
|
|
|
$ echo bar>bar
|
|
|
|
$ hg commit -Am 2 -d '2 0'
|
|
|
|
adding bar
|
|
|
|
$ mkdir baz
|
|
|
|
$ echo bletch>baz/bletch
|
|
|
|
$ hg commit -Am 3 -d '1000000000 0'
|
|
|
|
adding baz/bletch
|
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Previously, only the top level repo was shared, and then any subrepos were
cloned on demand. This is problematic because commits to the parent repo would
write an updated .hgsubstate to the share source, but the corresponding subrepo
commit would be stuck in the local subrepo. That would prevent an update in the
source repo. We already go to great lengths to avoid having inconsistent repos
(e.g., `hg push -r rev` will push _everything_ in a subrepo, even if it isn't
referenced in one of the parent's outgoing commits). Therefore, this seems like
a bug fix, and there's no option to get the old behavior. I can't imagine the
previous behavior was useful to anybody.
There shouldn't be an issue with svn, since it is centralized. Maybe --git-dir
can be used for git subrepos, but I'll leave that to someone more familiar with
git.
An integer was previously being implicitly returned from commands.share(), which
caused dispatch() to start crashing when changing over to returning the shared
repo. All error paths appear to raise, so this can be hardcoded to success.
The clone command checks for 'is None' in a similar pattern, but since
hg.clone() always returns a tuple, that seems wrong?
.. fix:: Issue 5675
Creating a share of a repository with a Mercurial subrepository will now
share the subrepository.
and
.. bc::
Mercurial subrepositories are now shared instead of cloned when the parent
repository is shared. This prevents dangling subrepository references in the
share source. Previously shared repositories with cloned subrepositories
will continue to function unchanged.
2017-10-16 05:48:02 +03:00
|
|
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> share =
|
|
|
|
> EOF
|
|
|
|
|
2010-08-14 04:22:10 +04:00
|
|
|
$ echo "[web]" >> .hg/hgrc
|
|
|
|
$ echo "name = test-archive" >> .hg/hgrc
|
|
|
|
$ cp .hg/hgrc .hg/hgrc-base
|
|
|
|
> test_archtype() {
|
|
|
|
> echo "allow_archive = $1" >> .hg/hgrc
|
2017-10-12 18:22:54 +03:00
|
|
|
> test_archtype_run "$@"
|
|
|
|
> }
|
|
|
|
> test_archtype_deprecated() {
|
|
|
|
> echo "allow$1 = True" >> .hg/hgrc
|
|
|
|
> test_archtype_run "$@"
|
|
|
|
> }
|
|
|
|
> test_archtype_run() {
|
2019-06-07 06:20:42 +03:00
|
|
|
> hg serve -p 0 --port-file $TESTTMP/.p -d --pid-file=hg.pid -E errors.log
|
2018-02-08 22:19:42 +03:00
|
|
|
> HGPORT=`cat $TESTTMP/.p`
|
2010-08-14 04:22:10 +04:00
|
|
|
> cat hg.pid >> $DAEMON_PIDS
|
|
|
|
> echo % $1 allowed should give 200
|
2015-06-08 22:44:30 +03:00
|
|
|
> get-with-headers.py localhost:$HGPORT "archive/tip.$2" | head -n 1
|
2010-08-14 04:22:10 +04:00
|
|
|
> echo % $3 and $4 disallowed should both give 403
|
2015-06-08 22:44:30 +03:00
|
|
|
> get-with-headers.py localhost:$HGPORT "archive/tip.$3" | head -n 1
|
|
|
|
> get-with-headers.py localhost:$HGPORT "archive/tip.$4" | head -n 1
|
2015-06-08 22:55:40 +03:00
|
|
|
> killdaemons.py
|
2010-08-14 04:22:10 +04:00
|
|
|
> cat errors.log
|
|
|
|
> cp .hg/hgrc-base .hg/hgrc
|
|
|
|
> }
|
|
|
|
|
|
|
|
The '-t' should override autodetection
|
|
|
|
|
|
|
|
$ hg archive -t tar autodetect_override_test.zip
|
|
|
|
$ tar tf autodetect_override_test.zip
|
|
|
|
autodetect_override_test.zip/.hg_archival.txt
|
|
|
|
autodetect_override_test.zip/bar
|
|
|
|
autodetect_override_test.zip/baz/bletch
|
|
|
|
autodetect_override_test.zip/foo
|
|
|
|
|
|
|
|
$ for ext in tar tar.gz tgz tar.bz2 tbz2 zip; do
|
|
|
|
> hg archive auto_test.$ext
|
|
|
|
> if [ -d auto_test.$ext ]; then
|
|
|
|
> echo "extension $ext was not autodetected."
|
|
|
|
> fi
|
|
|
|
> done
|
|
|
|
|
|
|
|
$ cat > md5comp.py <<EOF
|
2017-08-22 21:57:52 +03:00
|
|
|
> from __future__ import absolute_import, print_function
|
|
|
|
> import hashlib
|
2010-08-14 04:22:10 +04:00
|
|
|
> import sys
|
|
|
|
> f1, f2 = sys.argv[1:3]
|
2017-08-22 21:57:52 +03:00
|
|
|
> h1 = hashlib.md5(open(f1, 'rb').read()).hexdigest()
|
|
|
|
> h2 = hashlib.md5(open(f2, 'rb').read()).hexdigest()
|
2016-05-06 22:15:37 +03:00
|
|
|
> print(h1 == h2 or "md5 differ: " + repr((h1, h2)))
|
2010-08-14 04:22:10 +04:00
|
|
|
> EOF
|
|
|
|
|
2010-12-15 11:52:20 +03:00
|
|
|
archive name is stored in the archive, so create similar archives and
|
|
|
|
rename them afterwards.
|
2010-08-14 04:22:10 +04:00
|
|
|
|
|
|
|
$ hg archive -t tgz tip.tar.gz
|
|
|
|
$ mv tip.tar.gz tip1.tar.gz
|
|
|
|
$ sleep 1
|
|
|
|
$ hg archive -t tgz tip.tar.gz
|
|
|
|
$ mv tip.tar.gz tip2.tar.gz
|
2017-06-20 16:45:02 +03:00
|
|
|
$ $PYTHON md5comp.py tip1.tar.gz tip2.tar.gz
|
2010-08-14 04:22:10 +04:00
|
|
|
True
|
|
|
|
|
|
|
|
$ hg archive -t zip -p /illegal test.zip
|
|
|
|
abort: archive prefix contains illegal components
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:22:10 +04:00
|
|
|
$ hg archive -t zip -p very/../bad test.zip
|
|
|
|
|
|
|
|
$ hg archive --config ui.archivemeta=false -t zip -r 2 test.zip
|
|
|
|
$ unzip -t test.zip
|
|
|
|
Archive: test.zip
|
2016-07-15 19:49:58 +03:00
|
|
|
testing: test/bar*OK (glob)
|
|
|
|
testing: test/baz/bletch*OK (glob)
|
|
|
|
testing: test/foo*OK (glob)
|
2010-08-14 04:22:10 +04:00
|
|
|
No errors detected in compressed data of test.zip.
|
|
|
|
|
2010-09-22 01:44:13 +04:00
|
|
|
$ hg archive -t tar - | tar tf - 2>/dev/null
|
2019-03-11 20:37:29 +03:00
|
|
|
test-2c0277f05ed4/.hg_archival.txt
|
|
|
|
test-2c0277f05ed4/bar
|
|
|
|
test-2c0277f05ed4/baz/bletch
|
|
|
|
test-2c0277f05ed4/foo
|
2010-08-14 04:22:10 +04:00
|
|
|
|
|
|
|
$ hg archive -r 0 -t tar rev-%r.tar
|
2013-10-03 16:50:46 +04:00
|
|
|
$ [ -f rev-0.tar ]
|
2010-08-14 04:22:10 +04:00
|
|
|
|
|
|
|
test .hg_archival.txt
|
|
|
|
|
|
|
|
$ hg archive ../test-tags
|
|
|
|
$ cat ../test-tags/.hg_archival.txt
|
|
|
|
repo: daa7f7c60e0a224faa4ff77ca41b2760562af264
|
2019-03-11 20:37:29 +03:00
|
|
|
node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e
|
2010-08-14 04:22:10 +04:00
|
|
|
branch: default
|
|
|
|
latesttag: null
|
2019-03-11 20:37:29 +03:00
|
|
|
latesttagdistance: 3
|
|
|
|
changessincelatesttag: 3
|
2010-08-14 04:22:10 +04:00
|
|
|
$ hg tag -r 2 mytag
|
|
|
|
$ hg tag -r 2 anothertag
|
|
|
|
$ hg archive -r 2 ../test-lasttag
|
|
|
|
$ cat ../test-lasttag/.hg_archival.txt
|
|
|
|
repo: daa7f7c60e0a224faa4ff77ca41b2760562af264
|
|
|
|
node: 2c0277f05ed49d1c8328fb9ba92fba7a5ebcb33e
|
|
|
|
branch: default
|
|
|
|
tag: anothertag
|
|
|
|
tag: mytag
|
|
|
|
|
|
|
|
$ hg archive -t bogus test.bogus
|
|
|
|
abort: unknown archive type 'bogus'
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-14 04:22:10 +04:00
|
|
|
|
|
|
|
empty repo
|
|
|
|
|
|
|
|
$ hg init ../empty
|
|
|
|
$ cd ../empty
|
|
|
|
$ hg archive ../test-empty
|
|
|
|
abort: no working directory: please specify a revision
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-12-15 11:52:20 +03:00
|
|
|
|
2010-09-20 17:42:58 +04:00
|
|
|
old file -- date clamped to 1980
|
|
|
|
|
2010-09-23 00:33:08 +04:00
|
|
|
$ touch -t 197501010000 old
|
2010-09-20 17:42:58 +04:00
|
|
|
$ hg add old
|
|
|
|
$ hg commit -m old
|
|
|
|
$ hg archive ../old.zip
|
2017-01-19 07:43:41 +03:00
|
|
|
$ unzip -l ../old.zip | grep -v -- ----- | egrep -v files$
|
2010-09-20 17:42:58 +04:00
|
|
|
Archive: ../old.zip
|
2010-09-23 01:06:00 +04:00
|
|
|
\s*Length.* (re)
|
2014-12-13 02:27:13 +03:00
|
|
|
*172*80*00:00*old/.hg_archival.txt (glob)
|
2010-09-23 01:06:02 +04:00
|
|
|
*0*80*00:00*old/old (glob)
|
2012-06-11 03:40:51 +04:00
|
|
|
|
2013-03-22 01:09:15 +04:00
|
|
|
show an error when a provided pattern matches no files
|
|
|
|
|
|
|
|
$ hg archive -I file_that_does_not_exist.foo ../empty.zip
|
|
|
|
abort: no files match the archive pattern
|
|
|
|
[255]
|
|
|
|
|
|
|
|
$ hg archive -X * ../empty.zip
|
|
|
|
abort: no files match the archive pattern
|
|
|
|
[255]
|
|
|
|
|
2012-06-11 03:40:51 +04:00
|
|
|
$ cd ..
|
2012-09-18 14:46:15 +04:00
|
|
|
|
|
|
|
issue3600: check whether "hg archive" can create archive files which
|
|
|
|
are extracted with expected timestamp, even though TZ is not
|
|
|
|
configured as GMT.
|
|
|
|
|
|
|
|
$ mkdir issue3600
|
|
|
|
$ cd issue3600
|
|
|
|
|
|
|
|
$ hg init repo
|
|
|
|
$ echo a > repo/a
|
|
|
|
$ hg -R repo add repo/a
|
|
|
|
$ hg -R repo commit -m '#0' -d '456789012 21600'
|
|
|
|
$ cat > show_mtime.py <<EOF
|
2017-08-22 21:58:21 +03:00
|
|
|
> from __future__ import absolute_import, print_function
|
|
|
|
> import os
|
|
|
|
> import sys
|
2016-05-06 22:15:37 +03:00
|
|
|
> print(int(os.stat(sys.argv[1]).st_mtime))
|
2012-09-18 14:46:15 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg -R repo archive --prefix tar-extracted archive.tar
|
|
|
|
$ (TZ=UTC-3; export TZ; tar xf archive.tar)
|
2017-06-20 16:45:02 +03:00
|
|
|
$ $PYTHON show_mtime.py tar-extracted/a
|
2012-09-18 14:46:15 +04:00
|
|
|
456789012
|
|
|
|
|
|
|
|
$ hg -R repo archive --prefix zip-extracted archive.zip
|
|
|
|
$ (TZ=UTC-3; export TZ; unzip -q archive.zip)
|
2017-06-20 16:45:02 +03:00
|
|
|
$ $PYTHON show_mtime.py zip-extracted/a
|
2012-09-18 14:46:15 +04:00
|
|
|
456789012
|
|
|
|
|
|
|
|
$ cd ..
|