##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

dispatch: protect against malicious 'hg serve --stdio' invocations (sec)...
dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Some shared-ssh installations assume that 'hg serve --stdio' is a safe command to run for minimally trusted users. Unfortunately, the messy implementation of argument parsing here meant that trying to access a repo named '--debugger' would give the user a pdb prompt, thereby sidestepping any hoped-for sandboxing. Serving repositories over HTTP(S) is unaffected. We're not currently hardening any subcommands other than 'serve'. If your service exposes other commands to users with arbitrary repository names, it is imperative that you defend against repository names of '--debugger' and anything starting with '--config'. The read-only mode of hg-ssh stopped working because it provided its hook configuration to "hg serve --stdio" via --config parameter. This is banned for security reasons now. This patch switches it to directly call ui.setconfig(). If your custom hosting infrastructure relies on passing --config to "hg serve --stdio", you'll need to find a different way to get that configuration into Mercurial, either by using ui.setconfig() as hg-ssh does in this patch, or by placing an hgrc file someplace where Mercurial will read it. mitrandir@fb.com provided some extra fixes for the dispatch code and for hg-ssh in places that I overlooked.
Matt Harbison - - Load All Authors

File last commit:

r32005:2406dbba default
r32050:77eaf953 4.1.3 stable
Show More
test-subrepo-deep-nested-change.t
1097 lines | 40.4 KiB | text/troff | Tads3Lexer
/ tests / test-subrepo-deep-nested-change.t
History | Source | Raw |Copy content |Copy permalink
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 $ cat >> $HGRCPATH <<EOF
FUJIWARA Katsunori
tests: use portable diff script via extdiff extension...
 r28052 > [extdiff]
> # for portability:
> pdiff = sh "$RUNTESTDIR/pdiff"
timeless
tests: include progress for test-remove
 r28606 > [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
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 > EOF
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 Preparing the subrepository 'sub2'
$ hg init sub2
$ echo sub2 > sub2/sub2
$ hg add -R sub2
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 adding sub2/sub2 (glob)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 $ 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
Nicolas Dumazet
tests: use regular expression instead of sed in test-subrepo-deep-nested-change
 r12107 $ hg clone sub2 sub1/sub2
timeless
tests: include progress for test-remove
 r28606 \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)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R sub1
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 adding sub1/.hgsub (glob)
adding sub1/sub1 (glob)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 $ 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
Nicolas Dumazet
tests: use regular expression instead of sed in test-subrepo-deep-nested-change
 r12107 $ hg clone sub1 main/sub1
timeless
tests: include progress for test-remove
 r28606 \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)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 updating to branch default
Martin Geisler
subrepo: create subrepos using clone instead of pull...
 r14281 cloning subrepo sub2 from $TESTTMP/sub2
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R main
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 adding main/.hgsub (glob)
adding main/main (glob)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 $ hg commit -R main -m "main import"
Cleaning both repositories, just as a clone -U
$ hg up -C -R sub2 null
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
updating [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg up -C -R sub1 null
timeless
tests: include progress for test-remove
 r28606 \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)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg up -C -R main null
timeless
tests: include progress for test-remove
 r28606 \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)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ rm -rf main/sub1
$ rm -rf sub1/sub2
Clone main
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 $ hg --config extensions.largefiles= clone main cloned
timeless
tests: include progress for test-remove
 r28606 \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)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 updating to branch default
Martin Geisler
subrepo: create subrepos using clone instead of pull...
 r14281 cloning subrepo sub1 from $TESTTMP/sub1
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 Largefiles is NOT enabled in the clone if the source repo doesn't require it
$ cat cloned/.hg/hgrc
timeless
samplehgrcs: use single quotes in use warning
 r29978 # example repository config (see 'hg help config' for more info)
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 [paths]
default = $TESTTMP/main (glob)
# path aliases to other clones of this repo in URLs or filesystem paths
timeless
samplehgrcs: use single quotes in use warning
 r29978 # (see 'hg help config.paths' for more info)
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 #
Rishabh Madan
ui: replace obsolete default-push with default:pushurl (issue5485)...
 r31064 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
