Mercurial > hg-stable
changeset 7103:7a19053e4bfc
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 15 Oct 2008 23:27:35 +0200 |
| parents | 14f3ea2ea54f (current diff) e786192d995d (diff) |
| children | 9514cbb6e4f6 |
| files | |
| diffstat | 4 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/__init__.py Wed Oct 15 21:50:47 2008 +0200 +++ b/hgext/convert/__init__.py Wed Oct 15 23:27:35 2008 +0200 @@ -104,11 +104,12 @@ sandbox is ignored. Because CVS does not have changesets, it is necessary to collect - individual commits to CVS and merge them into changesets. CVS source - can use the external 'cvsps' program (this is a legacy option and may - be removed in future) or use its internal changeset merging code. - External cvsps is default, and options may be passed to it by setting - --config convert.cvsps='cvsps -A -u --cvs-direct -q' + individual commits to CVS and merge them into changesets. CVS + source uses its internal changeset merging code by default but can + be configured to call the external 'cvsps' program by setting: + --config convert.cvsps=cvsps -A -u --cvs-direct -q + This is a legacy option and may be removed in future. + The options shown are the defaults. Internal cvsps is selected by setting
--- a/hgext/convert/cvs.py Wed Oct 15 21:50:47 2008 +0200 +++ b/hgext/convert/cvs.py Wed Oct 15 23:27:35 2008 +0200 @@ -17,7 +17,7 @@ raise NoRepo("%s does not look like a CVS checkout" % path) checktool('cvs') - self.cmd = ui.config('convert', 'cvsps', 'cvsps -A -u --cvs-direct -q') + self.cmd = ui.config('convert', 'cvsps', 'builtin') cvspsexe = self.cmd.split(None, 1)[0] self.builtin = cvspsexe == 'builtin'
--- a/tests/test-convert-cvs Wed Oct 15 21:50:47 2008 +0200 +++ b/tests/test-convert-cvs Wed Oct 15 23:27:35 2008 +0200 @@ -12,8 +12,12 @@ hg --cwd src-hg cat -r tip "$1" } +# Test legacy configuration with external cvsps echo "[extensions]" >> $HGRCPATH echo "convert = " >> $HGRCPATH +echo "graphlog = " >> $HGRCPATH +echo "[convert]" >> $HGRCPATH +echo "cvsps=cvsps -A -u --cvs-direct -q" >> $HGRCPATH echo % create cvs repository mkdir cvsrepo @@ -96,6 +100,4 @@ hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' hgcat b/c hg -R src-filemap log --template '#rev# #desc# files: #files#\n' - -echo "graphlog = " >> $HGRCPATH hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
--- a/tests/test-convert.out Wed Oct 15 21:50:47 2008 +0200 +++ b/tests/test-convert.out Wed Oct 15 23:27:35 2008 +0200 @@ -91,11 +91,12 @@ sandbox is ignored. Because CVS does not have changesets, it is necessary to collect - individual commits to CVS and merge them into changesets. CVS source - can use the external 'cvsps' program (this is a legacy option and may - be removed in future) or use its internal changeset merging code. - External cvsps is default, and options may be passed to it by setting - --config convert.cvsps='cvsps -A -u --cvs-direct -q' + individual commits to CVS and merge them into changesets. CVS + source uses its internal changeset merging code by default but can + be configured to call the external 'cvsps' program by setting: + --config convert.cvsps=cvsps -A -u --cvs-direct -q + This is a legacy option and may be removed in future. + The options shown are the defaults. Internal cvsps is selected by setting