code review 7312064: codereview: use hgapplydiff instead of hgpatch

codereview: use hgapplydiff instead of hgpatch

Depends on https://codereview.appspot.com/7308067

[rsc, 2013-02-08 03:32:47]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go/

[bradfitz, 2013-02-08 03:46:20]

LGTM

On Thu, Feb 7, 2013 at 7:32 PM, <rsc@golang.org> wrote:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> codereview: use hgapplydiff instead of hgpatch
>
> Depends on
https://codereview.appspot.**com/7308067<https://codereview.appspot.com/7308067>
>
> Please review this at
https://codereview.appspot.**com/7312064/<https://codereview.appspot.com/7312...
>
> Affected files:
>   M lib/codereview/codereview.py
>
>
> Index: lib/codereview/codereview.py
> ==============================**==============================**=======
> --- a/lib/codereview/codereview.py
> +++ b/lib/codereview/codereview.py
> @@ -1569,24 +1569,24 @@
>                         return "local repository is out of date; sync to
> get %s" % (vers)
>                 patch1, err = portPatch(repo, patch, vers, id)
>                 if err != "":
> -                       if not opts["ignore_hgpatch_failure"]**:
> +                       if not opts["ignore_hgapplydiff_**failure"]:
>                                 return "codereview issue %s is out of
> date: %s (%s->%s)" % (clname, err, vers, id)
>                 else:
>                         patch = patch1
> -       argv = ["hgpatch"]
> +       argv = ["hgapplydiff"]
>         if opts["no_incoming"] or mode == "backport":
>                 argv += ["--checksync=false"]
>         try:
>                 cmd = subprocess.Popen(argv, shell=False,
> stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=None,
> close_fds=sys.platform != "win32")
>         except:
> -               return "hgpatch: " + ExceptionDetail() + "\nInstall
> hgpatch with:\n$ go get
code.google.com/p/go.**codereview/cmd/hgpatch\n<http://code.google.com/p/go.codereview/cmd/hgpatch%5Cn>
> "
> +               return "hgapplydiff: " + ExceptionDetail() + "\nInstall
> hgapplydiff with:\n$ go get code.google.com/p/go.**
>
codereview/cmd/hgapplydiff\n<http://code.google.com/p/go.codereview/cmd/hgapplydiff%5Cn>
> "
>
>         out, err = cmd.communicate(patch)
> -       if cmd.returncode != 0 and not opts["ignore_hgpatch_failure"]**:
> -               return "hgpatch failed"
> +       if cmd.returncode != 0 and not opts["ignore_hgapplydiff_**
> failure"]:
> +               return "hgapplydiff failed"
>         cl.local = True
>         cl.files = out.strip().split()
> -       if not cl.files and not opts["ignore_hgpatch_failure"]**:
> +       if not cl.files and not opts["ignore_hgapplydiff_**failure"]:
>                 return "codereview issue %s has no changed files" % clname
>         files = ChangedFiles(ui, repo, [])
>         extra = Sub(cl.files, files)
> @@ -2099,7 +2099,7 @@
>         "^clpatch": (
>                 clpatch,
>                 [
> -                       ('', 'ignore_hgpatch_failure', None, 'create CL
> metadata even if hgpatch fails'),
> +                       ('', 'ignore_hgapplydiff_failure', None, 'create
> CL metadata even if hgapplydiff fails'),
>                         ('', 'no_incoming', None, 'disable check for
> incoming changes'),
>                 ],
>                 "change#"
> @@ -2158,7 +2158,7 @@
>         "^release-apply": (
>                 release_apply,
>                 [
> -                       ('', 'ignore_hgpatch_failure', None, 'create CL
> metadata even if hgpatch fails'),
> +                       ('', 'ignore_hgapplydiff_failure', None, 'create
> CL metadata even if hgapplydiff fails'),
>                         ('', 'no_incoming', None, 'disable check for
> incoming changes'),
>                 ],
>                 "change#"
> @@ -2181,7 +2181,7 @@
>         "^undo": (
>                 undo,
>                 [
> -                       ('', 'ignore_hgpatch_failure', None, 'create CL
> metadata even if hgpatch fails'),
> +                       ('', 'ignore_hgapplydiff_failure', None, 'create
> CL metadata even if hgapplydiff fails'),
>                         ('', 'no_incoming', None, 'disable check for
> incoming changes'),
>                 ],
>                 "change#"
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>
>
>

[rsc, 2013-02-08 04:15:12]

*** Submitted as https://code.google.com/p/go/source/detail?r=1230bc27d4fe ***

codereview: use hgapplydiff instead of hgpatch

Depends on https://codereview.appspot.com/7308067

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/7312064

[minux1, 2013-02-08 06:01:18]

LGTM.