# my-fork = ssh://jdoe@example.net/hg/jdoes-fork
# my-clone = /home/jdoe/jdoes-clone
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029
[ui]
# name and email (local to this repository, optional), e.g.
# username = Jane Doe <jdoe@example.com>
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 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
Martin Geisler
subrepos: abort commit by default if a subrepo is dirty (BC)...
 r15321 $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913 committing subrepository sub1
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
 r15447 committing subrepository sub1/sub2 (glob)
Martin Geisler
tests: unify test-subrepo-deep-nested-change
 r11913
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
Matt Harbison
largefiles: fix a traceback when archiving a subrepo in a subrepo...
 r17105
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 Check that deep archiving works
Mads Kiilerich
check-code: fix check for trailing whitespace on empty lines...
 r17346
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 $ 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
Matt Harbison
commit: propagate --addremove to subrepos if -S is specified (issue3759)...
 r23537 $ hg ci -ASm "add test.txt"
Matt Harbison
narrowmatcher: propagate the rel() method...
 r23686 adding sub1/sub2/folder/test.txt
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 committing subrepository sub1
Mads Kiilerich
tests: add '(glob)' for Windows paths in test-subrepo-deep-nested-change.t...
 r17112 committing subrepository sub1/sub2 (glob)
Matt Harbison
remove: recurse into subrepositories with --subrepos/-S flag...
 r23325
.. but first take a detour through some deep removal testing
Matt Harbison
remove: avoid a bogus warning about no tracked files when removing '.'...
 r23327 $ hg remove -S -I 're:.*.txt' .
timeless
remove: add progress support
 r28608 \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)
Matt Harbison
remove: recurse into subrepositories with --subrepos/-S flag...
 r23325 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
Matt Harbison
remove: support remove with explicit paths in subrepos
 r23326 $ hg remove -I 're:.*.txt' sub1
timeless
remove: add progress support
 r28608 \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)
Matt Harbison
remove: support remove with explicit paths in subrepos
 r23326 $ hg status -S
$ hg remove sub1/sub2/folder/test.txt
timeless
remove: add progress support
 r28608 \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)
Matt Harbison
remove: support remove with explicit paths in subrepos
 r23326 $ hg remove sub1/.hgsubstate
timeless
remove: add progress support
 r28608 \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)
Matt Harbison
subrepo: precisely identify the missing subrepo spec file...
 r24645 $ mv sub1/.hgsub sub1/x.hgsub
Matt Harbison
remove: support remove with explicit paths in subrepos
 r23326 $ hg status -S
Matt Harbison
test-subrepo: fix globs for Windows...
 r25865 warning: subrepo spec file 'sub1/.hgsub' not found
Matt Harbison
remove: support remove with explicit paths in subrepos
 r23326 R sub1/.hgsubstate
R sub1/sub2/folder/test.txt
Matt Harbison
subrepo: precisely identify the missing subrepo spec file...
 r24645 ! sub1/.hgsub
? sub1/x.hgsub
$ mv sub1/x.hgsub sub1/.hgsub
Matt Harbison
remove: support remove with explicit paths in subrepos
 r23326 $ hg update -Cq
Matt Harbison
addremove: add support for the -S flag...
 r23538 $ 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 ..
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
searching for exact renames [ ] 0/1\r (no-eol) (esc)
\r (no-eol) (esc)
Matt Harbison
addremove: add support for the -S flag...
 r23538 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
Matt Harbison
archive: support 'wdir()'...
 r25601
Archive wdir() with subrepos
$ hg rm main
timeless
remove: add progress support
 r28608 \r (no-eol) (esc)
deleting [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
Matt Harbison
archive: support 'wdir()'...
 r25601 $ hg archive -S -r 'wdir()' ../wdir
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 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)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
Danek Duvall
tests: diff -r on Solaris emits "Common subdirectories:"...
 r25863 $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
