# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1281654511 18000
# Node ID 9232488985dc44623d4ce4e5692d0bf36f9786ab
# Parent  41ec530656115c9f01da5e28e06939021752c1c2# Parent  b1ae33b813cb5c0f7a7b95de112b21182f972a4d
merge with i18n

diff -r 41ec53065611 -r 9232488985dc hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Thu Aug 12 16:53:56 2010 +0200
+++ b/hgext/convert/subversion.py	Thu Aug 12 18:08:31 2010 -0500
@@ -1157,4 +1157,5 @@
             os.unlink(messagefile)
 
     def puttags(self, tags):
-        self.ui.warn(_('XXX TAGS NOT IMPLEMENTED YET\n'))
+        self.ui.warn(_('writing Subversion tags is not yet implemented\n'))
+        return None, None
diff -r 41ec53065611 -r 9232488985dc hgext/graphlog.py
--- a/hgext/graphlog.py	Thu Aug 12 16:53:56 2010 +0200
+++ b/hgext/graphlog.py	Thu Aug 12 18:08:31 2010 -0500
@@ -217,8 +217,8 @@
 
 def check_unsupported_flags(opts):
     for op in ["follow", "follow_first", "date", "copies", "keyword", "remove",
-               "only_merges", "user", "only_branch", "prune", "newest_first",
-               "no_merges", "include", "exclude"]:
+               "only_merges", "user", "branch", "only_branch", "prune",
+               "newest_first", "no_merges", "include", "exclude"]:
         if op in opts and opts[op]:
             raise util.Abort(_("--graph option is incompatible with --%s")
                              % op.replace("_", "-"))
diff -r 41ec53065611 -r 9232488985dc mercurial/commands.py
--- a/mercurial/commands.py	Thu Aug 12 16:53:56 2010 +0200
+++ b/mercurial/commands.py	Thu Aug 12 18:08:31 2010 -0500
@@ -4187,7 +4187,7 @@
            _('show only heads which are descendants of REV'), _('REV')),
           ('t', 'topo', False, _('show topological heads only')),
           ('a', 'active', False,
-           _('show active branchheads only [DEPRECATED]')),
+           _('show active branchheads only (DEPRECATED)')),
           ('c', 'closed', False,
            _('show normal and closed branch heads')),
          ] + templateopts,
diff -r 41ec53065611 -r 9232488985dc mercurial/hg.py
--- a/mercurial/hg.py	Thu Aug 12 16:53:56 2010 +0200
+++ b/mercurial/hg.py	Thu Aug 12 18:08:31 2010 -0500
@@ -221,7 +221,7 @@
         src_repo = repository(ui, source)
     else:
         src_repo = source
-        branch = (None, [])
+        branch = (None, branch or [])
         origsource = source = src_repo.url()
     rev, checkout = addbranchrevs(src_repo, src_repo, branch, rev)
 
diff -r 41ec53065611 -r 9232488985dc tests/test-clone
--- a/tests/test-clone	Thu Aug 12 16:53:56 2010 +0200
+++ b/tests/test-clone	Thu Aug 12 18:08:31 2010 -0500
@@ -209,4 +209,14 @@
 python simpleclone.py
 rm -r ua
 
+cat <<EOF > branchclone.py
+from mercurial import ui, hg
+myui = ui.ui()
+repo = hg.repository(myui, 'a')
+hg.clone(myui, repo, dest="ua", branch=["stable",])
+EOF
+
+python branchclone.py
+rm -r ua
+
 exit 0
diff -r 41ec53065611 -r 9232488985dc tests/test-clone.out
--- a/tests/test-clone.out	Thu Aug 12 16:53:56 2010 +0200
+++ b/tests/test-clone.out	Thu Aug 12 18:08:31 2010 -0500
@@ -314,3 +314,10 @@
 e8ece76546a6
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+requesting all changes
+adding changesets
+adding manifests
+adding file changes
+added 14 changesets with 14 changes to 3 files
+updating to branch stable
+3 files updated, 0 files merged, 0 files removed, 0 files unresolved