Mercurial > hg

changeset 13527:d931cce7f207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Steve Borho <steve@borho.org>
date Wed, 02 Mar 2011 22:00:41 -0600
parents c12088259f64 (diff) 8ac1260941c0 (current diff)
children 73bf872a91d8
files
diffstat 18 files changed, 25 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/check-code.py	Wed Mar 02 21:57:20 2011 -0600
+++ b/contrib/check-code.py	Wed Mar 02 22:00:41 2011 -0600
@@ -66,6 +66,7 @@
     (r'^source\b', "don't use 'source', use '.'"),
     (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"),
     (r'ls\s+[^|-]+\s+-', "options to 'ls' must come before filenames"),
+    (r'[^>]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"),
 ]
 
 testfilters = [
--- a/mercurial/subrepo.py	Wed Mar 02 21:57:20 2011 -0600
+++ b/mercurial/subrepo.py	Wed Mar 02 22:00:41 2011 -0600
@@ -759,8 +759,10 @@
 
     def _fetch(self, source, revision):
         if not os.path.exists(os.path.join(self._abspath, '.git')):
-            self._ui.status(_('cloning subrepo %s\n') % self._relpath)
-            self._gitnodir(['clone', self._abssource(source), self._abspath])
+            source = self._abssource(source)
+            self._ui.status(_('cloning subrepo %s from %s\n') %
+                            (self._relpath, source))
+            self._gitnodir(['clone', source, self._abspath])
         if self._githavelocally(revision):
             return
         self._ui.status(_('pulling subrepo %s\n') % self._relpath)
--- a/tests/test-convert-hg-startrev.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-hg-startrev.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,5 +1,5 @@
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > graphlog =
   > convert =
--- a/tests/test-convert-svn-branches.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-svn-branches.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,7 +1,7 @@
 
   $ "$TESTDIR/hghave" svn svn-bindings || exit 80
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
--- a/tests/test-convert-svn-encoding.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-svn-encoding.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,7 +1,7 @@
 
   $ "$TESTDIR/hghave" svn svn-bindings || exit 80
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
--- a/tests/test-convert-svn-move.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-svn-move.t	Wed Mar 02 22:00:41 2011 -0600
@@ -5,7 +5,7 @@
   > {
   >     tr '\\' /
   > }
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
--- a/tests/test-convert-svn-sink.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-svn-sink.t	Wed Mar 02 22:00:41 2011 -0600
@@ -22,7 +22,7 @@
   >     )
   > }
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
--- a/tests/test-convert-svn-source.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-svn-source.t	Wed Mar 02 22:00:41 2011 -0600
@@ -5,7 +5,7 @@
   > {
   >     tr '\\' /
   > }
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
--- a/tests/test-convert-svn-startrev.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-svn-startrev.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,7 +1,7 @@
 
   $ "$TESTDIR/hghave" svn svn-bindings || exit 80
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
--- a/tests/test-convert-svn-tags.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-convert-svn-tags.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,7 +1,7 @@
 
   $ "$TESTDIR/hghave" svn svn-bindings || exit 80
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert = 
   > graphlog =
--- a/tests/test-eol-add.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-eol-add.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,6 +1,6 @@
 Test adding .hgeol
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [diff]
   > git = 1
   > EOF
--- a/tests/test-eol-clone.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-eol-clone.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,9 +1,6 @@
 Testing cloning with the EOL extension
 
-  $ cat > $HGRCPATH <<EOF
-  > [diff]
-  > git = True
-  > 
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > eol =
   > 
--- a/tests/test-eol-hook.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-eol-hook.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,9 +1,5 @@
 Test the EOL hook
 
-  $ cat > $HGRCPATH <<EOF
-  > [diff]
-  > git = True
-  > EOF
   $ hg init main
   $ cat > main/.hg/hgrc <<EOF
   > [extensions]
--- a/tests/test-eol-patch.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-eol-patch.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,6 +1,6 @@
 Test EOL patching
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [diff]
   > git = 1
   > EOF
--- a/tests/test-eol-tag.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-eol-tag.t	Wed Mar 02 22:00:41 2011 -0600
@@ -2,10 +2,7 @@
 
 Testing tagging with the EOL extension
 
-  $ cat > $HGRCPATH <<EOF
-  > [diff]
-  > git = True
-  > 
+  $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > eol =
   > 
--- a/tests/test-eol-update.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-eol-update.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,6 +1,6 @@
 Test EOL update
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [diff]
   > git = 1
   > EOF
--- a/tests/test-eol.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-eol.t	Wed Mar 02 22:00:41 2011 -0600
@@ -1,6 +1,6 @@
 Test EOL extension
 
-  $ cat > $HGRCPATH <<EOF
+  $ cat >> $HGRCPATH <<EOF
   > [diff]
   > git = True
   > EOF
--- a/tests/test-subrepo-git.t	Wed Mar 02 21:57:20 2011 -0600
+++ b/tests/test-subrepo-git.t	Wed Mar 02 22:00:41 2011 -0600
@@ -73,7 +73,7 @@
   $ cd t
   $ hg clone . ../tc
   updating to branch default
-  cloning subrepo s
+  cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../tc
   $ hg debugsub
@@ -96,7 +96,7 @@
   $ cd ../t
   $ hg clone . ../ta
   updating to branch default
-  cloning subrepo s
+  cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd ../ta
@@ -115,7 +115,7 @@
   $ cd ../t
   $ hg clone . ../tb
   updating to branch default
-  cloning subrepo s
+  cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd ../tb/s
@@ -199,7 +199,7 @@
   $ cd ../t
   $ hg clone . ../td
   updating to branch default
-  cloning subrepo s
+  cloning subrepo s from $TESTTMP/gitroot
   checking out detached HEAD in subrepo s
   check out a git branch if you intend to make changes
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -282,7 +282,7 @@
 
   $ hg clone ../t inner
   updating to branch default
-  cloning subrepo s
+  cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo inner = inner > .hgsub
   $ hg add .hgsub
@@ -311,7 +311,7 @@
   $ mkdir d
   $ hg clone t d/t
   updating to branch default
-  cloning subrepo s
+  cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Check hg update --clean