code review 1804041: codereview: Fix for Mercurial >= 1.6

codereview: Fix for Mercurial >= 1.6

[eds, 2010-07-10 00:43:12]

Hello rsc (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[eds, 2010-07-10 00:44:55]

On Fri, Jul 9, 2010 at 7:43 PM,  <chickencha@gmail.com> wrote:
> Reviewers: rsc,
>
> Message:
> Hello rsc (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> codereview: Fix for Mercurial >= 1.6
>
> Please review this at http://codereview.appspot.com/1804041/show
>
> Affected files:
>  M lib/codereview/codereview.py
>
>
> Index: lib/codereview/codereview.py
> ===================================================================
> --- a/lib/codereview/codereview.py
> +++ b/lib/codereview/codereview.py
> @@ -592,7 +592,10 @@
>        # delete it in an attempt to "help"
>        proxy = os.environ.get('http_proxy')
>        source = hg.parseurl(ui.expandpath("default"), None)[0]
> -       other = hg.repository(cmdutil.remoteui(repo, opts), source)
> +       if hgversion < '1.6':
> +               other = hg.repository(cmdutil.remoteui(repo, opts), source)
> +       else:
> +               other = hg.repository(hg.remoteui(repo, opts), source)
>        if proxy is not None:
>                os.environ['http_proxy'] = proxy
>        return other
>
>
>

There may be a better way to fix this, but I at least wanted to draw
attention to it and put forth something that worked for me.

- Evan

[adg, 2010-07-12 01:23:09]

It's frustrating how rapidly the Mercurial internals shift around. Sigh.

http://codereview.appspot.com/1804041/diff/2001/3001
File lib/codereview/codereview.py (right):

http://codereview.appspot.com/1804041/diff/2001/3001#newcode595
lib/codereview/codereview.py:595: if hgversion < '1.6':
I'd prefer to make this exception as simple as possible, with the newer being
the default. ie:

remoteui = hg.remoteui
if hgversion < '1.6':
    remoteui = cmdutil.remoteui
other = hg.repository(remoteui(repo, opts), source)

[adg, 2010-07-12 01:24:44]

On 12 July 2010 11:23,  <adg@golang.org> wrote:
> remoteui = hg.remoteui

Just realised this will raise an exception if it's not there. Put this
line in the else block.

Andrew

[eds, 2010-07-12 02:40:11]

Hello rsc, adg (cc: golang-dev@googlegroups.com),

Please take another look.

[rsc1, 2010-07-12 19:01:14]

LGTM

http://codereview.appspot.com/1804041/diff/10001/11001
File lib/codereview/codereview.py (right):

http://codereview.appspot.com/1804041/diff/10001/11001#newcode595
lib/codereview/codereview.py:595: if hgversion < '1.6':
Instead of assuming that < works on versions
(some old Mercurials have hash tags instead of 
nice numbers) the other places in the code that
need to do this kind of thing use try except:

try:
    remoteui = hg.remoteui  # hg 1.6
except:
    remoteui = cmdutil.remoteui

http://codereview.appspot.com/1804041/diff/10001/11001#newcode2863
lib/codereview/codereview.py:2863: self.base_rev = RunShell(["hg", "parent",
"-q"]).split(':')[1].strip()
Even as far back as 1.3, the command name has been parents.
Please change this too.

s/parent/parents/

[eds, 2010-07-12 23:19:04]

Hello rsc, adg (cc: golang-dev@googlegroups.com),

Please take another look.

[rsc1, 2010-07-12 23:24:59]

LGTM

thanks

[rsc1, 2010-07-12 23:27:46]

On 2010/07/12 23:24:59, rsc1 wrote:
> LGTM
> 
> thanks

it will be a day or so before i submit this.
i like to use changes to the hg plugin for a 
while before submitting them, just to avoid
surprises.

[rsc, 2010-07-15 00:17:06]

*** Submitted as http://code.google.com/p/go/source/detail?r=66842e4d8213 ***

codereview: Fix for Mercurial >= 1.6

R=rsc, adg, rsc1
CC=golang-dev
http://codereview.appspot.com/1804041

Committer: Russ Cox <rsc@golang.org>