view tests/revlog-formatv0.py @ 42595:819712deac69

copies: follow copies across merge base without source file (issue6163)

As in the previous patch, consider these two histories:

  @  4 'rename x to y'
  |
  o  3 'add x again'
  |
  o  2 'remove x'
  |
  | o  1 'modify x'
  |/
  o  0 'add x'

  @  4 'rename x to y'
  |
  o  3 'add x again'
  |
  | o  2 'modify x'
  | |
  | o  1 'add x'
  |/
  o  0 'base'

We trace copies from the 'modify x' commit to commit 4 by going via
the merge base (commit 0). When tracing file 'y' (_tracefile()) in the
first case, we immediately find the rename from 'x'. We check to see
if 'x' exists in the merge base, which it does, so we consider it a
valid copy. In the second case, 'x' does not exist in the merge base,
so it's not considered a valid copy. As a workaround, this patch makes
it so we also attempt the check in mergecopies's base commit (commit 1
in the second case). That feels pretty ugly to me, but I don't have
any better ideas.

Note that we actually also check not only that the filename matches,
but also that the file's nodeid matches. I don't know why we do that,
but it was like that already before I rewrote mergecopies(). That
means that the rebase will still fail in cases like this (again, it
already failed before my rewrite):


  @  4 'rename x to y'
  |
  o  3 'add x again with content X2'
  |
  o  2 'remove x'
  |
  | o  1 'modify x to content X2'
  |/
  o  1 'modify x to content X1'
  |
  o  0 'add x with content X0'

Differential Revision: https://phab.mercurial-scm.org/D6604

#!/usr/bin/env python
# Copyright 2010 Intevation GmbH
# Author(s):
# Thomas Arendsen Hein <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

"""Create a Mercurial repository in revlog format 0

changeset:   0:a1ef0b125355
tag:         tip
user:        user
date:        Thu Jan 01 00:00:00 1970 +0000
files:       empty
description:
empty file
"""

from __future__ import absolute_import
import binascii
import os
import sys

files = [
    (b'formatv0/.hg/00changelog.i',
     b'000000000000004400000000000000000000000000000000000000'
     b'000000000000000000000000000000000000000000000000000000'
     b'0000a1ef0b125355d27765928be600cfe85784284ab3'),
    (b'formatv0/.hg/00changelog.d',
     b'756163613935613961356635353036303562366138343738336237'
     b'61623536363738616436356635380a757365720a3020300a656d70'
     b'74790a0a656d7074792066696c65'),
    (b'formatv0/.hg/00manifest.i',
     b'000000000000003000000000000000000000000000000000000000'
     b'000000000000000000000000000000000000000000000000000000'
     b'0000aca95a9a5f550605b6a84783b7ab56678ad65f58'),
    (b'formatv0/.hg/00manifest.d',
     b'75656d707479006238306465356431333837353835343163356630'
     b'35323635616431343461623966613836643164620a'),
    (b'formatv0/.hg/data/empty.i',
     b'000000000000000000000000000000000000000000000000000000'
     b'000000000000000000000000000000000000000000000000000000'
     b'0000b80de5d138758541c5f05265ad144ab9fa86d1db'),
    (b'formatv0/.hg/data/empty.d',
     b''),
]

def makedirs(name):
    """recursive directory creation"""
    parent = os.path.dirname(name)
    if parent:
        makedirs(parent)
    os.mkdir(name)

makedirs(os.path.join(*'formatv0/.hg/data'.split('/')))

for name, data in files:
    f = open(name, 'wb')
    f.write(binascii.unhexlify(data))
    f.close()

sys.exit(0)