Merge with main.

contrib/casesmash.py

@@ -1,4 +1,4 b''
-import sys, os, __builtin__
+import os, __builtin__
 from mercurial import util
 
 def lowerwrap(scope, funcname):

contrib/perf.py

@@ -1,7 +1,7 b''
 # perf.py - performance test routines
 '''helper extension to measure performance'''
 
-from mercurial import cmdutil, scmutil, util, match, commands, obsolete
+from mercurial import cmdutil, scmutil, util, commands, obsolete
 from mercurial import repoview, branchmap, merge, copies
 import time, os, sys
 

contrib/synthrepo.py

@@ -36,7 +36,7 b' A few obvious properties that are not cu'
 '''
 
 import bisect, collections, json, os, random, time, sys
-from mercurial import cmdutil, context, patch, scmutil, url, util, hg
+from mercurial import cmdutil, context, patch, scmutil, util, hg
 from mercurial.i18n import _
 from mercurial.node import nullrev, nullid
 

doc/gendoc.py

@@ -4,7 +4,6 b' sys.path.insert(0, "..")'
 # fall back to pure modules if required C extensions are not available
 sys.path.append(os.path.join('..', 'mercurial', 'pure'))
 from mercurial import demandimport; demandimport.enable()
-from mercurial import encoding
 from mercurial import minirst
 from mercurial.commands import table, globalopts
 from mercurial.i18n import gettext, _

doc/hgrc.5.txt

@@ -16,8 +16,8 b' configuration files for Mercurial'
    :class: htmlonly
 
 
-Synopsis
-========
+Description
+===========
 
 .. include:: ../mercurial/help/config.txt
 

mercurial/changegroup.py

@@ -364,10 +364,11 b' class bundle10(object):'
 
             if fastpathlinkrev:
                 ln, llr = filerevlog.node, filerevlog.linkrev
+                needed = set(cl.rev(x) for x in clnodes)
                 def genfilenodes():
                     for r in filerevlog:
                         linkrev = llr(r)
-                        if linkrev not in commonrevs:
+                        if linkrev in needed:
                             yield filerevlog.node(r), cl.node(linkrev)
                 fnodes[fname] = dict(genfilenodes())
 

mercurial/pathencode.c

@@ -585,7 +585,8 b' static PyObject *hashmangle(const char *'
 			   in a space or dot, which are unportable. */
 			if (d == '.' || d == ' ')
 				dest[destlen - 1] = '_';
-			if (destlen > maxshortdirslen)
+			/* The + 3 is to account for "dh/" in the beginning */
+			if (destlen > maxshortdirslen + 3)
 				break;
 			charcopy(dest, &destlen, destsize, src[i]);
 			p = -1;

tests/run-tests.py

@@ -56,7 +56,6 b' import random'
 import re
 import threading
 import killdaemons as killmod
-import cPickle as pickle
 import Queue as queue
 
 processlock = threading.Lock()

tests/test-pathencode.py

@@ -5,7 +5,6 b''
 # that have proven likely to expose bugs and divergent behaviour in
 # different encoding implementations.
 
-from mercurial import parsers
 from mercurial import store
 import binascii, itertools, math, os, random, sys, time
 import collections
@@ -125,7 +124,8 b' def makepart(rng, k):'
     p = pickfrom(rng, firsttable)(rng)
     l = len(p)
     ps = [p]
-    while l <= k:
+    maxl = rng.randint(1, k)
+    while l < maxl:
         p = pickfrom(rng, resttable)(rng)
         l += len(p)
         ps.append(p)

tests/test-rebase-cache.t

@@ -396,27 +396,6 b' Make sure rebase does not break for phas'
   > [ui]
   > logtemplate={rev} {desc} {phase}\n
   > EOF
-  $ cat $HGRCPATH
-  [ui]
-  slash = True
-  interactive = False
-  [defaults]
-  backout = -d "0 0"
-  commit = -d "0 0"
-  tag = -d "0 0"
-  [extensions]
-  graphlog=
-  rebase=
-  mq=
-  
-  [phases]
-  publish=False
-  
-  [alias]
-  tglog  = log -G --template "{rev}: '{desc}' {branches}\n"
-  theads = heads --template "{rev}: '{desc}' {branches}\n"
-  [ui]
-  logtemplate={rev} {desc} {phase}\n
 
 
   $ hg init c4

tests/test-ui-color.py

@@ -1,4 +1,4 b''
-import os, sys
+import os
 from hgext import color
 from mercurial import dispatch, ui