mercurial-scm/hg: tests/test-subrepo-deep-nested-change.t annotate

annotate tests/test-subrepo-deep-nested-change.t @ 33806:dedab036215d

wireproto: use new peer interface The wirepeer class provides concrete implementations of peer interface methods for calling wire protocol commands. It makes sense for this class to inherit from the peer abstract base class. So we change that. Since httppeer and sshpeer have already been converted to the new interface, peerrepository is no longer adding any value. So it has been removed. httppeer and sshpeer have been updated to reflect the loss of peerrepository and the inheritance of the abstract base class in wirepeer. The code changes in wirepeer are reordering of methods to group by interface. Some Python code in tests was updated to reflect changed APIs. .. api:: peer.peerrepository has been removed. Use repository.peer abstract base class to represent a peer repository. Differential Revision: https://phab.mercurial-scm.org/D338

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 10 Aug 2017 20:58:28 -0700
parents	8074e2d006c0
children	0e4bed5c5c38

rev	line source
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1 $ cat >> $HGRCPATH <<EOF
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	2 > [extdiff]
b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	3 > # for portability:
b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	4 > pdiff = sh "$RUNTESTDIR/pdiff"
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	5 > [progress]
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	6 > disable=False
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	7 > assume-tty = 1
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	8 > delay = 0
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	9 > # set changedelay really large so we don't see nested topics
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	10 > changedelay = 30000
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	11 > format = topic bar number
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	12 > refresh = 0
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	13 > width = 60
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	14 > EOF
0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	15
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	16 Preparing the subrepository 'sub2'
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	17
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	18 $ hg init sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	19 $ echo sub2 > sub2/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	20 $ hg add -R sub2
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	21 adding sub2/sub2 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	22 $ hg commit -R sub2 -m "sub2 import"
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	23
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	24 Preparing the 'sub1' repo which depends on the subrepo 'sub2'
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	25
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	26 $ hg init sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	27 $ echo sub1 > sub1/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	28 $ echo "sub2 = ../sub2" > sub1/.hgsub
12107 497c78760b37 tests: use regular expression instead of sed in test-subrepo-deep-nested-change Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11913 diff changeset	29 $ hg clone sub2 sub1/sub2
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	30 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	31 linking [ <=> ] 1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	32 linking [ <=> ] 2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	33 linking [ <=> ] 3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	34 linking [ <=> ] 4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	35 linking [ <=> ] 5\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	36 linking [ <=> ] 6\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	37 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	38 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	39 updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	40 \r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	41 updating to branch default
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	43 $ hg add -R sub1
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	44 adding sub1/.hgsub (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	45 adding sub1/sub1 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	46 $ hg commit -R sub1 -m "sub1 import"
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	47
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	48 Preparing the 'main' repo which depends on the subrepo 'sub1'
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	49
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	50 $ hg init main
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	51 $ echo main > main/main
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	52 $ echo "sub1 = ../sub1" > main/.hgsub
12107 497c78760b37 tests: use regular expression instead of sed in test-subrepo-deep-nested-change Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11913 diff changeset	53 $ hg clone sub1 main/sub1
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	54 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	55 linking [ <=> ] 1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	56 linking [ <=> ] 2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	57 linking [ <=> ] 3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	58 linking [ <=> ] 4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	59 linking [ <=> ] 5\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	60 linking [ <=> ] 6\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	61 linking [ <=> ] 7\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	62 linking [ <=> ] 8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	63 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	64 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	65 updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	66 updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	67 \r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	68 updating to branch default
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	69 cloning subrepo sub2 from $TESTTMP/sub2
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	70 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	71 $ hg add -R main
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	72 adding main/.hgsub (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	73 adding main/main (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	74 $ hg commit -R main -m "main import"
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	75
32005 2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	76 #if serve
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	77
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	78 Unfortunately, subrepos not at their nominal location cannot be cloned. But
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	79 they are still served from their location within the local repository. The only
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	80 reason why 'main' can be cloned via the filesystem is because 'sub1' and 'sub2'
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	81 are also available as siblings of 'main'.
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	82
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	83 $ hg serve -R main --debug -S -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	84 adding = $TESTTMP/main (glob)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	85 adding sub1 = $TESTTMP/main/sub1 (glob)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	86 adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (glob)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	87 listening at http://:$HGPORT/ (bound to :$HGPORT) (glob) (?)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	88 adding = $TESTTMP/main (glob) (?)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	89 adding sub1 = $TESTTMP/main/sub1 (glob) (?)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	90 adding sub1/sub2 = $TESTTMP/main/sub1/sub2 (glob) (?)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	91 $ cat hg1.pid >> $DAEMON_PIDS
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	92
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	93 $ hg clone http://localhost:$HGPORT httpclone --config progress.disable=True
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	94 requesting all changes
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	95 adding changesets
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	96 adding manifests
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	97 adding file changes
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	98 added 1 changesets with 3 changes to 3 files
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	99 updating to branch default
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	100 abort: HTTP Error 404: Not Found
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	101 [255]
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	102
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	103 $ cat access.log
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	104 * "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	105 * "GET /?cmd=batch HTTP/1.1" 200 - * (glob)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	106 * "GET /?cmd=getbundle HTTP/1.1" 200 - * (glob)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	107 * "GET /../sub1?cmd=capabilities HTTP/1.1" 404 - (glob)
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	108
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	109 $ killdaemons.py
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	110 $ rm hg1.pid error.log access.log
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	111 #endif
2406dbba49bd serve: add support for Mercurial subrepositories Matt Harbison <matt_harbison@yahoo.com> parents: 31064 diff changeset	112
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	113 Cleaning both repositories, just as a clone -U
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	114
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	115 $ hg up -C -R sub2 null
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	116 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	117 updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	118 \r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	119 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	120 $ hg up -C -R sub1 null
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	121 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	122 updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	123 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	124 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	125 updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	126 \r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	127 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	128 $ hg up -C -R main null
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	129 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	130 updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	131 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	132 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	133 updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	134 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	135 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	136 updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	137 \r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	138 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	139 $ rm -rf main/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	140 $ rm -rf sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	141
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	142 Clone main
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	143
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	144 $ hg --config extensions.largefiles= clone main cloned
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	145 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	146 linking [ <=> ] 1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	147 linking [ <=> ] 2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	148 linking [ <=> ] 3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	149 linking [ <=> ] 4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	150 linking [ <=> ] 5\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	151 linking [ <=> ] 6\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	152 linking [ <=> ] 7\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	153 linking [ <=> ] 8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	154 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	155 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	156 updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	157 updating [===========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	158 updating [===========================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	159 \r (no-eol) (esc)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	160 updating to branch default
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	161 cloning subrepo sub1 from $TESTTMP/sub1
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	162 cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	163 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	164
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	165 Largefiles is NOT enabled in the clone if the source repo doesn't require it
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	166 $ cat cloned/.hg/hgrc
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29176 diff changeset	167 # example repository config (see 'hg help config' for more info)
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	168 [paths]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	169 default = $TESTTMP/main (glob)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	170
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	171 # path aliases to other clones of this repo in URLs or filesystem paths
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29176 diff changeset	172 # (see 'hg help config.paths' for more info)
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	173 #
31064 4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 29978 diff changeset	174 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 29978 diff changeset	175 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 29978 diff changeset	176 # my-clone = /home/jdoe/jdoes-clone
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	177
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	178 [ui]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	179 # name and email (local to this repository, optional), e.g.
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	180 # username = Jane Doe <jdoe@example.com>
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	181
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	182 Checking cloned repo ids
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	183
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	184 $ printf "cloned " ; hg id -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	185 cloned 7f491f53a367 tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	186 $ printf "cloned/sub1 " ; hg id -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	187 cloned/sub1 fc3b4ce2696f tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	188 $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	189 cloned/sub1/sub2 c57a0840e3ba tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	190
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	191 debugsub output for main and sub1
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	192
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	193 $ hg debugsub -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	194 path sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	195 source ../sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	196 revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	197 $ hg debugsub -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	198 path sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	199 source ../sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	200 revision c57a0840e3badd667ef3c3ef65471609acb2ba3c
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	201
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	202 Modifying deeply nested 'sub2'
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	203
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	204 $ echo modified > cloned/sub1/sub2/sub2
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 14281 diff changeset	205 $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	206 committing subrepository sub1
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15321 diff changeset	207 committing subrepository sub1/sub2 (glob)
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	208
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	209 Checking modified node ids
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	210
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	211 $ printf "cloned " ; hg id -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	212 cloned ffe6649062fe tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	213 $ printf "cloned/sub1 " ; hg id -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	214 cloned/sub1 2ecb03bf44a9 tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	215 $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	216 cloned/sub1/sub2 53dd3430bcaf tip
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	217
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	218 debugsub output for main and sub1
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: diff changeset	219
11913 628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	220 $ hg debugsub -R cloned
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	221 path sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	222 source ../sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	223 revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	224 $ hg debugsub -R cloned/sub1
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	225 path sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	226 source ../sub2
628cdd158ec0 tests: unify test-subrepo-deep-nested-change Martin Geisler <mg@lazybytes.net> parents: 11110 diff changeset	227 revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	228
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	229 Check that deep archiving works
17346 2944a6d35158 check-code: fix check for trailing whitespace on empty lines Mads Kiilerich <mads@kiilerich.com> parents: 17113 diff changeset	230
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	231 $ cd cloned
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	232 $ echo 'test' > sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	233 $ hg --config extensions.largefiles=! add sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	234 $ mkdir sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	235 $ echo 'subfolder' > sub1/sub2/folder/test.txt
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	236 $ hg ci -ASm "add test.txt"
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	237 adding sub1/sub2/folder/test.txt
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	238 committing subrepository sub1
17112 f690402e80fb tests: add '(glob)' for Windows paths in test-subrepo-deep-nested-change.t Mads Kiilerich <mads@kiilerich.com> parents: 17108 diff changeset	239 committing subrepository sub1/sub2 (glob)
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	240
33363 3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	241 $ rm -r main
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	242 $ hg archive -S -qr 'wdir()' ../wdir
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	243 $ cat ../wdir/.hg_archival.txt
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	244 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	245 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	246 branch: default
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	247 latesttag: null
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	248 latesttagdistance: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	249 changessincelatesttag: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	250 $ hg update -Cq .
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	251
33364 bf2daeddd42b subrepo: consider the parent repo dirty when a file is missing Matt Harbison <matt_harbison@yahoo.com> parents: 33363 diff changeset	252 A deleted subrepo file is flagged as dirty, like the top level repo
33363 3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	253
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	254 $ rm -r ../wdir sub1/sub2/folder/test.txt
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	255 $ hg archive -S -qr 'wdir()' ../wdir
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	256 $ cat ../wdir/.hg_archival.txt
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	257 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
33364 bf2daeddd42b subrepo: consider the parent repo dirty when a file is missing Matt Harbison <matt_harbison@yahoo.com> parents: 33363 diff changeset	258 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
33363 3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	259 branch: default
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	260 latesttag: null
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	261 latesttagdistance: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	262 changessincelatesttag: 4
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	263 $ hg update -Cq .
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	264 $ rm -r ../wdir
3047167733dc archival: flag missing files as a dirty wdir() in the metadata file (BC) Matt Harbison <matt_harbison@yahoo.com> parents: 32005 diff changeset	265
33545 8074e2d006c0 archive: add an experimental config to control the metadata file template Matt Harbison <matt_harbison@yahoo.com> parents: 33364 diff changeset	266 $ hg archive -S -qr 'wdir()' ../wdir \
8074e2d006c0 archive: add an experimental config to control the metadata file template Matt Harbison <matt_harbison@yahoo.com> parents: 33364 diff changeset	267 > --config 'experimental.archivemetatemplate=archived {node\|short}\n'
8074e2d006c0 archive: add an experimental config to control the metadata file template Matt Harbison <matt_harbison@yahoo.com> parents: 33364 diff changeset	268 $ cat ../wdir/.hg_archival.txt
8074e2d006c0 archive: add an experimental config to control the metadata file template Matt Harbison <matt_harbison@yahoo.com> parents: 33364 diff changeset	269 archived ffffffffffff
8074e2d006c0 archive: add an experimental config to control the metadata file template Matt Harbison <matt_harbison@yahoo.com> parents: 33364 diff changeset	270 $ rm -r ../wdir
8074e2d006c0 archive: add an experimental config to control the metadata file template Matt Harbison <matt_harbison@yahoo.com> parents: 33364 diff changeset	271
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	272 .. but first take a detour through some deep removal testing
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	273
23327 bd296bb4b5c8 remove: avoid a bogus warning about no tracked files when removing '.' Matt Harbison <matt_harbison@yahoo.com> parents: 23326 diff changeset	274 $ hg remove -S -I 're:.*.txt' .
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	275 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	276 searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	277 searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	278 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	279 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	280 deleting [=====================> ] 1/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	281 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	282 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	283 deleting [===========================================>] 2/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	284 \r (no-eol) (esc)
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	285 removing sub1/sub2/folder/test.txt (glob)
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	286 removing sub1/sub2/test.txt (glob)
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	287 $ hg status -S
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	288 R sub1/sub2/folder/test.txt
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	289 R sub1/sub2/test.txt
4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	290 $ hg update -Cq
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	291 $ hg remove -I 're:.*.txt' sub1
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	292 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	293 searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	294 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	295 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	296 deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	297 \r (no-eol) (esc)
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	298 $ hg status -S
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	299 $ hg remove sub1/sub2/folder/test.txt
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	300 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	301 searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	302 searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	303 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	304 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	305 deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	306 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	307 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	308 deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	309 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	310 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	311 deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	312 \r (no-eol) (esc)
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	313 $ hg remove sub1/.hgsubstate
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	314 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	315 searching [==========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	316 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	317 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	318 deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	319 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	320 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	321 deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	322 \r (no-eol) (esc)
24645 b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	323 $ mv sub1/.hgsub sub1/x.hgsub
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	324 $ hg status -S
25865 a48a7c2d1fea test-subrepo: fix globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 25863 diff changeset	325 warning: subrepo spec file 'sub1/.hgsub' not found
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	326 R sub1/.hgsubstate
f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	327 R sub1/sub2/folder/test.txt
24645 b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	328 ! sub1/.hgsub
b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	329 ? sub1/x.hgsub
b39afa36006a subrepo: precisely identify the missing subrepo spec file Matt Harbison <matt_harbison@yahoo.com> parents: 24446 diff changeset	330 $ mv sub1/x.hgsub sub1/.hgsub
23326 f6b8d23492e5 remove: support remove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23325 diff changeset	331 $ hg update -Cq
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	332 $ touch sub1/foo
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	333 $ hg forget sub1/sub2/folder/test.txt
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	334 $ rm sub1/sub2/test.txt
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	335
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	336 Test relative path printing + subrepos
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	337 $ mkdir -p foo/bar
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	338 $ cd foo
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	339 $ touch bar/abc
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	340 $ hg addremove -S ..
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	341 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	342 searching for exact renames [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	343 \r (no-eol) (esc)
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	344 adding ../sub1/sub2/folder/test.txt (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	345 removing ../sub1/sub2/test.txt (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	346 adding ../sub1/foo (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	347 adding bar/abc (glob)
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	348 $ cd ..
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	349 $ hg status -S
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	350 A foo/bar/abc
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	351 A sub1/foo
ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	352 R sub1/sub2/test.txt
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	353
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	354 Archive wdir() with subrepos
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	355 $ hg rm main
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	356 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	357 deleting [===========================================>] 1/1\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	358 \r (no-eol) (esc)
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	359 $ hg archive -S -r 'wdir()' ../wdir
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	360 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	361 archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	362 archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	363 archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	364 archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	365 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	366 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	367 archiving (sub1) [ ] 0/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	368 archiving (sub1) [========> ] 1/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	369 archiving (sub1) [=================> ] 2/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	370 archiving (sub1) [==========================> ] 3/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	371 archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	372 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	373 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	374 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	375 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	376 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	377 \r (no-eol) (esc)
25863 1b449b012073 tests: diff -r on Solaris emits "Common subdirectories:" Danek Duvall <danek.duvall@oracle.com> parents: 25813 diff changeset	378 $ diff -r . ../wdir \| egrep -v '\.hg$\|^Common subdirectories:'
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	379 Only in ../wdir: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	380
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	381 $ find ../wdir -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	382 ../wdir/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	383 ../wdir/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	384 ../wdir/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	385 ../wdir/foo/bar/abc
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	386 ../wdir/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	387 ../wdir/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	388 ../wdir/sub1/foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	389 ../wdir/sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	390 ../wdir/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	391 ../wdir/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	392
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	393 $ cat ../wdir/.hg_archival.txt
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	394 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	395 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd+
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	396 branch: default
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	397 latesttag: null
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	398 latesttagdistance: 4
25690 98064baab877 archive: fix changesincelatesttag with wdir() Matt Mackall <mpm@selenic.com> parents: 25615 diff changeset	399 changessincelatesttag: 4
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	400
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	401 Attempting to archive 'wdir()' with a missing file is handled gracefully
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	402 $ rm sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	403 $ rm -r ../wdir
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	404 $ hg archive -v -S -r 'wdir()' ../wdir
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	405 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	406 archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	407 archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	408 archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	409 archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	410 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	411 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	412 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	413 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	414 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	415 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	416 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	417 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	418 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	419 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	420 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	421 \r (no-eol) (esc)
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	422 $ find ../wdir -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	423 ../wdir/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	424 ../wdir/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	425 ../wdir/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	426 ../wdir/foo/bar/abc
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	427 ../wdir/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	428 ../wdir/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	429 ../wdir/sub1/foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	430 ../wdir/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	431 ../wdir/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	432
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	433 Continue relative path printing + subrepos
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	434 $ hg update -Cq
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	435 $ rm -r ../wdir
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	436 $ hg archive -S -r 'wdir()' ../wdir
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	437 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	438 archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	439 archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	440 archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	441 archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	442 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	443 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	444 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	445 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	446 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	447 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	448 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	449 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	450 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	451 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	452 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	453 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	454 \r (no-eol) (esc)
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	455 $ cat ../wdir/.hg_archival.txt
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	456 repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	457 node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	458 branch: default
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	459 latesttag: null
dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	460 latesttagdistance: 4
25690 98064baab877 archive: fix changesincelatesttag with wdir() Matt Mackall <mpm@selenic.com> parents: 25615 diff changeset	461 changessincelatesttag: 4
25615 dc707fb35550 archive: report the node as "{p1node}+" when archiving a dirty wdir() Matt Harbison <matt_harbison@yahoo.com> parents: 25601 diff changeset	462
23539 cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	463 $ touch sub1/sub2/folder/bar
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	464 $ hg addremove sub1/sub2
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	465 adding sub1/sub2/folder/bar (glob)
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	466 $ hg status -S
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	467 A sub1/sub2/folder/bar
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	468 ? foo/bar/abc
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	469 ? sub1/foo
cb42050f2dad addremove: support addremove with explicit paths in subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	470 $ hg update -Cq
23540 f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	471 $ hg addremove sub1
f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	472 adding sub1/sub2/folder/bar (glob)
f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	473 adding sub1/foo (glob)
f274d27f1994 addremove: automatically process a subrepository's subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 23539 diff changeset	474 $ hg update -Cq
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	475 $ rm sub1/sub2/folder/test.txt
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	476 $ rm sub1/sub2/test.txt
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	477 $ hg ci -ASm "remove test.txt"
23686 164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	478 adding sub1/sub2/folder/bar
164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	479 removing sub1/sub2/folder/test.txt
164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	480 removing sub1/sub2/test.txt
164915e8ef7b narrowmatcher: propagate the rel() method Matt Harbison <matt_harbison@yahoo.com> parents: 23540 diff changeset	481 adding sub1/foo
23538 ccfb56450f21 addremove: add support for the -S flag Matt Harbison <matt_harbison@yahoo.com> parents: 23537 diff changeset	482 adding foo/bar/abc
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	483 committing subrepository sub1
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	484 committing subrepository sub1/sub2 (glob)
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	485
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	486 $ hg forget sub1/sub2/sub2
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	487 $ echo x > sub1/sub2/x.txt
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	488 $ hg add sub1/sub2/x.txt
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	489
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	490 Files sees uncommitted adds and removes in subrepos
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	491 $ hg files -S
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	492 .hgsub
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	493 .hgsubstate
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	494 foo/bar/abc (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	495 main
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	496 sub1/.hgsub (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	497 sub1/.hgsubstate (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	498 sub1/foo (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	499 sub1/sub1 (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	500 sub1/sub2/folder/bar (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	501 sub1/sub2/x.txt (glob)
a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	502
25122 755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	503 $ hg files -S "set:eol('dos') or eol('unix') or size('<= 0')"
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	504 .hgsub
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	505 .hgsubstate
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	506 foo/bar/abc (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	507 main
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	508 sub1/.hgsub (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	509 sub1/.hgsubstate (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	510 sub1/foo (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	511 sub1/sub1 (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	512 sub1/sub2/folder/bar (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	513 sub1/sub2/x.txt (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	514
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	515 $ hg files -r '.^' -S "set:eol('dos') or eol('unix')"
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	516 .hgsub
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	517 .hgsubstate
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	518 main
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	519 sub1/.hgsub (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	520 sub1/.hgsubstate (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	521 sub1/sub1 (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	522 sub1/sub2/folder/test.txt (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	523 sub1/sub2/sub2 (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	524 sub1/sub2/test.txt (glob)
755d23a49170 match: resolve filesets in subrepos for commands given the '-S' argument Matt Harbison <matt_harbison@yahoo.com> parents: 24953 diff changeset	525
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	526 $ hg files sub1
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	527 sub1/.hgsub (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	528 sub1/.hgsubstate (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	529 sub1/foo (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	530 sub1/sub1 (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	531 sub1/sub2/folder/bar (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	532 sub1/sub2/x.txt (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	533
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	534 $ hg files sub1/sub2
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	535 sub1/sub2/folder/bar (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	536 sub1/sub2/x.txt (glob)
63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	537
28387 97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	538 $ hg files
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	539 .hgsub
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	540 .hgsubstate
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	541 foo/bar/abc (glob)
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	542 main
97175d9bf7cf files: don't recurse into subrepos without a path or -S (issue5127) Matt Harbison <matt_harbison@yahoo.com> parents: 26421 diff changeset	543
25193 ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	544 $ hg files -S -r '.^' sub1/sub2/folder
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	545 sub1/sub2/folder/test.txt (glob)
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	546
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	547 $ hg files -S -r '.^' sub1/sub2/missing
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	548 sub1/sub2/missing: no such file in rev 78026e779ea6 (glob)
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	549 [1]
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	550
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	551 $ hg files -r '.^' sub1/
25194 ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	552 sub1/.hgsub (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	553 sub1/.hgsubstate (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	554 sub1/sub1 (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	555 sub1/sub2/folder/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	556 sub1/sub2/sub2 (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	557 sub1/sub2/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	558
25228 63a57a2727b6 files: recurse into subrepos automatically with an explicit path Matt Harbison <matt_harbison@yahoo.com> parents: 25195 diff changeset	559 $ hg files -r '.^' sub1/sub2
25194 ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	560 sub1/sub2/folder/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	561 sub1/sub2/sub2 (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	562 sub1/sub2/test.txt (glob)
ef4538ba67ef match: explicitly naming a subrepo implies always() for the submatcher Matt Harbison <matt_harbison@yahoo.com> parents: 25193 diff changeset	563
23537 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	564 $ hg rollback -q
f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23327 diff changeset	565 $ hg up -Cq
23325 4165cfd67519 remove: recurse into subrepositories with --subrepos/-S flag Matt Harbison <matt_harbison@yahoo.com> parents: 17346 diff changeset	566
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	567 $ hg --config extensions.largefiles=! archive -S ../archive_all
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	568 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	569 archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	570 archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	571 archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	572 archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	573 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	574 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	575 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	576 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	577 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	578 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	579 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	580 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	581 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	582 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	583 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	584 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	585 \r (no-eol) (esc)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	586 $ find ../archive_all \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	587 ../archive_all
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	588 ../archive_all/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	589 ../archive_all/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	590 ../archive_all/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	591 ../archive_all/main
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	592 ../archive_all/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	593 ../archive_all/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	594 ../archive_all/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	595 ../archive_all/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	596 ../archive_all/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	597 ../archive_all/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	598 ../archive_all/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	599 ../archive_all/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	600 ../archive_all/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	601
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	602 Check that archive -X works in deep subrepos
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	603
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	604 $ hg --config extensions.largefiles=! archive -S -X '*test' ../archive_exclude
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	605 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	606 archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	607 archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	608 archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	609 archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	610 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	611 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	612 archiving (sub1) [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	613 archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	614 archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	615 archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	616 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	617 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	618 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	619 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	620 \r (no-eol) (esc)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	621 $ find ../archive_exclude \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	622 ../archive_exclude
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	623 ../archive_exclude/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	624 ../archive_exclude/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	625 ../archive_exclude/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	626 ../archive_exclude/main
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	627 ../archive_exclude/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	628 ../archive_exclude/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	629 ../archive_exclude/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	630 ../archive_exclude/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	631 ../archive_exclude/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	632 ../archive_exclude/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	633
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	634 $ hg --config extensions.largefiles=! archive -S -I '*test' ../archive_include
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	635 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	636 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	637 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	638 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	639 archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	640 archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	641 archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	642 \r (no-eol) (esc)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	643 $ find ../archive_include \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	644 ../archive_include
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	645 ../archive_include/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	646 ../archive_include/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	647 ../archive_include/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	648 ../archive_include/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	649 ../archive_include/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	650
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	651 Check that deep archive works with largefiles (which overrides hgsubrepo impl)
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	652 This also tests the repo.ui regression in 43fb170a23bd, and that lf subrepo
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	653 subrepos are archived properly.
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	654 Note that add --large through a subrepo currently adds the file as a normal file
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	655
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	656 $ echo "large" > sub1/sub2/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	657 $ hg --config extensions.largefiles= add --large -R sub1/sub2 sub1/sub2/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	658 $ echo "large" > large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	659 $ hg --config extensions.largefiles= add --large large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	660 $ hg --config extensions.largefiles= ci -S -m "add large files"
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	661 committing subrepository sub1
17112 f690402e80fb tests: add '(glob)' for Windows paths in test-subrepo-deep-nested-change.t Mads Kiilerich <mads@kiilerich.com> parents: 17108 diff changeset	662 committing subrepository sub1/sub2 (glob)
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	663
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	664 $ hg --config extensions.largefiles= archive -S ../archive_lf
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	665 $ find ../archive_lf \| sort
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	666 ../archive_lf
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	667 ../archive_lf/.hg_archival.txt
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	668 ../archive_lf/.hgsub
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	669 ../archive_lf/.hgsubstate
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	670 ../archive_lf/large.bin
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	671 ../archive_lf/main
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	672 ../archive_lf/sub1
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	673 ../archive_lf/sub1/.hgsub
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	674 ../archive_lf/sub1/.hgsubstate
7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	675 ../archive_lf/sub1/sub1
17106 4d0e81dca75f largefiles: fix the directory structure when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 17105 diff changeset	676 ../archive_lf/sub1/sub2
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	677 ../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	678 ../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	679 ../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	680 ../archive_lf/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	681 ../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	682 $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	683
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	684 Exclude large files from main and sub-sub repo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	685
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	686 $ hg --config extensions.largefiles= archive -S -X '**.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	687 $ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	688 ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	689 ../archive_lf/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	690 ../archive_lf/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	691 ../archive_lf/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	692 ../archive_lf/main
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	693 ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	694 ../archive_lf/sub1/.hgsub
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	695 ../archive_lf/sub1/.hgsubstate
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	696 ../archive_lf/sub1/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	697 ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	698 ../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	699 ../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	700 ../archive_lf/sub1/sub2/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	701 ../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	702 $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	703
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	704 Exclude normal files from main and sub-sub repo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	705
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	706 $ hg --config extensions.largefiles= archive -S -X '**.txt' -p '.' ../archive_lf.tgz
24924 41cd8171e58f archive: always use portable path component separators with subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 24645 diff changeset	707 $ tar -tzf ../archive_lf.tgz \| sort
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	708 .hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	709 .hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	710 large.bin
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	711 main
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	712 sub1/.hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	713 sub1/.hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	714 sub1/sub1
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	715 sub1/sub2/large.bin
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	716 sub1/sub2/sub2
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	717
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	718 Include normal files from within a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	719
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	720 $ hg --config extensions.largefiles= archive -S -I '**.txt' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	721 $ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	722 ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	723 ../archive_lf/.hg_archival.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	724 ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	725 ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	726 ../archive_lf/sub1/sub2/folder
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	727 ../archive_lf/sub1/sub2/folder/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	728 ../archive_lf/sub1/sub2/test.txt
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	729 $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	730
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	731 Include large files from within a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	732
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	733 $ hg --config extensions.largefiles= archive -S -I '**.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	734 $ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	735 ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	736 ../archive_lf/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	737 ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	738 ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	739 ../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	740 $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	741
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	742 Find an exact largefile match in a largefiles subrepo
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	743
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	744 $ hg --config extensions.largefiles= archive -S -I 'sub1/sub2/large.bin' ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	745 $ find ../archive_lf \| sort
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	746 ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	747 ../archive_lf/sub1
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	748 ../archive_lf/sub1/sub2
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	749 ../archive_lf/sub1/sub2/large.bin
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	750 $ rm -rf ../archive_lf
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	751
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	752 The local repo enables largefiles if a largefiles repo is cloned
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	753 $ hg showconfig extensions
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	754 abort: repository requires features unknown to this Mercurial: largefiles!
26421 4b0fc75f9403 urls: bulk-change primary website URLs Matt Mackall <mpm@selenic.com> parents: 25865 diff changeset	755 (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	756 [255]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	757 $ hg --config extensions.largefiles= clone -qU . ../lfclone
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	758 $ cat ../lfclone/.hg/hgrc
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29176 diff changeset	759 # example repository config (see 'hg help config' for more info)
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	760 [paths]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	761 default = $TESTTMP/cloned (glob)
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	762
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	763 # path aliases to other clones of this repo in URLs or filesystem paths
29978 3d2ea1403c62 samplehgrcs: use single quotes in use warning timeless <timeless@mozdev.org> parents: 29176 diff changeset	764 # (see 'hg help config.paths' for more info)
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	765 #
31064 4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 29978 diff changeset	766 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 29978 diff changeset	767 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
4431add9aef9 ui: replace obsolete default-push with default:pushurl (issue5485) Rishabh Madan <rishabhmadan96@gmail.com> parents: 29978 diff changeset	768 # my-clone = /home/jdoe/jdoes-clone
24029 e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	769
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	770 [ui]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	771 # name and email (local to this repository, optional), e.g.
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	772 # username = Jane Doe <jdoe@example.com>
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	773
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	774 [extensions]
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	775 largefiles=
e1dbe0b215ae largefiles: set the extension as enabled locally after a clone requiring it Matt Harbison <matt_harbison@yahoo.com> parents: 23923 diff changeset	776
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	777 Find an exact match to a standin (should archive nothing)
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17106 diff changeset	778 $ hg --config extensions.largefiles= archive -S -I 'sub/sub2/.hglf/large.bin' ../archive_lf
17113 d7493da233c8 tests: remove GNU quoting in test-subrepo-deep-nested-change.t Mads Kiilerich <mads@kiilerich.com> parents: 17112 diff changeset	779 $ find ../archive_lf 2> /dev/null \| sort
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	780
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	781 $ cat >> $HGRCPATH <<EOF
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	782 > [extensions]
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	783 > largefiles=
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	784 > [largefiles]
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	785 > patterns=glob:**.dat
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	786 > EOF
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	787
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	788 Test forget through a deep subrepo with the largefiles extension, both a
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	789 largefile and a normal file. Then a largefile that hasn't been committed yet.
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	790 $ touch sub1/sub2/untracked.txt
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	791 $ touch sub1/sub2/large.dat
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	792 $ hg forget sub1/sub2/large.bin sub1/sub2/test.txt sub1/sub2/untracked.txt
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	793 not removing sub1/sub2/untracked.txt: file is already untracked (glob)
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	794 [1]
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	795 $ hg add --large --dry-run -v sub1/sub2/untracked.txt
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	796 adding sub1/sub2/untracked.txt as a largefile (glob)
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	797 $ hg add --large -v sub1/sub2/untracked.txt
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	798 adding sub1/sub2/untracked.txt as a largefile (glob)
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	799 $ hg add --normal -v sub1/sub2/large.dat
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	800 adding sub1/sub2/large.dat (glob)
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	801 $ hg forget -v sub1/sub2/untracked.txt
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	802 removing sub1/sub2/untracked.txt (glob)
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	803 $ hg status -S
23886 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23837 diff changeset	804 A sub1/sub2/large.dat
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	805 R sub1/sub2/large.bin
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	806 R sub1/sub2/test.txt
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	807 ? foo/bar/abc
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	808 ? sub1/sub2/untracked.txt
24413 a8595176dd64 subrepo: add basic support to hgsubrepo for the files command Matt Harbison <matt_harbison@yahoo.com> parents: 24230 diff changeset	809 ? sub1/sub2/x.txt
23923 ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	810 $ hg add sub1/sub2
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	811
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	812 $ hg archive -S -r 'wdir()' ../wdir2
25863 1b449b012073 tests: diff -r on Solaris emits "Common subdirectories:" Danek Duvall <danek.duvall@oracle.com> parents: 25813 diff changeset	813 $ diff -r . ../wdir2 \| egrep -v '\.hg$\|^Common subdirectories:'
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	814 Only in ../wdir2: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	815 Only in .: .hglf
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	816 Only in .: foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	817 Only in ./sub1/sub2: large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	818 Only in ./sub1/sub2: test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	819 Only in ./sub1/sub2: untracked.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	820 Only in ./sub1/sub2: x.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	821 $ find ../wdir2 -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	822 ../wdir2/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	823 ../wdir2/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	824 ../wdir2/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	825 ../wdir2/large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	826 ../wdir2/main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	827 ../wdir2/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	828 ../wdir2/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	829 ../wdir2/sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	830 ../wdir2/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	831 ../wdir2/sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	832 ../wdir2/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	833 $ hg status -S -mac -n \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	834 .hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	835 .hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	836 large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	837 main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	838 sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	839 sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	840 sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	841 sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	842 sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	843 sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	844
23923 ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	845 $ hg ci -Sqm 'forget testing'
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	846
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	847 Test 'wdir()' modified file archiving with largefiles
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	848 $ echo 'mod' > main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	849 $ echo 'mod' > large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	850 $ echo 'mod' > sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	851 $ hg archive -S -r 'wdir()' ../wdir3
25863 1b449b012073 tests: diff -r on Solaris emits "Common subdirectories:" Danek Duvall <danek.duvall@oracle.com> parents: 25813 diff changeset	852 $ diff -r . ../wdir3 \| egrep -v '\.hg$\|^Common subdirectories'
25601 3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	853 Only in ../wdir3: .hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	854 Only in .: .hglf
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	855 Only in .: foo
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	856 Only in ./sub1/sub2: large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	857 Only in ./sub1/sub2: test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	858 Only in ./sub1/sub2: untracked.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	859 Only in ./sub1/sub2: x.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	860 $ find ../wdir3 -type f \| sort
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	861 ../wdir3/.hg_archival.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	862 ../wdir3/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	863 ../wdir3/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	864 ../wdir3/large.bin
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	865 ../wdir3/main
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	866 ../wdir3/sub1/.hgsub
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	867 ../wdir3/sub1/.hgsubstate
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	868 ../wdir3/sub1/sub1
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	869 ../wdir3/sub1/sub2/folder/test.txt
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	870 ../wdir3/sub1/sub2/large.dat
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	871 ../wdir3/sub1/sub2/sub2
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	872 $ hg up -Cq
3ec8351fa6ed archive: support 'wdir()' Matt Harbison <matt_harbison@yahoo.com> parents: 25228 diff changeset	873
23923 ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	874 Test issue4330: commit a directory where only normal files have changed
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	875 $ touch foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	876 $ hg add --large foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	877 $ hg ci -m 'add foo/bar/large.dat'
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	878 $ touch a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	879 $ touch a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	880 $ hg add -v foo/bar/abc a.txt a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	881 adding a.dat as a largefile
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	882 adding a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	883 adding foo/bar/abc (glob)
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	884 $ hg ci -m 'dir commit with only normal file deltas' foo/bar
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	885 $ hg status
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	886 A a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	887 A a.txt
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	888
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	889 Test a directory commit with a changed largefile and a changed normal file
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	890 $ echo changed > foo/bar/large.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	891 $ echo changed > foo/bar/abc
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	892 $ hg ci -m 'dir commit with normal and lf file deltas' foo
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	893 $ hg status
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	894 A a.dat
ab6fd3205dad largefiles: fix commit of a directory with no largefile changes (issue4330) Matt Harbison <matt_harbison@yahoo.com> parents: 23886 diff changeset	895 A a.txt
23837 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23686 diff changeset	896
24230 23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	897 $ hg ci -m "add a.*"
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	898 $ hg mv a.dat b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	899 $ hg mv foo/bar/abc foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	900 $ hg status -C
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	901 A b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	902 a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	903 A foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	904 foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	905 R a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	906 R foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	907
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	908 $ hg ci -m "move large and normal"
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	909 $ hg status -C --rev '.^' --rev .
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	910 A b.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	911 a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	912 A foo/bar/def
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	913 foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	914 R a.dat
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	915 R foo/bar/abc
23438bceba04 largefiles: report the source of copied/moved largefiles in status -C Matt Harbison <matt_harbison@yahoo.com> parents: 24029 diff changeset	916
24446 582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	917
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	918 $ echo foo > main
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	919 $ hg ci -m "mod parent only"
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	920 $ hg init sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	921 $ echo "sub3 = sub3" >> .hgsub
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	922 $ echo xyz > sub3/a.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	923 $ hg add sub3/a.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	924 $ hg ci -Sm "add sub3"
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	925 committing subrepository sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	926 $ cat .hgsub \| grep -v sub3 > .hgsub1
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	927 $ mv .hgsub1 .hgsub
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	928 $ hg ci -m "remove sub3"
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	929
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	930 $ hg log -r "subrepo()" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	931 0 7f491f53a367 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	932 main import
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	933
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	934 1 ffe6649062fe 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	935 deep nested modif should trigger a commit
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	936
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	937 2 9bb10eebee29 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	938 add test.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	939
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	940 3 7c64f035294f 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	941 add large files
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	942
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	943 4 f734a59e2e35 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	944 forget testing
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	945
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	946 11 9685a22af5db 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	947 add sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	948
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	949 12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	950 remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	951
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	952 $ hg log -r "subrepo('sub3')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	953 11 9685a22af5db 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	954 add sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	955
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	956 12[tip] 2e0485b475b9 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	957 remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	958
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	959 $ hg log -r "subrepo('bogus')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	960
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	961
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	962 Test .hgsubstate in the R state
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	963
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	964 $ hg rm .hgsub .hgsubstate
28608 62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	965 \r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	966 deleting [=====================> ] 1/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	967 deleting [===========================================>] 2/2\r (no-eol) (esc)
62e73d42bd14 remove: add progress support timeless <timeless@mozdev.org> parents: 28606 diff changeset	968 \r (no-eol) (esc)
24446 582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	969 $ hg ci -m 'trash subrepo tracking'
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	970
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	971 $ hg log -r "subrepo('re:sub\d+')" --style compact
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	972 0 7f491f53a367 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	973 main import
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	974
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	975 1 ffe6649062fe 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	976 deep nested modif should trigger a commit
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	977
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	978 2 9bb10eebee29 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	979 add test.txt
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	980
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	981 3 7c64f035294f 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	982 add large files
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	983
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	984 4 f734a59e2e35 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	985 forget testing
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	986
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	987 11 9685a22af5db 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	988 add sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	989
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	990 12 2e0485b475b9 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	991 remove sub3
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	992
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	993 13[tip] a68b2c361653 1970-01-01 00:00 +0000 test
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	994 trash subrepo tracking
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	995
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	996
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	997 Restore the trashed subrepo tracking
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	998
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	999 $ hg rollback -q
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	1000 $ hg update -Cq .
582cfcc843c7 revset: add the 'subrepo' symbol Matt Harbison <matt_harbison@yahoo.com> parents: 24413 diff changeset	1001
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1002 Interaction with extdiff, largefiles and subrepos
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1003
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	1004 $ hg --config extensions.extdiff= pdiff -S
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1005
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	1006 $ hg --config extensions.extdiff= pdiff -r '.^' -S
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1007 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1008 archiving [ ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1009 archiving [====================> ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1010 archiving [==========================================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1011 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1012 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1013 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1014 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1015 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1016 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1017 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1018 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1019 archiving (sub3) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1020 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1021 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1022 archiving [ ] 0/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1023 archiving [====================> ] 1/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1024 archiving [==========================================>] 2/2\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1025 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1026 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1027 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1028 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1029 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1030 archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1031 \r (no-eol) (esc)
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1032 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
28034 e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	1033 --- cloned./.hgsub (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	1034 +++ cloned/.hgsub * (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1035 @@ -1,2 +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1036 sub1 = ../sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1037 -sub3 = sub3
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1038 diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob)
28034 e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	1039 --- cloned./.hgsubstate (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28033 diff changeset	1040 +++ cloned/.hgsubstate * (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1041 @@ -1,2 +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1042 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1043 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1044 [1]
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1045
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	1046 $ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1047 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1048 archiving [ ] 0/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1049 archiving [=============> ] 1/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1050 archiving [===========================> ] 2/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1051 archiving [==========================================>] 3/3\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1052 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1053 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1054 archiving (sub1) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1055 archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1056 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1057 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1058 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1059 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1060 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1061 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1062 archiving [ ] 0/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1063 archiving [====> ] 1/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1064 archiving [=========> ] 2/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1065 archiving [===============> ] 3/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1066 archiving [====================> ] 4/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1067 archiving [=========================> ] 5/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1068 archiving [===============================> ] 6/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1069 archiving [====================================> ] 7/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1070 archiving [==========================================>] 8/8\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1071 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1072 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1073 archiving (sub1) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1074 archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1075 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1076 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1077 archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1078 archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1079 archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1080 archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1081 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1082 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1083 archiving (sub3) [ ] 0/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1084 archiving (sub3) [===================================>] 1/1\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1085 \r (no-eol) (esc)
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1086 diff -Nru cloned./.hglf/b.dat cloned./.hglf/b.dat (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1087 --- cloned./.hglf/b.dat (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1088 +++ cloned./.hglf/b.dat (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1089 @@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1090 +da39a3ee5e6b4b0d3255bfef95601890afd80709
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1091 diff -Nru cloned./.hglf/foo/bar/large.dat cloned./.hglf/foo/bar/large.dat (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1092 --- cloned./.hglf/foo/bar/large.dat (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1093 +++ cloned./.hglf/foo/bar/large.dat (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1094 @@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1095 +2f6933b5ee0f5fdd823d9717d8729f3c2523811b
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1096 diff -Nru cloned./.hglf/large.bin cloned./.hglf/large.bin (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1097 --- cloned./.hglf/large.bin (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1098 +++ cloned./.hglf/large.bin (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1099 @@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1100 +7f7097b041ccf68cc5561e9600da4655d21c6d18
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1101 diff -Nru cloned./.hgsub cloned./.hgsub (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1102 --- cloned./.hgsub (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1103 +++ cloned./.hgsub (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1104 @@ -1* +1,2 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1105 sub1 = ../sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1106 +sub3 = sub3
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1107 diff -Nru cloned./.hgsubstate cloned./.hgsubstate (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1108 --- cloned./.hgsubstate (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1109 +++ cloned./.hgsubstate (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1110 @@ -1* +1,2 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1111 -fc3b4ce2696f7741438c79207583768f2ce6b0dd sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1112 +7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1113 +b1a26de6f2a045a9f079323693614ee322f1ff7e sub3
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1114 diff -Nru cloned./foo/bar/def cloned./foo/bar/def (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1115 --- cloned./foo/bar/def (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1116 +++ cloned./foo/bar/def (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1117 @@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1118 +changed
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1119 diff -Nru cloned./main cloned./main (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1120 --- cloned./main (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1121 +++ cloned./main (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1122 @@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1123 -main
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1124 +foo
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1125 diff -Nru cloned./sub1/.hgsubstate cloned./sub1/.hgsubstate (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1126 --- cloned./sub1/.hgsubstate (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1127 +++ cloned./sub1/.hgsubstate (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1128 @@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1129 -c57a0840e3badd667ef3c3ef65471609acb2ba3c sub2
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1130 +c77908c81ccea3794a896c79e98b0e004aee2e9e sub2
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1131 diff -Nru cloned./sub1/sub2/folder/test.txt cloned./sub1/sub2/folder/test.txt (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1132 --- cloned./sub1/sub2/folder/test.txt (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1133 +++ cloned./sub1/sub2/folder/test.txt (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1134 @@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1135 +subfolder
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1136 diff -Nru cloned./sub1/sub2/sub2 cloned./sub1/sub2/sub2 (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1137 --- cloned./sub1/sub2/sub2 (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1138 +++ cloned./sub1/sub2/sub2 (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1139 @@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1140 -sub2
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1141 +modified
28033 0707bbec682d tests: omit -p for external diff via extdiff extension for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26421 diff changeset	1142 diff -Nru cloned./sub3/a.txt cloned./sub3/a.txt (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1143 --- cloned./sub3/a.txt (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1144 +++ cloned./sub3/a.txt (glob)
28036 b5069c2b6f62 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28035 diff changeset	1145 @@ -,0 +1 @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1146 +xyz
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1147 [1]
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1148
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1149 $ echo mod > sub1/sub2/sub2
28052 b59ef0c21405 tests: use portable diff script via extdiff extension FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28036 diff changeset	1150 $ hg --config extensions.extdiff= pdiff -S
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1151 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1152 archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1153 \r (no-eol) (esc)
8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1154 \r (no-eol) (esc)
29102 22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1155 archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
22c53b3a390d tests: add globs for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 28608 diff changeset	1156 archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
28606 8cc51c5a9365 tests: include progress for test-remove timeless <timeless@mozdev.org> parents: 28449 diff changeset	1157 \r (no-eol) (esc)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1158 --- /cloned./sub1/sub2/sub2 * (glob)
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1159 +++ /cloned/sub1/sub2/sub2 (glob)
28035 c65da6892ae5 tests: make chunk header of external diff glob-ed for portability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28034 diff changeset	1160 @@ -1* +1* @@ (glob)
25813 18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1161 -modified
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1162 +mod
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1163 [1]
18bae5eb58c5 extdiff: add support for subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 25690 diff changeset	1164
17105 7d45730ea1b8 largefiles: fix a traceback when archiving a subrepo in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16073 diff changeset	1165 $ cd ..

Mercurial > public > mercurial-scm > hg

annotate tests/test-subrepo-deep-nested-change.t @ 33806:dedab036215d