add support for heuristic url guessing

diff --git a/README b/README
index b934894cb70a21312de2afea2073b9d51e359322..c3ecae5949a77a88f4409ab441389daa1d97fc67 100644 (file)
--- a/README
+++ b/README
@@ -4,3 +4,8 @@ dependencies aside from basic perl.
 
 Just copy mr into your PATH somewhere, if it isn't already, and set up
 ~/.mrconfig
 
 Just copy mr into your PATH somewhere, if it isn't already, and set up
 ~/.mrconfig

+
+----
+
+webcheckout has more dependencies, specifically the LWP::Simple and
+HTML::Parser CPAN modules, and optionally the URI module.

diff --git a/debian/control b/debian/control
index 75fc427d605146c0eed6d669447b2cfe4cccb938..24a2e13364cfca6972c8492af4cbba40d4d76cdd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: mr
 Architecture: all
 Section: utils
 Depends: 
 Architecture: all
 Section: utils
 Depends: 

-Suggests: subversion, git-core, cvs, bzr, mercurial, darcs
+Suggests: subversion, git-core, cvs, bzr, mercurial, darcs, liburi-perl

 Recommends: libwww-perl, libhtml-parser-perl
 Description: a Multiple Repository management tool
  The mr(1) command can checkout, update, or perform other actions on
 Recommends: libwww-perl, libhtml-parser-perl
 Description: a Multiple Repository management tool
  The mr(1) command can checkout, update, or perform other actions on

diff --git a/webcheckout b/webcheckout
index d94ad9736409769d443a00e3d0014030b19ff854..0c93eefcd8d10e41d9ba649438a353debe91f6b8 100755 (executable)
--- a/webcheckout
+++ b/webcheckout
@@ -47,6 +47,14 @@ may still be noisy however.)
 
 =back
 
 
 =back
 

+=head1 PREREQUISITES
+
+To use this program you will need lots of VCS programs installed,
+obviously. It also depends on the perl LWP and HTML::Parser modules.
+
+If the perl URI module is installed, webcheckout can heuristically guess
+what you mean by partial URLs, such as "kitenet.net/~joey"'
+

 =head1 AUTHOR
 
 Copyright 2009 Joey Hess <joey@kitenet.net>
 =head1 AUTHOR
 
 Copyright 2009 Joey Hess <joey@kitenet.net>


@@ -111,6 +119,11 @@ sub getopts {
        $url=shift @ARGV;
        $destdir=shift @ARGV;
 
        $url=shift @ARGV;
        $destdir=shift @ARGV;
 

+       eval q{use URI::Heuristic};
+       if (! $@) {
+               $url=URI::Heuristic::uf_uristr($url);
+       }
+

        if ($noact) {
                $quiet=0;
        }
        if ($noact) {
                $quiet=0;
        }