Patchwork [stable] convert: replace revision references in messages if they are >= short hashes

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 30, 2015, 5:51 p.m.
Message ID <c408bf3b32f8126b7bf1.1422640309@ssl.google-analytics.com>
Download mbox | patch
Permalink /patch/7581/
State Accepted
Commit c408bf3b32f8126b7bf1fa401d5746c51edfa5e6
Headers show

Comments

Mads Kiilerich - Jan. 30, 2015, 5:51 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1422640280 -3600
#      Fri Jan 30 18:51:20 2015 +0100
# Branch stable
# Node ID c408bf3b32f8126b7bf1fa401d5746c51edfa5e6
# Parent  6becb9dbca25057c6186e255a48dd2c2ce5701a5
convert: replace revision references in messages if they are >= short hashes

Convert will try to find references to revisions in commit messages and replace
them with references to the converted revision. It will take any string that
looks like a hash (and thus also decimal numbers) and look it up in the source
repo. If it finds anything, it will use that in the commit message instead.

It would do that for all hex digit sequences of 6 to 40 characters. That was
usually no problem for small repos where it was unlikely that there would be a
matching 6 'digit' hash prefix. It was also no problem on repos with less than
100000 changesets where numbers with 6 or more digits not would match any
revision number. With more than 100000 revisions random numbers in commit
messages would be replaced with a "random" hash. For example, 'handle 100000
requests' would be changed to to 'handle 9117c6 requests'. Convert could thus
not really be used on real repositories with more than 100000 changesets.

The default hash length shown by Mercurial is 12 'digits'. It is unexpected and
unwanted that convert by default tries to replace revision references that use
less than that amount of 'digits'.

To fix this, don't match strings that are less than the default hash size of 12
characters.
Matt Mackall - Feb. 1, 2015, 8:10 p.m.
On Fri, 2015-01-30 at 18:51 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1422640280 -3600
> #      Fri Jan 30 18:51:20 2015 +0100
> # Branch stable
> # Node ID c408bf3b32f8126b7bf1fa401d5746c51edfa5e6
> # Parent  6becb9dbca25057c6186e255a48dd2c2ce5701a5
> convert: replace revision references in messages if they are >= short hashes

Queued for stable, thanks.

Patch

diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -26,7 +26,7 @@  from mercurial import hg, util, context,
 from common import NoRepo, commit, converter_source, converter_sink
 
 import re
-sha1re = re.compile(r'\b[0-9a-f]{6,40}\b')
+sha1re = re.compile(r'\b[0-9a-f]{12,40}\b')
 
 class mercurial_sink(converter_sink):
     def __init__(self, ui, path):