Matt Harbison
archive: support 'wdir()'...
 r25601 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
Matt Harbison
archive: report the node as "{p1node}+" when archiving a dirty wdir()...
 r25615 $ cat ../wdir/.hg_archival.txt
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
branch: default
latesttag: null
latesttagdistance: 4
Matt Mackall
archive: fix changesincelatesttag with wdir()
 r25690 changessincelatesttag: 4
Matt Harbison
archive: report the node as "{p1node}+" when archiving a dirty wdir()...
 r25615
Matt Harbison
archive: support 'wdir()'...
 r25601 Attempting to archive 'wdir()' with a missing file is handled gracefully
$ rm sub1/sub1
$ rm -r ../wdir
$ hg archive -v -S -r 'wdir()' ../wdir
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 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)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
Matt Harbison
archive: support 'wdir()'...
 r25601 $ 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
Matt Harbison
addremove: add support for the -S flag...
 r23538 $ hg update -Cq
Matt Harbison
archive: report the node as "{p1node}+" when archiving a dirty wdir()...
 r25615 $ rm -r ../wdir
$ hg archive -S -r 'wdir()' ../wdir
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 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)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
Matt Harbison
archive: report the node as "{p1node}+" when archiving a dirty wdir()...
 r25615 $ cat ../wdir/.hg_archival.txt
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
branch: default
latesttag: null
latesttagdistance: 4
Matt Mackall
archive: fix changesincelatesttag with wdir()
 r25690 changessincelatesttag: 4
Matt Harbison
archive: report the node as "{p1node}+" when archiving a dirty wdir()...
 r25615
Matt Harbison
addremove: support addremove with explicit paths in subrepos...
 r23539 $ 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
Matt Harbison
addremove: automatically process a subrepository's subrepos...
 r23540 $ hg addremove sub1
adding sub1/sub2/folder/bar (glob)
adding sub1/foo (glob)
$ hg update -Cq
Matt Harbison
commit: propagate --addremove to subrepos if -S is specified (issue3759)...
 r23537 $ rm sub1/sub2/folder/test.txt
$ rm sub1/sub2/test.txt
$ hg ci -ASm "remove test.txt"
Matt Harbison
narrowmatcher: propagate the rel() method...
 r23686 adding sub1/sub2/folder/bar
removing sub1/sub2/folder/test.txt
removing sub1/sub2/test.txt
adding sub1/foo
Matt Harbison
addremove: add support for the -S flag...
 r23538 adding foo/bar/abc
Matt Harbison
commit: propagate --addremove to subrepos if -S is specified (issue3759)...
 r23537 committing subrepository sub1
committing subrepository sub1/sub2 (glob)
Matt Harbison
subrepo: add basic support to hgsubrepo for the files command...
 r24413
$ 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)
Matt Harbison
match: resolve filesets in subrepos for commands given the '-S' argument...
 r25122 $ 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)
Matt Harbison
files: recurse into subrepos automatically with an explicit path
 r25228 $ 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)
Matt Harbison
files: don't recurse into subrepos without a path or -S (issue5127)...
 r28387 $ hg files
.hgsub
.hgsubstate
foo/bar/abc (glob)
main
Matt Harbison
context: don't complain about a matcher's subrepo paths in changectx.walk()...
 r25193 $ 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]
Matt Harbison
files: recurse into subrepos automatically with an explicit path
 r25228 $ hg files -r '.^' sub1/
Matt Harbison
match: explicitly naming a subrepo implies always() for the submatcher...
 r25194 sub1/.hgsub (glob)
sub1/.hgsubstate (glob)
sub1/sub1 (glob)
sub1/sub2/folder/test.txt (glob)
sub1/sub2/sub2 (glob)
sub1/sub2/test.txt (glob)
Matt Harbison
files: recurse into subrepos automatically with an explicit path
 r25228 $ hg files -r '.^' sub1/sub2
