Apologize for the no subject mail earlier.. this is the same mail with a subject line...
Dan : I think hidden makes sense and is less verbose. Are you -1 if hidden is used? If so, pl. let me know (hey, I cant face the wrath of a committer, you know ;)
[[[
Implement 'svnmerge hidden'.
'svnmerge hidden' will list all the revisions marked as blocked, against
the default or a given head (given by the -S/--head options).
* contrib/client-side/svnmerge.py
(action_hidden): New function to handle the 'svnmerge hidden' command.
(command_table): Added new Option for handling the 'hidden' subcommand.
]]]
PS : this patch assumes that the patch submitted at http://www.orcaware.com/pipermail/svnmerge/2006-April/000534.html has already been applied.
Index: contrib/client-side/svnmerge.py
===================================================================
--- contrib/client-side/svnmerge.py (revision 19340)
+++ contrib/client-side/svnmerge.py (working copy)
@@ -993,6 +993,18 @@
"revisions available to be merged are:",
opts["head-url"])
+def action_hidden(branch_dir, branch_props):
+ "Show all blocked revisions for the given branch_dir."
+
+ revs = get_blocked_revs(branch_dir, opts["head-path"])
+
+ # Limit to revisions specified by -r (if any)
+ if opts["revision"]:
+ revs = revs & RevisionSet(opts["revision"])
+
+ display_revisions(revs, opts["hidden-display"],
+ "revisions blocked from view are:", opts["head-url"])
+
def action_integrated(branch_dir, branch_props):
"""Show change sets already merged. This set of revisions is
calculated from taking svnmerge-integrated property from the
@@ -1634,6 +1646,25 @@
[
"-f", "-r", "-S", # import common opts
]),
+
+ "hidden": (action_hidden,
+ "hidden [OPTION...] [PATH]",
+ """Show the revisions blocked for PATH as a revision list.
+ If --revision is given, the revisions shown will be limited to
+ those also specified in the option.""",
+ [
+ Option("-d", "--diff",
+ dest="hidden-display",
+ value="diffs",
+ default="revisions",
+ help="show corresponding diff instead of revision list"),
+ Option("-l", "--log",
+ dest="hidden-display",
+ value="logs",
+ help="show corresponding log history instead of revision list"),
+ "-r",
+ "-S",
+ ]),
}
Implement 'svnmerge hidden'. 'svnmerge hidden' will list all the revisions marked as blocked, against the default or a given head (given by the -S/--head options).
* contrib/client-side/svnmerge.py (action_hidden): New function to handle the 'svnmerge hidden' command. (command_table): Added new Option for handling the 'hidden' subcommand.
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
