make the V1_6_X branch the trunk

1 files changed, 17 insertions, 3 deletions

diff --git a/RepSys/commands/co.py b/RepSys/commands/co.py
index cadcf56..5349049 100644
--- a/RepSys/commands/co.py
+++ b/RepSys/commands/co.py
@@ -8,12 +8,24 @@ import sys
 HELP = """\
 Usage: repsys co [OPTIONS] URL [LOCALPATH]
 
+Checkout the package source from the Mandriva repository.
+
+If the 'mirror' option is enabled, the package is obtained from the mirror
+repository.
+
+You can specify the distro branch to checkout from by using distro/pkgname.
+
 Options:
+    -d      The distribution branch to checkout from
+    -b      The package branch
     -r REV  Revision to checkout
-    -o      Do not use the mirror (use official server)
+    -M      Do not use the mirror (use the main repository)
     -h      Show this message
 
 Examples:
+    repsys co pkgname
+    repsys co -d 2009.0 pkgname
+    repsys co 2009.0/pkgame
     repsys co http://repos/svn/cnc/snapshot/foo
     repsys co http://repos/svn/cnc/snapshot/foo foo-pkg
 """
@@ -21,11 +33,13 @@ Examples:
 def parse_options():
     parser = OptionParser(help=HELP)
     parser.add_option("-r", dest="revision")
-    parser.add_option("-o", dest="use_mirror", default=True,
-            action="store_false")
+    parser.add_option("--distribution", "-d", dest="distro", default=None)
+    parser.add_option("--branch", "-b", dest="branch", default=None)
     opts, args = parser.parse_args()
     if len(args) not in (1, 2):
         raise Error, "invalid arguments"
+    # here we don't use package_url in order to notify the user we are
+    # using the mirror
     opts.pkgdirurl = args[0]
     if len(args) == 2:
         opts.path = args[1]