Matt Harbison
match: explicitly naming a subrepo implies always() for the submatcher...
 r25194 sub1/sub2/folder/test.txt (glob)
sub1/sub2/sub2 (glob)
sub1/sub2/test.txt (glob)
Matt Harbison
commit: propagate --addremove to subrepos if -S is specified (issue3759)...
 r23537 $ hg rollback -q
$ hg up -Cq
Matt Harbison
remove: recurse into subrepositories with --subrepos/-S flag...
 r23325
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 $ hg --config extensions.largefiles=! archive -S ../archive_all
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 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)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 $ 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
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 $ 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
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
Matt Harbison
tests: add globs for Windows
 r29102 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)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 $ 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
Matt Harbison
largefiles: fix a traceback when archiving a subrepo in a subrepo...
 r17105 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
Mads Kiilerich
tests: add '(glob)' for Windows paths in test-subrepo-deep-nested-change.t...
 r17112 committing subrepository sub1/sub2 (glob)
Matt Harbison
largefiles: fix a traceback when archiving a subrepo in a subrepo...
 r17105
$ 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
Matt Harbison
largefiles: fix the directory structure when archiving a subrepo in a subrepo...
 r17106 ../archive_lf/sub1/sub2
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 ../archive_lf/sub1/sub2/folder
../archive_lf/sub1/sub2/folder/test.txt
../archive_lf/sub1/sub2/large.bin
../archive_lf/sub1/sub2/sub2
../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
Matt Harbison
archive: drop the leading '.' path component from the prefix (issue4634)...
 r24953 $ hg --config extensions.largefiles= archive -S -X '**.txt' -p '.' ../archive_lf.tgz
Matt Harbison
archive: always use portable path component separators with subrepos...
 r24924 $ tar -tzf ../archive_lf.tgz | sort
Matt Harbison
archive: drop the leading '.' path component from the prefix (issue4634)...
 r24953 .hgsub
.hgsubstate
large.bin
main
sub1/.hgsub
sub1/.hgsubstate
sub1/sub1
sub1/sub2/large.bin
sub1/sub2/sub2
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108
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
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 The local repo enables largefiles if a largefiles repo is cloned
$ hg showconfig extensions
abort: repository requires features unknown to this Mercurial: largefiles!
Matt Mackall
urls: bulk-change primary website URLs
 r26421 (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 [255]
$ hg --config extensions.largefiles= clone -qU . ../lfclone
$ cat ../lfclone/.hg/hgrc
timeless
samplehgrcs: use single quotes in use warning
 r29978 # example repository config (see 'hg help config' for more info)
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 [paths]
default = $TESTTMP/cloned (glob)
# path aliases to other clones of this repo in URLs or filesystem paths
timeless
samplehgrcs: use single quotes in use warning
 r29978 # (see 'hg help config.paths' for more info)
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029 #
Rishabh Madan
ui: replace obsolete default-push with default:pushurl (issue5485)...
 r31064 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
# my-fork = ssh://jdoe@example.net/hg/jdoes-fork
# my-clone = /home/jdoe/jdoes-clone
Matt Harbison
largefiles: set the extension as enabled locally after a clone requiring it...
 r24029
[ui]
# name and email (local to this repository, optional), e.g.
# username = Jane Doe <jdoe@example.com>
[extensions]
largefiles=
Matt Harbison
subrepo: propagate matcher to subrepos when archiving...
 r17108 Find an exact match to a standin (should archive nothing)
$ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf
Mads Kiilerich
tests: remove GNU quoting in test-subrepo-deep-nested-change.t...
 r17113 $ find ../archive_lf 2> /dev/null | sort
Matt Harbison
largefiles: fix a traceback when archiving a subrepo in a subrepo...
 r17105
Matt Harbison
largefiles: enable subrepo support for forget
 r23837 $ cat >> $HGRCPATH <<EOF
> [extensions]
> largefiles=
Matt Harbison
largefiles: enable subrepo support for add...
 r23886 > [largefiles]
> patterns=glob:**.dat
Matt Harbison
largefiles: enable subrepo support for forget
 r23837 > 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
Matt Harbison
largefiles: enable subrepo support for add...
 r23886 $ touch sub1/sub2/large.dat
Matt Harbison
largefiles: enable subrepo support for forget
 r23837 $ 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]
