# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1404480553 14400
# Node ID 8a4a8fe50c2650e3fff4797d5b4163eebeb1e687
# Parent  404a000bb38b0139ad93feb4327a5f2d1ea8c0f8
evolve: do not use _ as an unused variable

The _ variable is the i18n function from core Mercurial, so locally
assigning to it can lead to name clashes.

diff -r 404a000bb38b -r 8a4a8fe50c26 hgext/evolve.py
--- a/hgext/evolve.py	Thu Jun 26 15:31:49 2014 +0100
+++ b/hgext/evolve.py	Fri Jul 04 09:29:13 2014 -0400
@@ -454,7 +454,7 @@
     """``troubled()``
     Changesets with troubles.
     """
-    _ = revset.getargs(x, 0, 0, 'troubled takes no arguments')
+    revset.getargs(x, 0, 0, 'troubled takes no arguments')
     return repo.revs('%ld and (unstable() + bumped() + divergent())',
                      subset)
 
@@ -2057,9 +2057,9 @@
                 p2 = ctx.p2().node()
                 p1 = newmapping.get(p1, p1)
                 p2 = newmapping.get(p2, p2)
-                new, _ = rewrite(repo, ctx, [], ctx,
-                                 [p1, p2],
-                                 commitopts={'extra': extra})
+                new, unusedvariable = rewrite(repo, ctx, [], ctx,
+                                              [p1, p2],
+                                              commitopts={'extra': extra})
                 # store touched version to help potential children
                 newmapping[ctx.node()] = new
                 if not duplicate:
@@ -2129,9 +2129,9 @@
                 commitopts['message'] =  "\n".join(msgs)
                 commitopts['edit'] = True
 
-            newid, _ = rewrite(repo, root, allctx, head,
-                             [root.p1().node(), root.p2().node()],
-                             commitopts=commitopts)
+            newid, unusedvariable = rewrite(repo, root, allctx, head,
+                                            [root.p1().node(), root.p2().node()],
+                                            commitopts=commitopts)
             phases.retractboundary(repo, targetphase, [newid])
             createmarkers(repo, [(ctx, (repo[newid],))
                                  for ctx in allctx])