merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
# Copyright (C) 2005, 2006 by Intevation GmbH
# Author(s):
# Thomas Arendsen Hein <thomas@intevation.de>
#
# This program is free software under the GNU GPL (>=v2)
# Read the file COPYING coming with the software for details.
"""
Mercurial version
"""
import os
import os.path
import re
import time
import util
unknown_version = 'unknown'
remembered_version = False
def get_version(doreload=False):
"""Return version information if available."""
try:
import mercurial.__version__
if doreload:
reload(mercurial.__version__)
version = mercurial.__version__.version
except ImportError:
version = unknown_version
return version
def write_version(version):
"""Overwrite version file."""
if version == get_version():
return
directory = os.path.dirname(__file__)
for suffix in ['py', 'pyc', 'pyo']:
try:
os.unlink(os.path.join(directory, '__version__.%s' % suffix))
except OSError:
pass
f = open(os.path.join(directory, '__version__.py'), 'w')
f.write("# This file is auto-generated.\n")
f.write("version = %r\n" % version)
f.close()
# reload the file we've just written
get_version(True)
def remember_version(version=None):
"""Store version information."""
global remembered_version
if not version and os.path.isdir(".hg"):
f = os.popen("hg identify 2> %s" % util.nulldev) # use real hg installation
ident = f.read()[:-1]
if not f.close() and ident:
ids = ident.split(' ', 1)
version = ids.pop(0)
if version[-1] == '+':
version = version[:-1]
modified = True
else:
modified = False
if version.isalnum() and ids:
for tag in ids[0].split('/'):
# is a tag is suitable as a version number?
if re.match(r'^(\d+\.)+[\w.-]+$', tag):
version = tag
break
if modified:
version += time.strftime('+%Y%m%d')
if version:
remembered_version = True
write_version(version)
def forget_version():
"""Remove version information."""
if remembered_version:
write_version(unknown_version)