Matt Harbison
largefiles: enable subrepo support for add...
 r23886 $ hg add --large --dry-run -v sub1/sub2/untracked.txt
Matt Harbison
largefiles: enable subrepo support for forget
 r23837 adding sub1/sub2/untracked.txt as a largefile (glob)
Matt Harbison
largefiles: enable subrepo support for add...
 r23886 $ 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)
Matt Harbison
largefiles: enable subrepo support for forget
 r23837 $ hg forget -v sub1/sub2/untracked.txt
removing sub1/sub2/untracked.txt (glob)
$ hg status -S
Matt Harbison
largefiles: enable subrepo support for add...
 r23886 A sub1/sub2/large.dat
Matt Harbison
largefiles: enable subrepo support for forget
 r23837 R sub1/sub2/large.bin
R sub1/sub2/test.txt
? foo/bar/abc
? sub1/sub2/untracked.txt
Matt Harbison
subrepo: add basic support to hgsubrepo for the files command...
 r24413 ? sub1/sub2/x.txt
Matt Harbison
largefiles: fix commit of a directory with no largefile changes (issue4330)...
 r23923 $ hg add sub1/sub2
Matt Harbison
archive: support 'wdir()'...
 r25601
$ hg archive -S -r 'wdir()' ../wdir2
Danek Duvall
tests: diff -r on Solaris emits "Common subdirectories:"...
 r25863 $ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:'
Matt Harbison
archive: support 'wdir()'...
 r25601 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
Matt Harbison
largefiles: fix commit of a directory with no largefile changes (issue4330)...
 r23923 $ hg ci -Sqm 'forget testing'
Matt Harbison
archive: support 'wdir()'...
 r25601 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
Danek Duvall
tests: diff -r on Solaris emits "Common subdirectories:"...
 r25863 $ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories'
Matt Harbison
archive: support 'wdir()'...
 r25601 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
Matt Harbison
largefiles: fix commit of a directory with no largefile changes (issue4330)...
 r23923 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
Matt Harbison
largefiles: enable subrepo support for forget
 r23837
Matt Harbison
largefiles: report the source of copied/moved largefiles in status -C...
 r24230 $ 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
Matt Harbison
revset: add the 'subrepo' symbol...
 r24446
$ 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
timeless
remove: add progress support
 r28608 \r (no-eol) (esc)
deleting [=====================> ] 1/2\r (no-eol) (esc)
deleting [===========================================>] 2/2\r (no-eol) (esc)
\r (no-eol) (esc)
Matt Harbison
revset: add the 'subrepo' symbol...
 r24446 $ 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 .
Matt Harbison
extdiff: add support for subrepos...
 r25813 Interaction with extdiff, largefiles and subrepos
FUJIWARA Katsunori
tests: use portable diff script via extdiff extension...
 r28052 $ hg --config extensions.extdiff= pdiff -S
Matt Harbison
extdiff: add support for subrepos...
 r25813
FUJIWARA Katsunori
tests: use portable diff script via extdiff extension...
 r28052 $ hg --config extensions.extdiff= pdiff -r '.^' -S
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
FUJIWARA Katsunori
tests: make timezone in diff output glob-ed for portability...
 r28034 --- cloned.*/.hgsub * (glob)
+++ cloned/.hgsub * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1,2 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 sub1 = ../sub1
-sub3 = sub3
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob)
FUJIWARA Katsunori
tests: make timezone in diff output glob-ed for portability...
 r28034 --- cloned.*/.hgsubstate * (glob)
