[PATCH 1 of 5] convert: add support for --includerevs, --excluderevs

[Greg Ward]

On Sat, Nov 26, 2011 at 4:26 PM, Yury Sulsky <yury.sulsky at gmail.com> wrote:
> # HG changeset patch
> # User Yury Sulsky <yury.sulsky at gmail.com>
> # Date 1322282534 18000
> # Branch stable
> # Node ID 84c30a6c1760a6302f99daf45a992bf59be1a29a
> # Parent  8a7f1722b28e50f8e1690870b0caa38e6a6def59
> convert: add support for --includerevs, --excluderevs
>
> diff -r 8a7f1722b28e -r 84c30a6c1760 hgext/convert/__init__.py
> --- a/hgext/convert/__init__.py Sat Oct 15 14:31:29 2011 -0500
> +++ b/hgext/convert/__init__.py Fri Nov 25 23:42:14 2011 -0500
> @@ -306,6 +306,10 @@
>            _('splice synthesized history into place'), _('FILE')),
>           ('', 'branchmap', '',
>            _('change branch names while converting'), _('FILE')),
> +          ('', 'includerevs', '',
> +           _('convert only these revisions'), _('FILE')),
> +          ('', 'excluderevs', '',
> +           _('exclude these revsisions from the conversion'), _('FILE')),

typo: "revisions"

> diff -r 8a7f1722b28e -r 84c30a6c1760 hgext/convert/convcmd.py
> --- a/hgext/convert/convcmd.py  Sat Oct 15 14:31:29 2011 -0500
> +++ b/hgext/convert/convcmd.py  Fri Nov 25 23:42:14 2011 -0500
> @@ -15,7 +15,7 @@
>  from gnuarch import gnuarch_source
>  from bzr import bzr_source
>  from p4 import p4_source
> -import filemap
> +import filtermap

Hey, wait a second! That has nothing to do with
includerevs/excluderevs, does it? You're stuffing two unrelated
features into the same changeset. This should be a separate patch. If
includerevs/excluderevs depends on filtermap, then the filtermap patch
should come first.

> @@ -430,10 +430,15 @@
>     if sortmode == 'sourcesort' and not srcc.hasnativeorder():
>         raise util.Abort(_('--sourcesort is not supported by this data source'))
>
> -    fmap = opts.get('filemap')

And renaming fmap to filtermap is a third change, which implies you
need *three* patches here.

I suggest you break this up into smaller patches and resend.

Also, you'll have an easier time getting things in if you put your
smaller, less controversial patches first. E.g.
includerevs/excluderevs looks like an obviously useful feature that
should not be hard to review and test, so send that first.

Greg