--- a/hgext/convert/__init__.py Sun May 24 16:27:50 2009 +0200
+++ b/hgext/convert/__init__.py Sun May 24 16:27:56 2009 +0200
@@ -128,7 +128,7 @@
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.
+ This option is deprecated and will be removed in Mercurial 1.4.
The options shown are the defaults.
--- a/hgext/convert/cvs.py Sun May 24 16:27:50 2009 +0200
+++ b/hgext/convert/cvs.py Sun May 24 16:27:56 2009 +0200
@@ -25,6 +25,9 @@
self.cmd = ui.config('convert', 'cvsps', 'builtin')
cvspsexe = self.cmd.split(None, 1)[0]
self.builtin = cvspsexe == 'builtin'
+ if not self.builtin:
+ ui.warn(_('warning: support for external cvsps is deprecated and '
+ 'will be removed in Mercurial 1.4\n'))
if not self.builtin:
checktool(cvspsexe)
--- a/tests/test-convert-cvs.out Sun May 24 16:27:50 2009 +0200
+++ b/tests/test-convert-cvs.out Sun May 24 16:27:56 2009 +0200
@@ -12,6 +12,7 @@
% commit a new revision changing b/c
checking in src/b/c,v
% convert fresh repo
+warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
initializing destination src-hg repository
connecting to cvsrepo
scanning source...
@@ -25,6 +26,7 @@
c
c
% convert fresh repo with --filemap
+warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
initializing destination src-filemap repository
connecting to cvsrepo
scanning source...
@@ -44,6 +46,7 @@
checking in src/a,v
checking in src/b/c,v
% convert again
+warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
sorting...
@@ -55,6 +58,7 @@
c
c
% convert again with --filemap
+warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
sorting...
@@ -73,6 +77,7 @@
T b/c
checking in src/b/c,v
% convert again
+warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
sorting...
@@ -82,6 +87,7 @@
c
d
% convert again with --filemap
+warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4
connecting to cvsrepo
scanning source...
sorting...
--- a/tests/test-convert.out Sun May 24 16:27:50 2009 +0200
+++ b/tests/test-convert.out Sun May 24 16:27:56 2009 +0200
@@ -112,7 +112,7 @@
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.
+ This option is deprecated and will be removed in Mercurial 1.4.
The options shown are the defaults.