+++ cloned/.hgsubstate * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1,2 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
-b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
[1]
FUJIWARA Katsunori
tests: use portable diff script via extdiff extension...
 r28052 $ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
timeless
tests: include progress for test-remove
 r28606 \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)
Matt Harbison
tests: add globs for Windows
 r29102 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)
timeless
tests: include progress for test-remove
 r28606 \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)
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/.hglf/b.dat * (glob)
+++ cloned.*/.hglf/b.dat * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28036 @@ -*,0 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 +da39a3ee5e6b4b0d3255bfef95601890afd80709
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/.hglf/foo/bar/large.dat cloned.*/.hglf/foo/bar/large.dat (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/.hglf/foo/bar/large.dat * (glob)
+++ cloned.*/.hglf/foo/bar/large.dat * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28036 @@ -*,0 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 +2f6933b5ee0f5fdd823d9717d8729f3c2523811b
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/.hglf/large.bin cloned.*/.hglf/large.bin (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/.hglf/large.bin * (glob)
+++ cloned.*/.hglf/large.bin * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28036 @@ -*,0 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 +7f7097b041ccf68cc5561e9600da4655d21c6d18
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/.hgsub cloned.*/.hgsub (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/.hgsub * (glob)
+++ cloned.*/.hgsub * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1* +1,2 @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 sub1 = ../sub1
+sub3 = sub3
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/.hgsubstate cloned.*/.hgsubstate (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/.hgsubstate * (glob)
+++ cloned.*/.hgsubstate * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1* +1,2 @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 -fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1
+7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
+b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/foo/bar/def cloned.*/foo/bar/def (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/foo/bar/def * (glob)
+++ cloned.*/foo/bar/def * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28036 @@ -*,0 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 +changed
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/main cloned.*/main (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/main * (glob)
+++ cloned.*/main * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1* +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 -main
+foo
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/sub1/.hgsubstate cloned.*/sub1/.hgsubstate (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/sub1/.hgsubstate * (glob)
+++ cloned.*/sub1/.hgsubstate * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1* +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2
+c77908c81ccea3794a896c79e98b0e004aee2e9e sub2
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/sub1/sub2/folder/test.txt cloned.*/sub1/sub2/folder/test.txt (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/sub1/sub2/folder/test.txt * (glob)
+++ cloned.*/sub1/sub2/folder/test.txt * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28036 @@ -*,0 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 +subfolder
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/sub1/sub2/sub2 cloned.*/sub1/sub2/sub2 (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/sub1/sub2/sub2 * (glob)
+++ cloned.*/sub1/sub2/sub2 * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1* +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 -sub2
+modified
FUJIWARA Katsunori
tests: omit -p for external diff via extdiff extension for portability...
 r28033 diff -Nru cloned.*/sub3/a.txt cloned.*/sub3/a.txt (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- cloned.*/sub3/a.txt * (glob)
+++ cloned.*/sub3/a.txt * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28036 @@ -*,0 +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 +xyz
[1]
$ echo mod > sub1/sub2/sub2
FUJIWARA Katsunori
tests: use portable diff script via extdiff extension...
 r28052 $ hg --config extensions.extdiff= pdiff -S
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
Matt Harbison
tests: add globs for Windows
 r29102 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
timeless
tests: include progress for test-remove
 r28606 \r (no-eol) (esc)
Matt Harbison
extdiff: add support for subrepos...
 r25813 --- */cloned.*/sub1/sub2/sub2 * (glob)
+++ */cloned/sub1/sub2/sub2 * (glob)
FUJIWARA Katsunori
tests: make chunk header of external diff glob-ed for portability...
 r28035 @@ -1* +1* @@ (glob)
Matt Harbison
extdiff: add support for subrepos...
 r25813 -modified
+mod
[1]
Matt Harbison
largefiles: fix a traceback when archiving a subrepo in a subrepo...
 r17105 $ cd ..