code review 4675045: codereview: fix for Mercurial 1.9

codereview: fix for Mercurial 1.9

Fixes issue 2038.

[adg, 2011-07-05 00:24:51]

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

I'd like you to review this change to
https://go.googlecode.com/hg/

[bpowers, 2011-07-09 05:48:06]

This patch allows me to use mercurial 1.9 with the codereview extension enabled.
 It looks very straightforward, except for the addition on line 971 (but that
might be necessary too, I'm not very familiar with mercurial).

http://codereview.appspot.com/4675045/diff/1/lib/codereview/codereview.py
File lib/codereview/codereview.py (right):

http://codereview.appspot.com/4675045/diff/1/lib/codereview/codereview.py#new...
lib/codereview/codereview.py:972: repo = repo[None]
I'm not too familiar with this, but this looks strange.

[adg, 2011-07-09 23:57:28]

http://codereview.appspot.com/4675045/diff/1/lib/codereview/codereview.py
File lib/codereview/codereview.py (right):

http://codereview.appspot.com/4675045/diff/1/lib/codereview/codereview.py#new...
lib/codereview/codereview.py:972: repo = repo[None]
On 2011/07/09 05:48:06, bpowers wrote:
> I'm not too familiar with this, but this looks strange.

It's a work-around for this change:
  http://selenic.com/hg/rev/785bbc8634f8

Added a comment to that effect.

[rsc, 2011-07-11 06:36:04]

I've tried to make the code look like it is written to the
newest Mercurial I know/care about so that the special
cases are all accommodating older ones.  This code
is uglifying both cases.

if >= 1.9
    import scmutil
else
    scmutil = cmdutil

and then just use scmutil where you need to.

[adg, 2011-07-11 06:39:50]

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

Please take another look.

[rsc, 2011-07-11 23:31:39]

LGTM

http://codereview.appspot.com/4675045/diff/6001/lib/codereview/codereview.py
File lib/codereview/codereview.py (right):

http://codereview.appspot.com/4675045/diff/6001/lib/codereview/codereview.py#...
lib/codereview/codereview.py:970: # work-around for
http://selenic.com/hg/rev/785bbc8634f8
missing a tab here or something

[adg, 2011-07-11 23:36:53]

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

codereview: fix for Mercurial 1.9

Fixes issue 2038.

R=rsc, bobbypowers
CC=golang-dev
http://codereview.appspot.com/4675045

[rsc, 2011-07-11 23:45:19]

Breaks Mercurial 1.8.3.

coma=; hg log lib/codereview/codereview.py
** unknown exception encountered, please report by visiting
**  http://mercurial.selenic.com/wiki/BugTracker
** Python 2.7.1+ (r271:86832, Apr 11 2011, 18:13:53) [GCC 4.5.2]
** Mercurial Distributed SCM (version 1.8.3)
** Extensions loaded: rebase, extdiff, hgk, churn, mq, codereview
Traceback (most recent call last):
  File "/usr/local/bin/hg", line 5, in <module>
    pkg_resources.run_script('mercurial==1.8.3', 'hg')
  File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 467,
in run_script
    self.require(requires)[0].run_script(script_name, ns)
  File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 1200,
in run_script
    execfile(script_filename, namespace, namespace)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/EGG-INFO/scripts/hg",
line 38, in <module>
    mercurial.dispatch.run()
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 36, in dispatch
    return _runcatch(u, args)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 58, in _runcatch
    return _dispatch(ui, args)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 601, in _dispatch
    cmdpats, cmdoptions)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 406, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 655, in _runcommand
    return checkargs()
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 609, in checkargs
    return cmdfunc()
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/dispatch.py",
line 598, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/util.py",
line 433, in check
    return func(*args, **kwargs)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/extensions.py",
line 133, in wrap
    util.checksignature(origfn), *args, **kwargs)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/util.py",
line 433, in check
    return func(*args, **kwargs)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/hgext/mq.py",
line 3049, in mqcommand
    return orig(ui, repo, *args, **kwargs)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/util.py",
line 433, in check
    return func(*args, **kwargs)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/commands.py",
line 2607, in log
    matchfn = cmdutil.match(repo, pats, opts)
  File "/home/rsc/g/go/lib/codereview/codereview.py", line 974, in
ReplacementForCmdutilMatch
    return original_match(repo, pats=pats, opts=opts, globbed=globbed,
default=default)
  File
"/usr/local/lib/python2.7/dist-packages/mercurial-1.8.3-py2.7-linux-x86_64.egg/mercurial/cmdutil.py",
line 268, in match
    m = matchmod.match(repo.root, repo.getcwd(), pats,
AttributeError: 'workingctx' object has no attribute 'root'