Commits

Angel Ezquerra  committed 4a1235e Merge
  • Participants
  • Parent commits a9ccbea, 68a08f0

Comments (0)

Files changed (5)

     b = multi
       line
       value!
+    <BLANKLINE>
     [foo]
     z = w
     x = xxx

File tests/test-projrc-include.t

 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "projrc = $TESTDIR/../projrc.py" >> $HGRCPATH
+  $ echo "[projrc]" >> $HGRCPATH
+  $ echo "include = *" >> $HGRCPATH
+  $ echo "servers = *" >> $HGRCPATH
+  $ echo "confirm = False" >> $HGRCPATH
 
 make initial repository
 
   [bar]
   x = Hello
   y = World
+  
   [foo]
   b = Hello
     World!

File tests/test-projrc-subpaths-hgrc.t

   $ echo "[extensions]" >> $HOME/.hgrc
   $ echo "projrc = $TESTDIR/../projrc.py" >> $HOME/.hgrc
 
+  $ echo "[projrc]" >> $HOME/.hgrc
+  $ echo "include = *" >> $HOME/.hgrc
+  $ echo "servers = *" >> $HOME/.hgrc
+  $ echo "confirm = False" >> $HOME/.hgrc
+
 setup repository
 
   $ hg init repo
   $ echo "inner = no-such-path" >> repo/.hg/projrc
   $ hg clone repo repo2
   updating to branch default
+  projrc settings file updated and applied
   abort: repository $TESTTMP/repo/no-such-path not found!
   [255]
 
   $ echo "^no-such = some-such" >> $HOME/.hgrc
   $ hg clone repo repo3
   updating to branch default
-  abort: repository $TESTTMP/repo/some-such-path not found!
+  projrc settings file updated and applied
+  abort: repository $TESTTMP/repo/no-such-path not found!
   [255]

File tests/test-projrc-subpaths.t

 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "projrc = $TESTDIR/../projrc.py" >> $HGRCPATH
+  $ echo "[projrc]" >> $HGRCPATH
+  $ echo "include = *" >> $HGRCPATH
+  $ echo "servers = *" >> $HGRCPATH
+  $ echo "confirm = False" >> $HGRCPATH
 
 create repository
 
   $ cd ..
   $ hg clone outer outer2
   updating to branch default
+  projrc settings file updated and applied
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd outer2
   $ hg debugsub
   $ echo '# empty' > ../outer/.hg/projrc
   $ hg pull --traceback
   pulling from $TESTTMP/outer
+  projrc settings file updated and applied
   searching for changes
   no changes found
+  [1]
   $ hg debugsub
   path inner
    source   http://example.net/libfoo
   $ cd ../outer
   $ echo 'inner = inner' > .hgsub
   $ echo '[subpaths]' > .hg/projrc
-  $ echo "inner = $TESTTMP/inner" >> .hg/projrc
+  $ echo "^inner = $TESTTMP/inner" >> .hg/projrc
   $ rm -r inner
   $ hg clone ../inner
   destination directory: inner
   $ cd ..
   $ hg clone outer outer3
   updating to branch default
+  projrc settings file updated and applied
   cloning subrepo inner from $TESTTMP/inner
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat outer3/.hg/projrc
   #\ projrc encoding check, line must begin with '#\ '
   [subpaths]
-  inner = $TESTTMP/inner
+  ^inner = $TESTTMP/inner
 
 clone with no update
 
   $ hg clone -U outer outer4
+  projrc settings file updated and applied
   $ cd outer4
   $ hg update
   cloning subrepo inner from $TESTTMP/inner
   $ cat .hg/projrc
   #\ projrc encoding check, line must begin with '#\ '
   [subpaths]
-  inner = $TESTTMP/inner
+  ^inner = $TESTTMP/inner
 
 The following is not active since the .hgsubstate file cannot contain
 blank or malformed lines, at least not when Mercurial edits it.
   $ hg clone ../outer
   destination directory: outer
   updating to branch default
+  projrc settings file updated and applied
   cloning subrepo inner from $TESTTMP/inner
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg commit -m 'Outer commit'
   $ cd ..
   $ hg clone newouter outer5
   updating to branch default
+  projrc settings file updated and applied
   cloning subrepo outer from $TESTTMP/outer
+  projrc settings file updated and applied
   cloning subrepo outer/inner from $TESTTMP/inner
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

File tests/test-projrc.t

 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "projrc = $TESTDIR/../projrc.py" >> $HGRCPATH
+  $ echo "[projrc]" >> $HGRCPATH
+  $ echo "include = *" >> $HGRCPATH
+  $ echo "servers = *" >> $HGRCPATH
+  $ echo "confirm = False" >> $HGRCPATH
 
 test clone with no projrc
 
   $ cd ..
   $ hg clone a b
   updating to branch default
+  projrc settings file updated and applied
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd b
   $ hg showconfig extensions
   $ echo "relink =" >> ../a/.hg/projrc
   $ hg pull
   pulling from $TESTTMP/a
+  projrc settings file updated and applied
   searching for changes
   no changes found
+  [1]
   $ hg showconfig extensions
   extensions.children=
   extensions.relink=
   pulling from $TESTTMP/a
   searching for changes
   no changes found
+  [1]
   $ hg showconfig extensions
   extensions.projrc=*/projrc.py (glob)
 
   $ cd ../b
   $ hg pull http://localhost:$HGPORT/
   pulling from http://localhost:$HGPORT/
+  projrc settings file updated and applied
   searching for changes
   no changes found
+  [1]
   $ cat .hg/projrc
   #\ projrc encoding check, line must begin with '#\ '
   [test]
   not saving retrieved projrc file: parse error at 'this is broken' on projrc:1
   searching for changes
   no changes found
+  [1]
 
 kill hg serve