On 27 September 2010 14:27, Peter Tyser <[email protected]> wrote: > - Remove printing of invalid "Start a comparison between file and > dir/file" message.
This is actually something we do. I don't remember the details, but I think it's a diff-like comparison, where asking for a diff between <file> and <dir> will try to diff against <file> in the dir. e.g., meld foo bar/ == meld foo bar/foo > - Remove printing of long deprecated, unused options (-c, -e, -r, -u). Looks good. If you could remove the above change, I'll push it. > Signed-off-by: Peter Tyser <[email protected]> > --- > meld/meldapp.py | 7 +------ > 1 files changed, 1 insertions(+), 6 deletions(-) > > diff --git a/meld/meldapp.py b/meld/meldapp.py > index 3f942ea..6dcb18d 100644 > --- a/meld/meldapp.py > +++ b/meld/meldapp.py > @@ -591,8 +591,7 @@ class MeldApp(gnomeglade.Component): > usages = [("", _("Start with an empty window")), > ("<%s|%s>" % (_("file"), _("dir")), _("Start a version > control comparison")), > ("<%s> <%s> [<%s>]" % ((_("file"),) * 3), _("Start a 2- or > 3-way file comparison")), > - ("<%s> <%s> [<%s>]" % ((_("dir"),) * 3), _("Start a 2- or > 3-way directory comparison")), > - ("<%s> <%s>" % (_("file"), _("dir")), _("Start a > comparison between file and dir/file"))] > + ("<%s> <%s> [<%s>]" % ((_("dir"),) * 3), _("Start a 2- or > 3-way directory comparison"))] > pad_args_fmt = "%-" + str(max([len(s[0]) for s in usages])) + "s %s" > usage = "\n" + "\n".join([" %prog " + pad_args_fmt % u for u in > usages]) > > @@ -604,10 +603,6 @@ class MeldApp(gnomeglade.Component): > help=_("Set label to use instead of file name")) > parser.add_option("-a", "--auto-compare", action="store_true", > default=False, > help=_("Automatically compare all differing files on startup")) > - parser.add_option("-u", "--unified", action="store_true", > help=_("Ignored for compatibility")) > - parser.add_option("-c", "--context", action="store_true", > help=_("Ignored for compatibility")) > - parser.add_option("-e", "--ed", action="store_true", help=_("Ignored > for compatibility")) > - parser.add_option("-r", "--recursive", action="store_true", > help=_("Ignored for compatibility")) > parser.add_option("", "--diff", action="callback", > callback=self.diff_files_callback, > dest="diff", default=[], > help=_("Creates a diff tab for up to 3 supplied > files or directories.")) > -- > 1.7.1.13.gcfb88 > > _______________________________________________ > meld-list mailing list > [email protected] > http://mail.gnome.org/mailman/listinfo/meld-list > _______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
