--- a/contrib/check-code.py Fri Mar 04 14:00:49 2011 +0100
+++ b/contrib/check-code.py Fri Mar 04 14:11:15 2011 +0100
@@ -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/hgext/convert/subversion.py Fri Mar 04 14:00:49 2011 +0100
+++ b/hgext/convert/subversion.py Fri Mar 04 14:11:15 2011 +0100
@@ -259,6 +259,7 @@
except ValueError:
raise util.Abort(_('svn: revision %s is not an integer') % rev)
+ self.trunkname = self.ui.config('convert', 'svn.trunk', 'trunk').strip('/')
self.startrev = self.ui.config('convert', 'svn.startrev', default=0)
try:
self.startrev = int(self.startrev)
@@ -761,9 +762,8 @@
author = author and self.recode(author) or ''
try:
branch = self.module.split("/")[-1]
- trunkname = self.ui.config('convert', 'svn.trunk', 'trunk')
- if branch == trunkname.strip('/'):
- branch = ''
+ if branch == self.trunkname:
+ branch = None
except IndexError:
branch = None
@@ -942,6 +942,7 @@
class svn_sink(converter_sink, commandline):
commit_re = re.compile(r'Committed revision (\d+).', re.M)
+ uuid_re = re.compile(r'Repository UUID:\s*(\S+)', re.M)
def prerun(self):
if self.wc:
@@ -962,8 +963,6 @@
def __init__(self, ui, path):
- if svn is None:
- raise MissingTool(_('Could not load Subversion python bindings'))
converter_sink.__init__(self, ui, path)
commandline.__init__(self, ui, 'svn')
self.delete = []
@@ -1010,8 +1009,8 @@
fp.close()
util.set_flags(hook, False, True)
- xport = transport.SvnRaTransport(url=geturl(path))
- self.uuid = svn.ra.get_uuid(xport.ra)
+ output = self.run0('info')
+ self.uuid = self.uuid_re.search(output).group(1).strip()
def wjoin(self, *names):
return os.path.join(self.wc, *names)
--- a/hgext/mq.py Fri Mar 04 14:00:49 2011 +0100
+++ b/hgext/mq.py Fri Mar 04 14:11:15 2011 +0100
@@ -1898,7 +1898,7 @@
With -g/--git, patches imported with --rev will use the git diff
format. See the diffs help topic for information on why this is
important for preserving rename/copy information and permission
- changes.
+ changes. Use :hg:`qfinish` to remove changesets from mq control.
To import a patch from standard input, pass - as the patch file.
When importing from standard input, a patch name must be specified
--- a/mercurial/subrepo.py Fri Mar 04 14:00:49 2011 +0100
+++ b/mercurial/subrepo.py Fri Mar 04 14:11:15 2011 +0100
@@ -760,8 +760,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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-hg-startrev.t Fri Mar 04 14:11:15 2011 +0100
@@ -1,5 +1,5 @@
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [extensions]
> graphlog =
> convert =
--- a/tests/test-convert-svn-branches.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-svn-branches.t Fri Mar 04 14:11:15 2011 +0100
@@ -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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-svn-encoding.t Fri Mar 04 14:11:15 2011 +0100
@@ -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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-svn-move.t Fri Mar 04 14:11:15 2011 +0100
@@ -5,7 +5,7 @@
> {
> tr '\\' /
> }
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
> graphlog =
--- a/tests/test-convert-svn-sink.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-svn-sink.t Fri Mar 04 14:11:15 2011 +0100
@@ -1,5 +1,5 @@
- $ "$TESTDIR/hghave" svn svn-bindings no-outer-repo || exit 80
+ $ "$TESTDIR/hghave" svn no-outer-repo || exit 80
$ fixpath()
> {
@@ -22,7 +22,7 @@
> )
> }
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
> graphlog =
--- a/tests/test-convert-svn-source.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-svn-source.t Fri Mar 04 14:11:15 2011 +0100
@@ -5,7 +5,7 @@
> {
> tr '\\' /
> }
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [extensions]
> convert =
> graphlog =
--- a/tests/test-convert-svn-startrev.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-svn-startrev.t Fri Mar 04 14:11:15 2011 +0100
@@ -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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-convert-svn-tags.t Fri Mar 04 14:11:15 2011 +0100
@@ -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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-eol-add.t Fri Mar 04 14:11:15 2011 +0100
@@ -1,6 +1,6 @@
Test adding .hgeol
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [diff]
> git = 1
> EOF
--- a/tests/test-eol-clone.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-eol-clone.t Fri Mar 04 14:11:15 2011 +0100
@@ -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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-eol-hook.t Fri Mar 04 14:11:15 2011 +0100
@@ -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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-eol-patch.t Fri Mar 04 14:11:15 2011 +0100
@@ -1,6 +1,6 @@
Test EOL patching
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [diff]
> git = 1
> EOF
--- a/tests/test-eol-tag.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-eol-tag.t Fri Mar 04 14:11:15 2011 +0100
@@ -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 Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-eol-update.t Fri Mar 04 14:11:15 2011 +0100
@@ -1,6 +1,6 @@
Test EOL update
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [diff]
> git = 1
> EOF
--- a/tests/test-eol.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-eol.t Fri Mar 04 14:11:15 2011 +0100
@@ -1,6 +1,6 @@
Test EOL extension
- $ cat > $HGRCPATH <<EOF
+ $ cat >> $HGRCPATH <<EOF
> [diff]
> git = True
> EOF
--- a/tests/test-subrepo-git.t Fri Mar 04 14:00:49 2011 +0100
+++ b/tests/test-subrepo-git.t Fri Mar 04 14:11:15 2011 +0100
@@ -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