2016-02-08 12:29:17 +03:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
2016-02-08 12:29:17 +03:00
|
|
|
> [extdiff]
|
|
|
|
> # for portability:
|
|
|
|
> pdiff = sh "$RUNTESTDIR/pdiff"
|
2016-03-21 07:01:29 +03:00
|
|
|
> [progress]
|
|
|
|
> disable=False
|
|
|
|
> assume-tty = 1
|
|
|
|
> delay = 0
|
|
|
|
> # set changedelay really large so we don't see nested topics
|
|
|
|
> changedelay = 30000
|
|
|
|
> format = topic bar number
|
|
|
|
> refresh = 0
|
|
|
|
> width = 60
|
2016-02-08 12:29:17 +03:00
|
|
|
> EOF
|
|
|
|
|
2010-08-17 18:52:26 +04:00
|
|
|
Preparing the subrepository 'sub2'
|
|
|
|
|
|
|
|
$ hg init sub2
|
|
|
|
$ echo sub2 > sub2/sub2
|
|
|
|
$ hg add -R sub2
|
2011-11-07 06:25:10 +04:00
|
|
|
adding sub2/sub2 (glob)
|
2010-08-17 18:52:26 +04:00
|
|
|
$ hg commit -R sub2 -m "sub2 import"
|
|
|
|
|
|
|
|
Preparing the 'sub1' repo which depends on the subrepo 'sub2'
|
|
|
|
|
|
|
|
$ hg init sub1
|
|
|
|
$ echo sub1 > sub1/sub1
|
|
|
|
$ echo "sub2 = ../sub2" > sub1/.hgsub
|
2010-08-30 08:37:12 +04:00
|
|
|
$ hg clone sub2 sub1/sub2
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 1\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 2\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 3\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 4\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 5\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 6\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2010-08-17 18:52:26 +04:00
|
|
|
updating to branch default
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg add -R sub1
|
2011-11-07 06:25:10 +04:00
|
|
|
adding sub1/.hgsub (glob)
|
|
|
|
adding sub1/sub1 (glob)
|
2010-08-17 18:52:26 +04:00
|
|
|
$ hg commit -R sub1 -m "sub1 import"
|
|
|
|
|
|
|
|
Preparing the 'main' repo which depends on the subrepo 'sub1'
|
|
|
|
|
|
|
|
$ hg init main
|
|
|
|
$ echo main > main/main
|
|
|
|
$ echo "sub1 = ../sub1" > main/.hgsub
|
2010-08-30 08:37:12 +04:00
|
|
|
$ hg clone sub1 main/sub1
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 1\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 2\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 3\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 4\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 5\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 6\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 7\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 8\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2010-08-17 18:52:26 +04:00
|
|
|
updating to branch default
|
2011-05-09 19:15:44 +04:00
|
|
|
cloning subrepo sub2 from $TESTTMP/sub2
|
2010-08-17 18:52:26 +04:00
|
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg add -R main
|
2011-11-07 06:25:10 +04:00
|
|
|
adding main/.hgsub (glob)
|
|
|
|
adding main/main (glob)
|
2010-08-17 18:52:26 +04:00
|
|
|
$ hg commit -R main -m "main import"
|
|
|
|
|
serve: add support for Mercurial subrepositories
I've been using `hg serve --web-conf ...` with a simple '/=projects/**' [paths]
configuration for awhile without issue. Let's ditch the need for the manual
configuration in this case, and limit the repos served to the actual subrepos.
This doesn't attempt to handle the case where a new subrepo appears while the
server is running. That could probably be handled with a hook if somebody wants
it. But it's such a rare case, it probably doesn't matter for the temporary
serves.
The main repo is served at '/', just like a repository without subrepos. I'm
not sure why the duplicate 'adding ...' lines appear on Linux. They don't
appear on Windows (see 3f4ff1bdf101), so they are optional.
Subrepositories that are configured with '../path' or absolute paths are not
cloneable from the server. (They aren't cloneable locally either, unless they
also exist at their configured source, perhaps via the share extension.) They
are still served, so that they can be browsed, or cloned individually. If we
care about that cloning someday, we can probably just add the extra entries to
the webconf dictionary. Even if the entries use '../' to escape the root, only
the related subrepositories would end up in the dictionary.
2017-04-16 01:05:40 +03:00
|
|
|
#if serve
|
|
|
|
|
|
|
|
Unfortunately, subrepos not at their nominal location cannot be cloned. But
|
|
|
|
they are still served from their location within the local repository. The only
|
|
|
|
reason why 'main' can be cloned via the filesystem is because 'sub1' and 'sub2'
|
|
|
|
are also available as siblings of 'main'.
|
|
|
|
|
|
|
|
$ hg serve -R main --debug -S -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
|
|
|
|
adding = $TESTTMP/main (glob)
|
|
|
|
adding sub1 = $TESTTMP/main/sub1 (glob)
|
|
|
|
adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (glob)
|
|
|
|
listening at http://*:$HGPORT/ (bound to *:$HGPORT) (glob) (?)
|
|
|
|
adding = $TESTTMP/main (glob) (?)
|
|
|
|
adding sub1 = $TESTTMP/main/sub1 (glob) (?)
|
|
|
|
adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (glob) (?)
|
|
|
|
$ cat hg1.pid >> $DAEMON_PIDS
|
|
|
|
|
|
|
|
$ hg clone http://localhost:$HGPORT httpclone --config progress.disable=True
|
|
|
|
requesting all changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 3 changes to 3 files
|
|
|
|
updating to branch default
|
|
|
|
abort: HTTP Error 404: Not Found
|
|
|
|
[255]
|
|
|
|
|
|
|
|
$ cat access.log
|
|
|
|
* "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
|
|
|
|
* "GET /?cmd=batch HTTP/1.1" 200 - * (glob)
|
|
|
|
* "GET /?cmd=getbundle HTTP/1.1" 200 - * (glob)
|
|
|
|
* "GET /../sub1?cmd=capabilities HTTP/1.1" 404 - (glob)
|
|
|
|
|
|
|
|
$ killdaemons.py
|
|
|
|
$ rm hg1.pid error.log access.log
|
|
|
|
#endif
|
|
|
|
|
2010-08-17 18:52:26 +04:00
|
|
|
Cleaning both repositories, just as a clone -U
|
|
|
|
|
|
|
|
$ hg up -C -R sub2 null
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2010-08-17 18:52:26 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg up -C -R sub1 null
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2010-08-17 18:52:26 +04:00
|
|
|
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
|
|
$ hg up -C -R main null
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2010-08-17 18:52:26 +04:00
|
|
|
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
|
|
$ rm -rf main/sub1
|
|
|
|
$ rm -rf sub1/sub2
|
|
|
|
|
|
|
|
Clone main
|
|
|
|
|
2015-02-03 03:58:41 +03:00
|
|
|
$ hg --config extensions.largefiles= clone main cloned
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 1\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 2\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 3\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 4\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 5\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 6\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 7\r (no-eol) (esc)
|
|
|
|
linking [ <=> ] 8\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
updating [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2010-08-17 18:52:26 +04:00
|
|
|
updating to branch default
|
2011-05-09 19:15:44 +04:00
|
|
|
cloning subrepo sub1 from $TESTTMP/sub1
|
2011-11-07 06:25:10 +04:00
|
|
|
cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
|
2010-08-17 18:52:26 +04:00
|
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
2015-02-03 03:58:41 +03:00
|
|
|
Largefiles is NOT enabled in the clone if the source repo doesn't require it
|
|
|
|
$ cat cloned/.hg/hgrc
|
2016-09-21 02:49:00 +03:00
|
|
|
# example repository config (see 'hg help config' for more info)
|
2015-02-03 03:58:41 +03:00
|
|
|
[paths]
|
|
|
|
default = $TESTTMP/main (glob)
|
|
|
|
|
|
|
|
# path aliases to other clones of this repo in URLs or filesystem paths
|
2016-09-21 02:49:00 +03:00
|
|
|
# (see 'hg help config.paths' for more info)
|
2015-02-03 03:58:41 +03:00
|
|
|
#
|
2017-02-25 14:27:21 +03:00
|
|
|
# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
|
|
|
|
# my-fork = ssh://jdoe@example.net/hg/jdoes-fork
|
|
|
|
# my-clone = /home/jdoe/jdoes-clone
|
2015-02-03 03:58:41 +03:00
|
|
|
|
|
|
|
[ui]
|
|
|
|
# name and email (local to this repository, optional), e.g.
|
|
|
|
# username = Jane Doe <jdoe@example.com>
|
|
|
|
|
2010-08-17 18:52:26 +04:00
|
|
|
Checking cloned repo ids
|
|
|
|
|
|
|
|
$ printf "cloned " ; hg id -R cloned
|
|
|
|
cloned 7f491f53a367 tip
|
|
|
|
$ printf "cloned/sub1 " ; hg id -R cloned/sub1
|
|
|
|
cloned/sub1 fc3b4ce2696f tip
|
|
|
|
$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
|
|
|
|
cloned/sub1/sub2 c57a0840e3ba tip
|
|
|
|
|
|
|
|
debugsub output for main and sub1
|
|
|
|
|
|
|
|
$ hg debugsub -R cloned
|
|
|
|
path sub1
|
|
|
|
source ../sub1
|
|
|
|
revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
|
|
|
|
$ hg debugsub -R cloned/sub1
|
|
|
|
path sub2
|
|
|
|
source ../sub2
|
|
|
|
revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
|
|
|
|
|
|
|
|
Modifying deeply nested 'sub2'
|
|
|
|
|
|
|
|
$ echo modified > cloned/sub1/sub2/sub2
|
2011-10-21 02:33:08 +04:00
|
|
|
$ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
|
2010-08-17 18:52:26 +04:00
|
|
|
committing subrepository sub1
|
2011-11-07 06:25:10 +04:00
|
|
|
committing subrepository sub1/sub2 (glob)
|
2010-08-17 18:52:26 +04:00
|
|
|
|
|
|
|
Checking modified node ids
|
|
|
|
|
|
|
|
$ printf "cloned " ; hg id -R cloned
|
|
|
|
cloned ffe6649062fe tip
|
|
|
|
$ printf "cloned/sub1 " ; hg id -R cloned/sub1
|
|
|
|
cloned/sub1 2ecb03bf44a9 tip
|
|
|
|
$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
|
|
|
|
cloned/sub1/sub2 53dd3430bcaf tip
|
|
|
|
|
|
|
|
debugsub output for main and sub1
|
|
|
|
|
|
|
|
$ hg debugsub -R cloned
|
|
|
|
path sub1
|
|
|
|
source ../sub1
|
|
|
|
revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
|
|
|
|
$ hg debugsub -R cloned/sub1
|
|
|
|
path sub2
|
|
|
|
source ../sub2
|
|
|
|
revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
|
2012-06-18 05:57:48 +04:00
|
|
|
|
2012-06-17 06:34:06 +04:00
|
|
|
Check that deep archiving works
|
2012-08-08 20:10:30 +04:00
|
|
|
|
2012-06-17 06:34:06 +04:00
|
|
|
$ cd cloned
|
|
|
|
$ echo 'test' > sub1/sub2/test.txt
|
|
|
|
$ hg --config extensions.largefiles=! add sub1/sub2/test.txt
|
|
|
|
$ mkdir sub1/sub2/folder
|
|
|
|
$ echo 'subfolder' > sub1/sub2/folder/test.txt
|
2014-11-25 06:27:49 +03:00
|
|
|
$ hg ci -ASm "add test.txt"
|
2014-11-27 18:16:56 +03:00
|
|
|
adding sub1/sub2/folder/test.txt
|
2012-06-17 06:34:06 +04:00
|
|
|
committing subrepository sub1
|
2012-07-05 02:51:05 +04:00
|
|
|
committing subrepository sub1/sub2 (glob)
|
2014-11-16 05:36:19 +03:00
|
|
|
|
|
|
|
.. but first take a detour through some deep removal testing
|
|
|
|
|
2014-11-16 08:24:23 +03:00
|
|
|
$ hg remove -S -I 're:.*.txt' .
|
2016-03-18 00:03:22 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
searching [==========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
searching [==========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [=====================> ] 1/2\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 2/2\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2014-11-16 05:36:19 +03:00
|
|
|
removing sub1/sub2/folder/test.txt (glob)
|
|
|
|
removing sub1/sub2/test.txt (glob)
|
|
|
|
$ hg status -S
|
|
|
|
R sub1/sub2/folder/test.txt
|
|
|
|
R sub1/sub2/test.txt
|
|
|
|
$ hg update -Cq
|
2014-11-13 07:15:20 +03:00
|
|
|
$ hg remove -I 're:.*.txt' sub1
|
2016-03-18 00:03:22 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
searching [==========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2014-11-13 07:15:20 +03:00
|
|
|
$ hg status -S
|
|
|
|
$ hg remove sub1/sub2/folder/test.txt
|
2016-03-18 00:03:22 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
searching [==========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
searching [==========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2014-11-13 07:15:20 +03:00
|
|
|
$ hg remove sub1/.hgsubstate
|
2016-03-18 00:03:22 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
searching [==========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2015-04-05 22:08:55 +03:00
|
|
|
$ mv sub1/.hgsub sub1/x.hgsub
|
2014-11-13 07:15:20 +03:00
|
|
|
$ hg status -S
|
2015-07-21 05:48:42 +03:00
|
|
|
warning: subrepo spec file 'sub1/.hgsub' not found
|
2014-11-13 07:15:20 +03:00
|
|
|
R sub1/.hgsubstate
|
|
|
|
R sub1/sub2/folder/test.txt
|
2015-04-05 22:08:55 +03:00
|
|
|
! sub1/.hgsub
|
|
|
|
? sub1/x.hgsub
|
|
|
|
$ mv sub1/x.hgsub sub1/.hgsub
|
2014-11-13 07:15:20 +03:00
|
|
|
$ hg update -Cq
|
2014-11-25 07:51:26 +03:00
|
|
|
$ touch sub1/foo
|
|
|
|
$ hg forget sub1/sub2/folder/test.txt
|
|
|
|
$ rm sub1/sub2/test.txt
|
|
|
|
|
|
|
|
Test relative path printing + subrepos
|
|
|
|
$ mkdir -p foo/bar
|
|
|
|
$ cd foo
|
|
|
|
$ touch bar/abc
|
|
|
|
$ hg addremove -S ..
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
searching for exact renames [ ] 0/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2014-11-25 07:51:26 +03:00
|
|
|
adding ../sub1/sub2/folder/test.txt (glob)
|
|
|
|
removing ../sub1/sub2/test.txt (glob)
|
|
|
|
adding ../sub1/foo (glob)
|
|
|
|
adding bar/abc (glob)
|
|
|
|
$ cd ..
|
|
|
|
$ hg status -S
|
|
|
|
A foo/bar/abc
|
|
|
|
A sub1/foo
|
|
|
|
R sub1/sub2/test.txt
|
2015-06-17 06:06:57 +03:00
|
|
|
|
|
|
|
Archive wdir() with subrepos
|
|
|
|
$ hg rm main
|
2016-03-18 00:03:22 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2015-06-17 06:06:57 +03:00
|
|
|
$ hg archive -S -r 'wdir()' ../wdir
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving [=============> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving [===========================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ ] 0/4\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [========> ] 1/4\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [=================> ] 2/4\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [==========================> ] 3/4\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2015-07-21 01:42:39 +03:00
|
|
|
$ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
|
2015-06-17 06:06:57 +03:00
|
|
|
Only in ../wdir: .hg_archival.txt
|
|
|
|
|
|
|
|
$ find ../wdir -type f | sort
|
|
|
|
../wdir/.hg_archival.txt
|
|
|
|
../wdir/.hgsub
|
|
|
|
../wdir/.hgsubstate
|
|
|
|
../wdir/foo/bar/abc
|
|
|
|
../wdir/sub1/.hgsub
|
|
|
|
../wdir/sub1/.hgsubstate
|
|
|
|
../wdir/sub1/foo
|
|
|
|
../wdir/sub1/sub1
|
|
|
|
../wdir/sub1/sub2/folder/test.txt
|
|
|
|
../wdir/sub1/sub2/sub2
|
|
|
|
|
2015-06-17 06:14:45 +03:00
|
|
|
$ cat ../wdir/.hg_archival.txt
|
|
|
|
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
|
|
|
|
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
|
|
|
|
branch: default
|
|
|
|
latesttag: null
|
|
|
|
latesttagdistance: 4
|
2015-07-01 23:12:45 +03:00
|
|
|
changessincelatesttag: 4
|
2015-06-17 06:14:45 +03:00
|
|
|
|
2015-06-17 06:06:57 +03:00
|
|
|
Attempting to archive 'wdir()' with a missing file is handled gracefully
|
|
|
|
$ rm sub1/sub1
|
|
|
|
$ rm -r ../wdir
|
|
|
|
$ hg archive -v -S -r 'wdir()' ../wdir
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving [=============> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving [===========================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2015-06-17 06:06:57 +03:00
|
|
|
$ find ../wdir -type f | sort
|
|
|
|
../wdir/.hg_archival.txt
|
|
|
|
../wdir/.hgsub
|
|
|
|
../wdir/.hgsubstate
|
|
|
|
../wdir/foo/bar/abc
|
|
|
|
../wdir/sub1/.hgsub
|
|
|
|
../wdir/sub1/.hgsubstate
|
|
|
|
../wdir/sub1/foo
|
|
|
|
../wdir/sub1/sub2/folder/test.txt
|
|
|
|
../wdir/sub1/sub2/sub2
|
|
|
|
|
|
|
|
Continue relative path printing + subrepos
|
2014-11-25 07:51:26 +03:00
|
|
|
$ hg update -Cq
|
2015-06-17 06:14:45 +03:00
|
|
|
$ rm -r ../wdir
|
|
|
|
$ hg archive -S -r 'wdir()' ../wdir
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving [=============> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving [===========================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2015-06-17 06:14:45 +03:00
|
|
|
$ cat ../wdir/.hg_archival.txt
|
|
|
|
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
|
|
|
|
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
|
|
|
|
branch: default
|
|
|
|
latesttag: null
|
|
|
|
latesttagdistance: 4
|
2015-07-01 23:12:45 +03:00
|
|
|
changessincelatesttag: 4
|
2015-06-17 06:14:45 +03:00
|
|
|
|
2014-11-10 07:46:25 +03:00
|
|
|
$ touch sub1/sub2/folder/bar
|
|
|
|
$ hg addremove sub1/sub2
|
|
|
|
adding sub1/sub2/folder/bar (glob)
|
|
|
|
$ hg status -S
|
|
|
|
A sub1/sub2/folder/bar
|
|
|
|
? foo/bar/abc
|
|
|
|
? sub1/foo
|
|
|
|
$ hg update -Cq
|
2014-12-01 06:47:53 +03:00
|
|
|
$ hg addremove sub1
|
|
|
|
adding sub1/sub2/folder/bar (glob)
|
|
|
|
adding sub1/foo (glob)
|
|
|
|
$ hg update -Cq
|
2014-11-25 06:27:49 +03:00
|
|
|
$ rm sub1/sub2/folder/test.txt
|
|
|
|
$ rm sub1/sub2/test.txt
|
|
|
|
$ hg ci -ASm "remove test.txt"
|
2014-11-27 18:16:56 +03:00
|
|
|
adding sub1/sub2/folder/bar
|
|
|
|
removing sub1/sub2/folder/test.txt
|
|
|
|
removing sub1/sub2/test.txt
|
|
|
|
adding sub1/foo
|
2014-11-25 07:51:26 +03:00
|
|
|
adding foo/bar/abc
|
2014-11-25 06:27:49 +03:00
|
|
|
committing subrepository sub1
|
|
|
|
committing subrepository sub1/sub2 (glob)
|
2015-03-19 06:03:41 +03:00
|
|
|
|
|
|
|
$ hg forget sub1/sub2/sub2
|
|
|
|
$ echo x > sub1/sub2/x.txt
|
|
|
|
$ hg add sub1/sub2/x.txt
|
|
|
|
|
|
|
|
Files sees uncommitted adds and removes in subrepos
|
|
|
|
$ hg files -S
|
|
|
|
.hgsub
|
|
|
|
.hgsubstate
|
|
|
|
foo/bar/abc (glob)
|
|
|
|
main
|
|
|
|
sub1/.hgsub (glob)
|
|
|
|
sub1/.hgsubstate (glob)
|
|
|
|
sub1/foo (glob)
|
|
|
|
sub1/sub1 (glob)
|
|
|
|
sub1/sub2/folder/bar (glob)
|
|
|
|
sub1/sub2/x.txt (glob)
|
|
|
|
|
2015-05-16 07:36:35 +03:00
|
|
|
$ hg files -S "set:eol('dos') or eol('unix') or size('<= 0')"
|
|
|
|
.hgsub
|
|
|
|
.hgsubstate
|
|
|
|
foo/bar/abc (glob)
|
|
|
|
main
|
|
|
|
sub1/.hgsub (glob)
|
|
|
|
sub1/.hgsubstate (glob)
|
|
|
|
sub1/foo (glob)
|
|
|
|
sub1/sub1 (glob)
|
|
|
|
sub1/sub2/folder/bar (glob)
|
|
|
|
sub1/sub2/x.txt (glob)
|
|
|
|
|
|
|
|
$ hg files -r '.^' -S "set:eol('dos') or eol('unix')"
|
|
|
|
.hgsub
|
|
|
|
.hgsubstate
|
|
|
|
main
|
|
|
|
sub1/.hgsub (glob)
|
|
|
|
sub1/.hgsubstate (glob)
|
|
|
|
sub1/sub1 (glob)
|
|
|
|
sub1/sub2/folder/test.txt (glob)
|
|
|
|
sub1/sub2/sub2 (glob)
|
|
|
|
sub1/sub2/test.txt (glob)
|
|
|
|
|
2015-05-18 05:42:47 +03:00
|
|
|
$ hg files sub1
|
|
|
|
sub1/.hgsub (glob)
|
|
|
|
sub1/.hgsubstate (glob)
|
|
|
|
sub1/foo (glob)
|
|
|
|
sub1/sub1 (glob)
|
|
|
|
sub1/sub2/folder/bar (glob)
|
|
|
|
sub1/sub2/x.txt (glob)
|
|
|
|
|
|
|
|
$ hg files sub1/sub2
|
|
|
|
sub1/sub2/folder/bar (glob)
|
|
|
|
sub1/sub2/x.txt (glob)
|
|
|
|
|
2016-03-06 22:30:34 +03:00
|
|
|
$ hg files
|
|
|
|
.hgsub
|
|
|
|
.hgsubstate
|
|
|
|
foo/bar/abc (glob)
|
|
|
|
main
|
|
|
|
|
2015-05-17 08:06:10 +03:00
|
|
|
$ hg files -S -r '.^' sub1/sub2/folder
|
|
|
|
sub1/sub2/folder/test.txt (glob)
|
|
|
|
|
|
|
|
$ hg files -S -r '.^' sub1/sub2/missing
|
|
|
|
sub1/sub2/missing: no such file in rev 78026e779ea6 (glob)
|
|
|
|
[1]
|
|
|
|
|
2015-05-18 05:42:47 +03:00
|
|
|
$ hg files -r '.^' sub1/
|
2015-05-18 05:09:37 +03:00
|
|
|
sub1/.hgsub (glob)
|
|
|
|
sub1/.hgsubstate (glob)
|
|
|
|
sub1/sub1 (glob)
|
|
|
|
sub1/sub2/folder/test.txt (glob)
|
|
|
|
sub1/sub2/sub2 (glob)
|
|
|
|
sub1/sub2/test.txt (glob)
|
|
|
|
|
2015-05-18 05:42:47 +03:00
|
|
|
$ hg files -r '.^' sub1/sub2
|
2015-05-18 05:09:37 +03:00
|
|
|
sub1/sub2/folder/test.txt (glob)
|
|
|
|
sub1/sub2/sub2 (glob)
|
|
|
|
sub1/sub2/test.txt (glob)
|
|
|
|
|
2014-11-25 06:27:49 +03:00
|
|
|
$ hg rollback -q
|
|
|
|
$ hg up -Cq
|
2014-11-16 05:36:19 +03:00
|
|
|
|
2012-06-17 06:34:06 +04:00
|
|
|
$ hg --config extensions.largefiles=! archive -S ../archive_all
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving [=============> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving [===========================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2012-06-17 06:34:06 +04:00
|
|
|
$ find ../archive_all | sort
|
|
|
|
../archive_all
|
|
|
|
../archive_all/.hg_archival.txt
|
|
|
|
../archive_all/.hgsub
|
|
|
|
../archive_all/.hgsubstate
|
|
|
|
../archive_all/main
|
|
|
|
../archive_all/sub1
|
|
|
|
../archive_all/sub1/.hgsub
|
|
|
|
../archive_all/sub1/.hgsubstate
|
|
|
|
../archive_all/sub1/sub1
|
|
|
|
../archive_all/sub1/sub2
|
|
|
|
../archive_all/sub1/sub2/folder
|
|
|
|
../archive_all/sub1/sub2/folder/test.txt
|
|
|
|
../archive_all/sub1/sub2/sub2
|
|
|
|
../archive_all/sub1/sub2/test.txt
|
|
|
|
|
|
|
|
Check that archive -X works in deep subrepos
|
|
|
|
|
|
|
|
$ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving [=============> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving [===========================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2012-06-17 06:34:06 +04:00
|
|
|
$ find ../archive_exclude | sort
|
|
|
|
../archive_exclude
|
|
|
|
../archive_exclude/.hg_archival.txt
|
|
|
|
../archive_exclude/.hgsub
|
|
|
|
../archive_exclude/.hgsubstate
|
|
|
|
../archive_exclude/main
|
|
|
|
../archive_exclude/sub1
|
|
|
|
../archive_exclude/sub1/.hgsub
|
|
|
|
../archive_exclude/sub1/.hgsubstate
|
|
|
|
../archive_exclude/sub1/sub1
|
|
|
|
../archive_exclude/sub1/sub2
|
|
|
|
../archive_exclude/sub1/sub2/sub2
|
|
|
|
|
|
|
|
$ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2012-06-17 06:34:06 +04:00
|
|
|
$ find ../archive_include | sort
|
|
|
|
../archive_include
|
|
|
|
../archive_include/sub1
|
|
|
|
../archive_include/sub1/sub2
|
|
|
|
../archive_include/sub1/sub2/folder
|
|
|
|
../archive_include/sub1/sub2/folder/test.txt
|
|
|
|
../archive_include/sub1/sub2/test.txt
|
|
|
|
|
2012-06-18 05:57:48 +04:00
|
|
|
Check that deep archive works with largefiles (which overrides hgsubrepo impl)
|
|
|
|
This also tests the repo.ui regression in 43fb170a23bd, and that lf subrepo
|
|
|
|
subrepos are archived properly.
|
|
|
|
Note that add --large through a subrepo currently adds the file as a normal file
|
|
|
|
|
|
|
|
$ echo "large" > sub1/sub2/large.bin
|
|
|
|
$ hg --config extensions.largefiles= add --large -R sub1/sub2 sub1/sub2/large.bin
|
|
|
|
$ echo "large" > large.bin
|
|
|
|
$ hg --config extensions.largefiles= add --large large.bin
|
|
|
|
$ hg --config extensions.largefiles= ci -S -m "add large files"
|
|
|
|
committing subrepository sub1
|
2012-07-05 02:51:05 +04:00
|
|
|
committing subrepository sub1/sub2 (glob)
|
2012-06-18 05:57:48 +04:00
|
|
|
|
|
|
|
$ hg --config extensions.largefiles= archive -S ../archive_lf
|
|
|
|
$ find ../archive_lf | sort
|
|
|
|
../archive_lf
|
|
|
|
../archive_lf/.hg_archival.txt
|
|
|
|
../archive_lf/.hgsub
|
|
|
|
../archive_lf/.hgsubstate
|
|
|
|
../archive_lf/large.bin
|
|
|
|
../archive_lf/main
|
|
|
|
../archive_lf/sub1
|
|
|
|
../archive_lf/sub1/.hgsub
|
|
|
|
../archive_lf/sub1/.hgsubstate
|
|
|
|
../archive_lf/sub1/sub1
|
2012-06-19 07:02:51 +04:00
|
|
|
../archive_lf/sub1/sub2
|
2012-06-17 06:34:06 +04:00
|
|
|
../archive_lf/sub1/sub2/folder
|
|
|
|
../archive_lf/sub1/sub2/folder/test.txt
|
2012-06-19 07:02:51 +04:00
|
|
|
../archive_lf/sub1/sub2/large.bin
|
|
|
|
../archive_lf/sub1/sub2/sub2
|
2012-06-17 06:34:06 +04:00
|
|
|
../archive_lf/sub1/sub2/test.txt
|
|
|
|
$ rm -rf ../archive_lf
|
|
|
|
|
|
|
|
Exclude large files from main and sub-sub repo
|
|
|
|
|
|
|
|
$ hg --config extensions.largefiles= archive -S -X '**.bin' ../archive_lf
|
|
|
|
$ find ../archive_lf | sort
|
|
|
|
../archive_lf
|
|
|
|
../archive_lf/.hg_archival.txt
|
|
|
|
../archive_lf/.hgsub
|
|
|
|
../archive_lf/.hgsubstate
|
|
|
|
../archive_lf/main
|
|
|
|
../archive_lf/sub1
|
|
|
|
../archive_lf/sub1/.hgsub
|
|
|
|
../archive_lf/sub1/.hgsubstate
|
|
|
|
../archive_lf/sub1/sub1
|
|
|
|
../archive_lf/sub1/sub2
|
|
|
|
../archive_lf/sub1/sub2/folder
|
|
|
|
../archive_lf/sub1/sub2/folder/test.txt
|
|
|
|
../archive_lf/sub1/sub2/sub2
|
|
|
|
../archive_lf/sub1/sub2/test.txt
|
|
|
|
$ rm -rf ../archive_lf
|
|
|
|
|
|
|
|
Exclude normal files from main and sub-sub repo
|
|
|
|
|
2015-05-06 03:52:38 +03:00
|
|
|
$ hg --config extensions.largefiles= archive -S -X '**.txt' -p '.' ../archive_lf.tgz
|
2015-05-05 05:33:29 +03:00
|
|
|
$ tar -tzf ../archive_lf.tgz | sort
|
2015-05-06 03:52:38 +03:00
|
|
|
.hgsub
|
|
|
|
.hgsubstate
|
|
|
|
large.bin
|
|
|
|
main
|
|
|
|
sub1/.hgsub
|
|
|
|
sub1/.hgsubstate
|
|
|
|
sub1/sub1
|
|
|
|
sub1/sub2/large.bin
|
|
|
|
sub1/sub2/sub2
|
2012-06-17 06:34:06 +04:00
|
|
|
|
|
|
|
Include normal files from within a largefiles subrepo
|
|
|
|
|
|
|
|
$ hg --config extensions.largefiles= archive -S -I '**.txt' ../archive_lf
|
|
|
|
$ find ../archive_lf | sort
|
|
|
|
../archive_lf
|
|
|
|
../archive_lf/.hg_archival.txt
|
|
|
|
../archive_lf/sub1
|
|
|
|
../archive_lf/sub1/sub2
|
|
|
|
../archive_lf/sub1/sub2/folder
|
|
|
|
../archive_lf/sub1/sub2/folder/test.txt
|
|
|
|
../archive_lf/sub1/sub2/test.txt
|
|
|
|
$ rm -rf ../archive_lf
|
|
|
|
|
|
|
|
Include large files from within a largefiles subrepo
|
|
|
|
|
|
|
|
$ hg --config extensions.largefiles= archive -S -I '**.bin' ../archive_lf
|
|
|
|
$ find ../archive_lf | sort
|
|
|
|
../archive_lf
|
|
|
|
../archive_lf/large.bin
|
|
|
|
../archive_lf/sub1
|
|
|
|
../archive_lf/sub1/sub2
|
|
|
|
../archive_lf/sub1/sub2/large.bin
|
|
|
|
$ rm -rf ../archive_lf
|
|
|
|
|
|
|
|
Find an exact largefile match in a largefiles subrepo
|
|
|
|
|
|
|
|
$ hg --config extensions.largefiles= archive -S -I 'sub1/sub2/large.bin' ../archive_lf
|
|
|
|
$ find ../archive_lf | sort
|
|
|
|
../archive_lf
|
|
|
|
../archive_lf/sub1
|
|
|
|
../archive_lf/sub1/sub2
|
|
|
|
../archive_lf/sub1/sub2/large.bin
|
|
|
|
$ rm -rf ../archive_lf
|
|
|
|
|
2015-02-03 03:58:41 +03:00
|
|
|
The local repo enables largefiles if a largefiles repo is cloned
|
|
|
|
$ hg showconfig extensions
|
|
|
|
abort: repository requires features unknown to this Mercurial: largefiles!
|
2015-09-30 23:43:49 +03:00
|
|
|
(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
|
2015-02-03 03:58:41 +03:00
|
|
|
[255]
|
|
|
|
$ hg --config extensions.largefiles= clone -qU . ../lfclone
|
|
|
|
$ cat ../lfclone/.hg/hgrc
|
2016-09-21 02:49:00 +03:00
|
|
|
# example repository config (see 'hg help config' for more info)
|
2015-02-03 03:58:41 +03:00
|
|
|
[paths]
|
|
|
|
default = $TESTTMP/cloned (glob)
|
|
|
|
|
|
|
|
# path aliases to other clones of this repo in URLs or filesystem paths
|
2016-09-21 02:49:00 +03:00
|
|
|
# (see 'hg help config.paths' for more info)
|
2015-02-03 03:58:41 +03:00
|
|
|
#
|
2017-02-25 14:27:21 +03:00
|
|
|
# default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
|
|
|
|
# my-fork = ssh://jdoe@example.net/hg/jdoes-fork
|
|
|
|
# my-clone = /home/jdoe/jdoes-clone
|
2015-02-03 03:58:41 +03:00
|
|
|
|
|
|
|
[ui]
|
|
|
|
# name and email (local to this repository, optional), e.g.
|
|
|
|
# username = Jane Doe <jdoe@example.com>
|
|
|
|
|
|
|
|
[extensions]
|
|
|
|
largefiles=
|
|
|
|
|
2012-06-17 06:34:06 +04:00
|
|
|
Find an exact match to a standin (should archive nothing)
|
|
|
|
$ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf
|
2012-07-05 03:47:17 +04:00
|
|
|
$ find ../archive_lf 2> /dev/null | sort
|
2012-06-18 05:57:48 +04:00
|
|
|
|
2015-01-12 07:20:51 +03:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> largefiles=
|
2015-01-13 05:44:43 +03:00
|
|
|
> [largefiles]
|
|
|
|
> patterns=glob:**.dat
|
2015-01-12 07:20:51 +03:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
Test forget through a deep subrepo with the largefiles extension, both a
|
|
|
|
largefile and a normal file. Then a largefile that hasn't been committed yet.
|
|
|
|
$ touch sub1/sub2/untracked.txt
|
2015-01-13 05:44:43 +03:00
|
|
|
$ touch sub1/sub2/large.dat
|
2015-01-12 07:20:51 +03:00
|
|
|
$ hg forget sub1/sub2/large.bin sub1/sub2/test.txt sub1/sub2/untracked.txt
|
|
|
|
not removing sub1/sub2/untracked.txt: file is already untracked (glob)
|
|
|
|
[1]
|
2015-01-13 05:44:43 +03:00
|
|
|
$ hg add --large --dry-run -v sub1/sub2/untracked.txt
|
2015-01-12 07:20:51 +03:00
|
|
|
adding sub1/sub2/untracked.txt as a largefile (glob)
|
2015-01-13 05:44:43 +03:00
|
|
|
$ hg add --large -v sub1/sub2/untracked.txt
|
|
|
|
adding sub1/sub2/untracked.txt as a largefile (glob)
|
|
|
|
$ hg add --normal -v sub1/sub2/large.dat
|
|
|
|
adding sub1/sub2/large.dat (glob)
|
2015-01-12 07:20:51 +03:00
|
|
|
$ hg forget -v sub1/sub2/untracked.txt
|
|
|
|
removing sub1/sub2/untracked.txt (glob)
|
|
|
|
$ hg status -S
|
2015-01-13 05:44:43 +03:00
|
|
|
A sub1/sub2/large.dat
|
2015-01-12 07:20:51 +03:00
|
|
|
R sub1/sub2/large.bin
|
|
|
|
R sub1/sub2/test.txt
|
|
|
|
? foo/bar/abc
|
|
|
|
? sub1/sub2/untracked.txt
|
2015-03-19 06:03:41 +03:00
|
|
|
? sub1/sub2/x.txt
|
largefiles: fix commit of a directory with no largefile changes (issue4330)
When a directory is named in the commit file list, the previous behavior was to
walk the list, and if no normal files in the directory were also named, add the
corresponding standin for each largefile in that directory. The directory is
then dropped from the list, so that committing a directory with no normal file
changes works. It then added the corresponding standin directory for the first
largefile seen, by prefixing it with '.hglf/'.
The latter is unnecessary since each affected largefile is explicitly referenced
by its standin in the list. It also caused an abort if there were no changed
largefiles in the directory, because none of its standins changed:
abort: .hglf/foo/bar: no match under directory!
This list of files is used to tweak a matcher in lfutil.updatestandinsbymatch(),
which is what is passed to commit().
The status() call that is ultimately done in the commit code with this matcher
seems to have some OS specific differences. It is not necessary to append '.'
for Windows to run the largefiles tests cleanly. But if '.' is not added to the
list, the match function isn't called on Linux, so status() would miss any
normal files that were also in a named directory. The commit then proceeds
without those normal files, or says "nothing changed" if there were no changed
largefiles in the directory. This is not filesystem specific, as VFAT on Linux
had the same behavior as when run on ext4. It is also not an issue with
lfilesrepo.status(), since that only calls the overridden implementation when
paths are passed to commit. I dont have access to an OS X machine ATM to test
there.
Maybe there's a better way to do this. But since the standin directory for the
first largefile was previously being added, and that caused the same walk in
status(), there's no preformance change to this. There is no danger of
erroneously committing files in '.', because the original match function is
called, and if it fails, the lfutil.updatestandinsbymatch() tweaked matcher only
indicates a match if the file is in the list of standins- and '.' never is. The
added tests confirm this.
2015-01-18 23:15:40 +03:00
|
|
|
$ hg add sub1/sub2
|
2015-06-17 06:06:57 +03:00
|
|
|
|
|
|
|
$ hg archive -S -r 'wdir()' ../wdir2
|
2015-07-21 01:42:39 +03:00
|
|
|
$ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:'
|
2015-06-17 06:06:57 +03:00
|
|
|
Only in ../wdir2: .hg_archival.txt
|
|
|
|
Only in .: .hglf
|
|
|
|
Only in .: foo
|
|
|
|
Only in ./sub1/sub2: large.bin
|
|
|
|
Only in ./sub1/sub2: test.txt
|
|
|
|
Only in ./sub1/sub2: untracked.txt
|
|
|
|
Only in ./sub1/sub2: x.txt
|
|
|
|
$ find ../wdir2 -type f | sort
|
|
|
|
../wdir2/.hg_archival.txt
|
|
|
|
../wdir2/.hgsub
|
|
|
|
../wdir2/.hgsubstate
|
|
|
|
../wdir2/large.bin
|
|
|
|
../wdir2/main
|
|
|
|
../wdir2/sub1/.hgsub
|
|
|
|
../wdir2/sub1/.hgsubstate
|
|
|
|
../wdir2/sub1/sub1
|
|
|
|
../wdir2/sub1/sub2/folder/test.txt
|
|
|
|
../wdir2/sub1/sub2/large.dat
|
|
|
|
../wdir2/sub1/sub2/sub2
|
|
|
|
$ hg status -S -mac -n | sort
|
|
|
|
.hgsub
|
|
|
|
.hgsubstate
|
|
|
|
large.bin
|
|
|
|
main
|
|
|
|
sub1/.hgsub
|
|
|
|
sub1/.hgsubstate
|
|
|
|
sub1/sub1
|
|
|
|
sub1/sub2/folder/test.txt
|
|
|
|
sub1/sub2/large.dat
|
|
|
|
sub1/sub2/sub2
|
|
|
|
|
largefiles: fix commit of a directory with no largefile changes (issue4330)
When a directory is named in the commit file list, the previous behavior was to
walk the list, and if no normal files in the directory were also named, add the
corresponding standin for each largefile in that directory. The directory is
then dropped from the list, so that committing a directory with no normal file
changes works. It then added the corresponding standin directory for the first
largefile seen, by prefixing it with '.hglf/'.
The latter is unnecessary since each affected largefile is explicitly referenced
by its standin in the list. It also caused an abort if there were no changed
largefiles in the directory, because none of its standins changed:
abort: .hglf/foo/bar: no match under directory!
This list of files is used to tweak a matcher in lfutil.updatestandinsbymatch(),
which is what is passed to commit().
The status() call that is ultimately done in the commit code with this matcher
seems to have some OS specific differences. It is not necessary to append '.'
for Windows to run the largefiles tests cleanly. But if '.' is not added to the
list, the match function isn't called on Linux, so status() would miss any
normal files that were also in a named directory. The commit then proceeds
without those normal files, or says "nothing changed" if there were no changed
largefiles in the directory. This is not filesystem specific, as VFAT on Linux
had the same behavior as when run on ext4. It is also not an issue with
lfilesrepo.status(), since that only calls the overridden implementation when
paths are passed to commit. I dont have access to an OS X machine ATM to test
there.
Maybe there's a better way to do this. But since the standin directory for the
first largefile was previously being added, and that caused the same walk in
status(), there's no preformance change to this. There is no danger of
erroneously committing files in '.', because the original match function is
called, and if it fails, the lfutil.updatestandinsbymatch() tweaked matcher only
indicates a match if the file is in the list of standins- and '.' never is. The
added tests confirm this.
2015-01-18 23:15:40 +03:00
|
|
|
$ hg ci -Sqm 'forget testing'
|
|
|
|
|
2015-06-17 06:06:57 +03:00
|
|
|
Test 'wdir()' modified file archiving with largefiles
|
|
|
|
$ echo 'mod' > main
|
|
|
|
$ echo 'mod' > large.bin
|
|
|
|
$ echo 'mod' > sub1/sub2/large.dat
|
|
|
|
$ hg archive -S -r 'wdir()' ../wdir3
|
2015-07-21 01:42:39 +03:00
|
|
|
$ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories'
|
2015-06-17 06:06:57 +03:00
|
|
|
Only in ../wdir3: .hg_archival.txt
|
|
|
|
Only in .: .hglf
|
|
|
|
Only in .: foo
|
|
|
|
Only in ./sub1/sub2: large.bin
|
|
|
|
Only in ./sub1/sub2: test.txt
|
|
|
|
Only in ./sub1/sub2: untracked.txt
|
|
|
|
Only in ./sub1/sub2: x.txt
|
|
|
|
$ find ../wdir3 -type f | sort
|
|
|
|
../wdir3/.hg_archival.txt
|
|
|
|
../wdir3/.hgsub
|
|
|
|
../wdir3/.hgsubstate
|
|
|
|
../wdir3/large.bin
|
|
|
|
../wdir3/main
|
|
|
|
../wdir3/sub1/.hgsub
|
|
|
|
../wdir3/sub1/.hgsubstate
|
|
|
|
../wdir3/sub1/sub1
|
|
|
|
../wdir3/sub1/sub2/folder/test.txt
|
|
|
|
../wdir3/sub1/sub2/large.dat
|
|
|
|
../wdir3/sub1/sub2/sub2
|
|
|
|
$ hg up -Cq
|
|
|
|
|
largefiles: fix commit of a directory with no largefile changes (issue4330)
When a directory is named in the commit file list, the previous behavior was to
walk the list, and if no normal files in the directory were also named, add the
corresponding standin for each largefile in that directory. The directory is
then dropped from the list, so that committing a directory with no normal file
changes works. It then added the corresponding standin directory for the first
largefile seen, by prefixing it with '.hglf/'.
The latter is unnecessary since each affected largefile is explicitly referenced
by its standin in the list. It also caused an abort if there were no changed
largefiles in the directory, because none of its standins changed:
abort: .hglf/foo/bar: no match under directory!
This list of files is used to tweak a matcher in lfutil.updatestandinsbymatch(),
which is what is passed to commit().
The status() call that is ultimately done in the commit code with this matcher
seems to have some OS specific differences. It is not necessary to append '.'
for Windows to run the largefiles tests cleanly. But if '.' is not added to the
list, the match function isn't called on Linux, so status() would miss any
normal files that were also in a named directory. The commit then proceeds
without those normal files, or says "nothing changed" if there were no changed
largefiles in the directory. This is not filesystem specific, as VFAT on Linux
had the same behavior as when run on ext4. It is also not an issue with
lfilesrepo.status(), since that only calls the overridden implementation when
paths are passed to commit. I dont have access to an OS X machine ATM to test
there.
Maybe there's a better way to do this. But since the standin directory for the
first largefile was previously being added, and that caused the same walk in
status(), there's no preformance change to this. There is no danger of
erroneously committing files in '.', because the original match function is
called, and if it fails, the lfutil.updatestandinsbymatch() tweaked matcher only
indicates a match if the file is in the list of standins- and '.' never is. The
added tests confirm this.
2015-01-18 23:15:40 +03:00
|
|
|
Test issue4330: commit a directory where only normal files have changed
|
|
|
|
$ touch foo/bar/large.dat
|
|
|
|
$ hg add --large foo/bar/large.dat
|
|
|
|
$ hg ci -m 'add foo/bar/large.dat'
|
|
|
|
$ touch a.txt
|
|
|
|
$ touch a.dat
|
|
|
|
$ hg add -v foo/bar/abc a.txt a.dat
|
|
|
|
adding a.dat as a largefile
|
|
|
|
adding a.txt
|
|
|
|
adding foo/bar/abc (glob)
|
|
|
|
$ hg ci -m 'dir commit with only normal file deltas' foo/bar
|
|
|
|
$ hg status
|
|
|
|
A a.dat
|
|
|
|
A a.txt
|
|
|
|
|
|
|
|
Test a directory commit with a changed largefile and a changed normal file
|
|
|
|
$ echo changed > foo/bar/large.dat
|
|
|
|
$ echo changed > foo/bar/abc
|
|
|
|
$ hg ci -m 'dir commit with normal and lf file deltas' foo
|
|
|
|
$ hg status
|
|
|
|
A a.dat
|
|
|
|
A a.txt
|
2015-01-12 07:20:51 +03:00
|
|
|
|
2015-01-25 10:45:49 +03:00
|
|
|
$ hg ci -m "add a.*"
|
|
|
|
$ hg mv a.dat b.dat
|
|
|
|
$ hg mv foo/bar/abc foo/bar/def
|
|
|
|
$ hg status -C
|
|
|
|
A b.dat
|
|
|
|
a.dat
|
|
|
|
A foo/bar/def
|
|
|
|
foo/bar/abc
|
|
|
|
R a.dat
|
|
|
|
R foo/bar/abc
|
|
|
|
|
|
|
|
$ hg ci -m "move large and normal"
|
|
|
|
$ hg status -C --rev '.^' --rev .
|
|
|
|
A b.dat
|
|
|
|
a.dat
|
|
|
|
A foo/bar/def
|
|
|
|
foo/bar/abc
|
|
|
|
R a.dat
|
|
|
|
R foo/bar/abc
|
|
|
|
|
revset: add the 'subrepo' symbol
This returns the csets where matching subrepos have changed with respect to the
containing repo's first parent. The second parent shouldn't matter, because it
is either syncing up to the first parent (i.e. it hasn't changed from the
current branch's POV), or the merge changed it with respect to the first parent
(which already adds it to the set).
There's already a 'subrepo' fileset, but it is prefixed with 'set:', so there
should be no ambiguity (in code anyway). The only test I see for it is to
revert subrepos named by a glob pattern (in test-subrepo.t, line 58). Since it
doesn't return a tracked file, neither 'log "set:subrepo()"' nor
'files "set:subrepo()"' print anything. Therefore, it seems useful to have a
revset that will return something for log (and can be added to a revsetalias to
be chained with 'file' revsets.)
It might be nice to be able to filter for added, modified and removed
separately, but add/remove should be rare. It might also be nice to be able to
do a 'contains' check, in addition to this mutated check. Maybe it is possible
to get those with the existing 'adds', 'contains', 'modifies' and 'removes' by
teaching them to chase explicit paths into subrepos.
I'm not sure if this should be added to the 'modifies adds removes' line in
revset.optimize() (since it is doing an AMR check on .hgsubstate), or if it is
OK to put into 'safesymbols' (things like 'file' are on the list, and that takes
a regex, among other patterns).
2015-03-25 21:56:54 +03:00
|
|
|
|
|
|
|
$ echo foo > main
|
|
|
|
$ hg ci -m "mod parent only"
|
|
|
|
$ hg init sub3
|
|
|
|
$ echo "sub3 = sub3" >> .hgsub
|
|
|
|
$ echo xyz > sub3/a.txt
|
|
|
|
$ hg add sub3/a.txt
|
|
|
|
$ hg ci -Sm "add sub3"
|
|
|
|
committing subrepository sub3
|
|
|
|
$ cat .hgsub | grep -v sub3 > .hgsub1
|
|
|
|
$ mv .hgsub1 .hgsub
|
|
|
|
$ hg ci -m "remove sub3"
|
|
|
|
|
|
|
|
$ hg log -r "subrepo()" --style compact
|
|
|
|
0 7f491f53a367 1970-01-01 00:00 +0000 test
|
|
|
|
main import
|
|
|
|
|
|
|
|
1 ffe6649062fe 1970-01-01 00:00 +0000 test
|
|
|
|
deep nested modif should trigger a commit
|
|
|
|
|
|
|
|
2 9bb10eebee29 1970-01-01 00:00 +0000 test
|
|
|
|
add test.txt
|
|
|
|
|
|
|
|
3 7c64f035294f 1970-01-01 00:00 +0000 test
|
|
|
|
add large files
|
|
|
|
|
|
|
|
4 f734a59e2e35 1970-01-01 00:00 +0000 test
|
|
|
|
forget testing
|
|
|
|
|
|
|
|
11 9685a22af5db 1970-01-01 00:00 +0000 test
|
|
|
|
add sub3
|
|
|
|
|
|
|
|
12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test
|
|
|
|
remove sub3
|
|
|
|
|
|
|
|
$ hg log -r "subrepo('sub3')" --style compact
|
|
|
|
11 9685a22af5db 1970-01-01 00:00 +0000 test
|
|
|
|
add sub3
|
|
|
|
|
|
|
|
12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test
|
|
|
|
remove sub3
|
|
|
|
|
|
|
|
$ hg log -r "subrepo('bogus')" --style compact
|
|
|
|
|
|
|
|
|
|
|
|
Test .hgsubstate in the R state
|
|
|
|
|
|
|
|
$ hg rm .hgsub .hgsubstate
|
2016-03-18 00:03:22 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
deleting [=====================> ] 1/2\r (no-eol) (esc)
|
|
|
|
deleting [===========================================>] 2/2\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
revset: add the 'subrepo' symbol
This returns the csets where matching subrepos have changed with respect to the
containing repo's first parent. The second parent shouldn't matter, because it
is either syncing up to the first parent (i.e. it hasn't changed from the
current branch's POV), or the merge changed it with respect to the first parent
(which already adds it to the set).
There's already a 'subrepo' fileset, but it is prefixed with 'set:', so there
should be no ambiguity (in code anyway). The only test I see for it is to
revert subrepos named by a glob pattern (in test-subrepo.t, line 58). Since it
doesn't return a tracked file, neither 'log "set:subrepo()"' nor
'files "set:subrepo()"' print anything. Therefore, it seems useful to have a
revset that will return something for log (and can be added to a revsetalias to
be chained with 'file' revsets.)
It might be nice to be able to filter for added, modified and removed
separately, but add/remove should be rare. It might also be nice to be able to
do a 'contains' check, in addition to this mutated check. Maybe it is possible
to get those with the existing 'adds', 'contains', 'modifies' and 'removes' by
teaching them to chase explicit paths into subrepos.
I'm not sure if this should be added to the 'modifies adds removes' line in
revset.optimize() (since it is doing an AMR check on .hgsubstate), or if it is
OK to put into 'safesymbols' (things like 'file' are on the list, and that takes
a regex, among other patterns).
2015-03-25 21:56:54 +03:00
|
|
|
$ hg ci -m 'trash subrepo tracking'
|
|
|
|
|
|
|
|
$ hg log -r "subrepo('re:sub\d+')" --style compact
|
|
|
|
0 7f491f53a367 1970-01-01 00:00 +0000 test
|
|
|
|
main import
|
|
|
|
|
|
|
|
1 ffe6649062fe 1970-01-01 00:00 +0000 test
|
|
|
|
deep nested modif should trigger a commit
|
|
|
|
|
|
|
|
2 9bb10eebee29 1970-01-01 00:00 +0000 test
|
|
|
|
add test.txt
|
|
|
|
|
|
|
|
3 7c64f035294f 1970-01-01 00:00 +0000 test
|
|
|
|
add large files
|
|
|
|
|
|
|
|
4 f734a59e2e35 1970-01-01 00:00 +0000 test
|
|
|
|
forget testing
|
|
|
|
|
|
|
|
11 9685a22af5db 1970-01-01 00:00 +0000 test
|
|
|
|
add sub3
|
|
|
|
|
|
|
|
12 2e0485b475b9 1970-01-01 00:00 +0000 test
|
|
|
|
remove sub3
|
|
|
|
|
|
|
|
13[tip] a68b2c361653 1970-01-01 00:00 +0000 test
|
|
|
|
trash subrepo tracking
|
|
|
|
|
|
|
|
|
|
|
|
Restore the trashed subrepo tracking
|
|
|
|
|
|
|
|
$ hg rollback -q
|
|
|
|
$ hg update -Cq .
|
|
|
|
|
2012-07-15 20:43:10 +04:00
|
|
|
Interaction with extdiff, largefiles and subrepos
|
|
|
|
|
2016-02-08 12:29:17 +03:00
|
|
|
$ hg --config extensions.extdiff= pdiff -S
|
2012-07-15 20:43:10 +04:00
|
|
|
|
2016-02-08 12:29:17 +03:00
|
|
|
$ hg --config extensions.extdiff= pdiff -r '.^' -S
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/2\r (no-eol) (esc)
|
|
|
|
archiving [====================> ] 1/2\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 2/2\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub3) [ <=> ] 0\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/2\r (no-eol) (esc)
|
|
|
|
archiving [====================> ] 1/2\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 2/2\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
--- cloned.*/.hgsub * (glob)
|
|
|
|
+++ cloned/.hgsub * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1,2 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
sub1 = ../sub1
|
|
|
|
-sub3 = sub3
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
--- cloned.*/.hgsubstate * (glob)
|
|
|
|
+++ cloned/.hgsubstate * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1,2 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
|
|
|
|
-b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
|
|
|
|
[1]
|
|
|
|
|
2016-02-08 12:29:17 +03:00
|
|
|
$ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/3\r (no-eol) (esc)
|
|
|
|
archiving [=============> ] 1/3\r (no-eol) (esc)
|
|
|
|
archiving [===========================> ] 2/3\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 3/3\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ ] 0/1\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving [ ] 0/8\r (no-eol) (esc)
|
|
|
|
archiving [====> ] 1/8\r (no-eol) (esc)
|
|
|
|
archiving [=========> ] 2/8\r (no-eol) (esc)
|
|
|
|
archiving [===============> ] 3/8\r (no-eol) (esc)
|
|
|
|
archiving [====================> ] 4/8\r (no-eol) (esc)
|
|
|
|
archiving [=========================> ] 5/8\r (no-eol) (esc)
|
|
|
|
archiving [===============================> ] 6/8\r (no-eol) (esc)
|
|
|
|
archiving [====================================> ] 7/8\r (no-eol) (esc)
|
|
|
|
archiving [==========================================>] 8/8\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ ] 0/1\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub3) [ ] 0/1\r (no-eol) (esc)
|
|
|
|
archiving (sub3) [===================================>] 1/1\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/.hglf/b.dat * (glob)
|
|
|
|
+++ cloned.*/.hglf/b.dat * (glob)
|
tests: make chunk header of external diff glob-ed for portability
Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because system standard "diff" (=
/usr/bin/diff) on Solaris always generates chunk headers below:
- "@@ -1,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +1,0 @@" for removed file
even though "diff" on Linux generates:
- "@@ -0,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +0,0 @@" for removed file
This patch makes chunk header of external diff glob-ed for portability
of tests.
"hg diff" output follows Linux style, and there are many such diff
output lines in existing tests. This is reason why this patch doesn't
add check-code.py any rule to detect such diff output in tests.
This patch is a part of making tests using external "diff" portable,
and test-subrepo-deep-nested-change.t isn't yet portable even after
this patch.
2016-02-08 12:29:17 +03:00
|
|
|
@@ -*,0 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
+da39a3ee5e6b4b0d3255bfef95601890afd80709
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/.hglf/foo/bar/large.dat cloned.*/.hglf/foo/bar/large.dat (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/.hglf/foo/bar/large.dat * (glob)
|
|
|
|
+++ cloned.*/.hglf/foo/bar/large.dat * (glob)
|
tests: make chunk header of external diff glob-ed for portability
Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because system standard "diff" (=
/usr/bin/diff) on Solaris always generates chunk headers below:
- "@@ -1,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +1,0 @@" for removed file
even though "diff" on Linux generates:
- "@@ -0,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +0,0 @@" for removed file
This patch makes chunk header of external diff glob-ed for portability
of tests.
"hg diff" output follows Linux style, and there are many such diff
output lines in existing tests. This is reason why this patch doesn't
add check-code.py any rule to detect such diff output in tests.
This patch is a part of making tests using external "diff" portable,
and test-subrepo-deep-nested-change.t isn't yet portable even after
this patch.
2016-02-08 12:29:17 +03:00
|
|
|
@@ -*,0 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
+2f6933b5ee0f5fdd823d9717d8729f3c2523811b
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/.hglf/large.bin * (glob)
|
|
|
|
+++ cloned.*/.hglf/large.bin * (glob)
|
tests: make chunk header of external diff glob-ed for portability
Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because system standard "diff" (=
/usr/bin/diff) on Solaris always generates chunk headers below:
- "@@ -1,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +1,0 @@" for removed file
even though "diff" on Linux generates:
- "@@ -0,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +0,0 @@" for removed file
This patch makes chunk header of external diff glob-ed for portability
of tests.
"hg diff" output follows Linux style, and there are many such diff
output lines in existing tests. This is reason why this patch doesn't
add check-code.py any rule to detect such diff output in tests.
This patch is a part of making tests using external "diff" portable,
and test-subrepo-deep-nested-change.t isn't yet portable even after
this patch.
2016-02-08 12:29:17 +03:00
|
|
|
@@ -*,0 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
+7f7097b041ccf68cc5561e9600da4655d21c6d18
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/.hgsub cloned.*/.hgsub (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/.hgsub * (glob)
|
|
|
|
+++ cloned.*/.hgsub * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1* +1,2 @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
sub1 = ../sub1
|
|
|
|
+sub3 = sub3
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/.hgsubstate cloned.*/.hgsubstate (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/.hgsubstate * (glob)
|
|
|
|
+++ cloned.*/.hgsubstate * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1* +1,2 @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
-fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1
|
|
|
|
+7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
|
|
|
|
+b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/foo/bar/def * (glob)
|
|
|
|
+++ cloned.*/foo/bar/def * (glob)
|
tests: make chunk header of external diff glob-ed for portability
Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because system standard "diff" (=
/usr/bin/diff) on Solaris always generates chunk headers below:
- "@@ -1,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +1,0 @@" for removed file
even though "diff" on Linux generates:
- "@@ -0,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +0,0 @@" for removed file
This patch makes chunk header of external diff glob-ed for portability
of tests.
"hg diff" output follows Linux style, and there are many such diff
output lines in existing tests. This is reason why this patch doesn't
add check-code.py any rule to detect such diff output in tests.
This patch is a part of making tests using external "diff" portable,
and test-subrepo-deep-nested-change.t isn't yet portable even after
this patch.
2016-02-08 12:29:17 +03:00
|
|
|
@@ -*,0 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
+changed
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/main cloned.*/main (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/main * (glob)
|
|
|
|
+++ cloned.*/main * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1* +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
-main
|
|
|
|
+foo
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/sub1/.hgsubstate cloned.*/sub1/.hgsubstate (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/sub1/.hgsubstate * (glob)
|
|
|
|
+++ cloned.*/sub1/.hgsubstate * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1* +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
-c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2
|
|
|
|
+c77908c81ccea3794a896c79e98b0e004aee2e9e sub2
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/sub1/sub2/folder/test.txt cloned.*/sub1/sub2/folder/test.txt (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/sub1/sub2/folder/test.txt * (glob)
|
|
|
|
+++ cloned.*/sub1/sub2/folder/test.txt * (glob)
|
tests: make chunk header of external diff glob-ed for portability
Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because system standard "diff" (=
/usr/bin/diff) on Solaris always generates chunk headers below:
- "@@ -1,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +1,0 @@" for removed file
even though "diff" on Linux generates:
- "@@ -0,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +0,0 @@" for removed file
This patch makes chunk header of external diff glob-ed for portability
of tests.
"hg diff" output follows Linux style, and there are many such diff
output lines in existing tests. This is reason why this patch doesn't
add check-code.py any rule to detect such diff output in tests.
This patch is a part of making tests using external "diff" portable,
and test-subrepo-deep-nested-change.t isn't yet portable even after
this patch.
2016-02-08 12:29:17 +03:00
|
|
|
@@ -*,0 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
+subfolder
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/sub1/sub2/sub2 * (glob)
|
|
|
|
+++ cloned.*/sub1/sub2/sub2 * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1* +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
-sub2
|
|
|
|
+modified
|
2016-02-08 12:29:17 +03:00
|
|
|
diff -Nru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- cloned.*/sub3/a.txt * (glob)
|
|
|
|
+++ cloned.*/sub3/a.txt * (glob)
|
tests: make chunk header of external diff glob-ed for portability
Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because system standard "diff" (=
/usr/bin/diff) on Solaris always generates chunk headers below:
- "@@ -1,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +1,0 @@" for removed file
even though "diff" on Linux generates:
- "@@ -0,0 +1,nnnn @@" for added file
- "@@ -1,nnnn +0,0 @@" for removed file
This patch makes chunk header of external diff glob-ed for portability
of tests.
"hg diff" output follows Linux style, and there are many such diff
output lines in existing tests. This is reason why this patch doesn't
add check-code.py any rule to detect such diff output in tests.
This patch is a part of making tests using external "diff" portable,
and test-subrepo-deep-nested-change.t isn't yet portable even after
this patch.
2016-02-08 12:29:17 +03:00
|
|
|
@@ -*,0 +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
+xyz
|
|
|
|
[1]
|
|
|
|
|
|
|
|
$ echo mod > sub1/sub2/sub2
|
2016-02-08 12:29:17 +03:00
|
|
|
$ hg --config extensions.extdiff= pdiff -S
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
|
|
|
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
|
|
|
\r (no-eol) (esc)
|
2016-05-06 04:14:12 +03:00
|
|
|
archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
|
|
|
|
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
|
2016-03-21 07:01:29 +03:00
|
|
|
\r (no-eol) (esc)
|
2012-07-15 20:43:10 +04:00
|
|
|
--- */cloned.*/sub1/sub2/sub2 * (glob)
|
|
|
|
+++ */cloned/sub1/sub2/sub2 * (glob)
|
2016-02-08 12:29:17 +03:00
|
|
|
@@ -1* +1* @@ (glob)
|
2012-07-15 20:43:10 +04:00
|
|
|
-modified
|
|
|
|
+mod
|
|
|
|
[1]
|
|
|
|
|
2012-06-18 05:57:48 +04:00
|
|
|
$ cd ..
|