# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1278245680 -7200
# Node ID 96040c70c9e1fad7daa011f415d04da7d1fec273
# Parent  48e549d7c6ae471e53806c75f3ed16f4f706234a# Parent  2eaaad99f2f0d041d61a4b10f0b56101e4efd2a9
Merge with stable

diff -r 2eaaad99f2f0 -r 96040c70c9e1 contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Sun Jul 04 14:14:29 2010 +0200
+++ b/contrib/mergetools.hgrc	Sun Jul 04 14:14:40 2010 +0200
@@ -13,6 +13,9 @@
 gvimdiff.regname=path
 gvimdiff.priority=-9
 
+vimdiff.args=$local $other $base
+vimdiff.priority=-10
+
 merge.checkconflicts=True
 merge.priority=-100
 
diff -r 2eaaad99f2f0 -r 96040c70c9e1 hgext/churn.py
--- a/hgext/churn.py	Sun Jul 04 14:14:29 2010 +0200
+++ b/hgext/churn.py	Sun Jul 04 14:14:40 2010 +0200
@@ -149,7 +149,8 @@
 
     if opts.get('diffstat'):
         width -= 15
-        def format(name, (added, removed)):
+        def format(name, diffstat):
+            added, removed = diffstat
             return "%s %15s %s%s\n" % (pad(name, maxname),
                                        '+%d/-%d' % (added, removed),
                                        ui.label('+' * charnum(added),
diff -r 2eaaad99f2f0 -r 96040c70c9e1 hgext/convert/transport.py
--- a/hgext/convert/transport.py	Sun Jul 04 14:14:29 2010 +0200
+++ b/hgext/convert/transport.py	Sun Jul 04 14:14:40 2010 +0200
@@ -98,9 +98,8 @@
             svn.ra.reparent(self.ra, self.svn_url.encode('utf8'))
 
     class Reporter(object):
-        def __init__(self, (reporter, report_baton)):
-            self._reporter = reporter
-            self._baton = report_baton
+        def __init__(self, reporter_data):
+            self._reporter, self._baton = reporter_data
 
         def set_path(self, path, revnum, start_empty, lock_token, pool=None):
             svn.ra.reporter2_invoke_set_path(self._reporter, self._baton,
diff -r 2eaaad99f2f0 -r 96040c70c9e1 hgext/record.py
--- a/hgext/record.py	Sun Jul 04 14:14:29 2010 +0200
+++ b/hgext/record.py	Sun Jul 04 14:14:40 2010 +0200
@@ -10,7 +10,7 @@
 from mercurial.i18n import gettext, _
 from mercurial import cmdutil, commands, extensions, hg, mdiff, patch
 from mercurial import util
-import copy, cStringIO, errno, operator, os, re, tempfile
+import copy, cStringIO, errno, os, re, tempfile
 
 lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)')
 
@@ -186,7 +186,8 @@
             self.hunk = []
             self.stream = []
 
-        def addrange(self, (fromstart, fromend, tostart, toend, proc)):
+        def addrange(self, limits):
+            fromstart, fromend, tostart, toend, proc = limits
             self.fromline = int(fromstart)
             self.toline = int(tostart)
             self.proc = proc
@@ -354,8 +355,8 @@
                 applied[chunk.filename()].append(chunk)
             else:
                 fixoffset += chunk.removed - chunk.added
-    return reduce(operator.add, [h for h in applied.itervalues()
-                                 if h[0].special() or len(h) > 1], [])
+    return sum([h for h in applied.itervalues()
+               if h[0].special() or len(h) > 1], [])
 
 def record(ui, repo, *pats, **opts):
     '''interactively select changes to commit
diff -r 2eaaad99f2f0 -r 96040c70c9e1 mercurial/dispatch.py
--- a/mercurial/dispatch.py	Sun Jul 04 14:14:29 2010 +0200
+++ b/mercurial/dispatch.py	Sun Jul 04 14:14:40 2010 +0200
@@ -6,7 +6,7 @@
 # GNU General Public License version 2 or any later version.
 
 from i18n import _
-import os, sys, atexit, signal, pdb, socket, errno, shlex, time
+import os, sys, atexit, signal, pdb, socket, errno, shlex, time, traceback
 import util, commands, hg, fancyopts, extensions, hook, error
 import cmdutil, encoding
 import ui as uimod
@@ -49,6 +49,8 @@
         try:
             # enter the debugger before command execution
             if '--debugger' in args:
+                ui.warn(_("entering debugger - "
+                        "type c to continue starting hg or h for help\n"))
                 pdb.set_trace()
             try:
                 return _dispatch(ui, args)
@@ -57,6 +59,7 @@
         except:
             # enter the debugger when we hit an exception
             if '--debugger' in args:
+                traceback.print_exc()
                 pdb.post_mortem(sys.exc_info()[2])
             ui.traceback()
             raise
diff -r 2eaaad99f2f0 -r 96040c70c9e1 mercurial/revlog.py
--- a/mercurial/revlog.py	Sun Jul 04 14:14:29 2010 +0200
+++ b/mercurial/revlog.py	Sun Jul 04 14:14:40 2010 +0200
@@ -131,7 +131,7 @@
         self.dataf = dataf
         self.s = struct.calcsize(indexformatng)
         self.datasize = size
-        self.l = size / self.s
+        self.l = size // self.s
         self.index = [None] * self.l
         self.map = {nullid: nullrev}
         self.allmap = 0
@@ -176,8 +176,8 @@
                 # limit blocksize so that we don't get too much data.
                 blocksize = max(self.datasize - blockstart, 0)
             data = self.dataf.read(blocksize)
-        lend = len(data) / self.s
-        i = blockstart / self.s
+        lend = len(data) // self.s
+        i = blockstart // self.s
         off = 0
         # lazyindex supports __delitem__
         if lend > len(self.index) - i: