Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/version.py @ 442:3e2aee6c5500
rawcommit dirstate tweak
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
rawcommit dirstate tweak
Before this patch, rawcommit can mess up the dirstate unless it is
committing against the current parent.
This patch changes rawcommit, such that when adding a child to some
node other than the current parent, rawcommit does not attempt update
the current dirstate.
This seems easily debatable; it creates an asymmetric behavior for
rawcommit. It means that when doing a rawcommit against the current
parent, there's effectively an implied "hg update" to the newly
created node. When doing a rawcommit against any other node, no such
"hg update" occurs.
The other obvious alternates would be:
1) rawcommit never update the dirstate
2) rawcommit always does an "hg update"...
This patch also includes a test for various uses of rawcommit...
Michael Fetterman
manifest hash: 428517d82a02501f14b0d8fac064411980780e91
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuymPywK+sNU5EO8RAvdvAKCxW1QZtyOviNfuwO592IaKApwvEACfdrYD
83m/o8oJvRKu3yGvNGHtwfk=
=KbmU
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 23 Jun 2005 13:28:47 -0800 |
parents | 688d03d6997a |
children | 9ae0034f2772 50da4bb9cab6 |
line wrap: on
line source
# Copyright (C) 2005 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 unknown_version = 'unknown' remembered_version = False def get_version(): """Return version information if available.""" try: from mercurial.__version__ import version except ImportError: version = unknown_version return version def write_version(version): """Overwrite version file.""" filename = os.path.join(os.path.dirname(__file__), '__version__.py') f = open(filename, 'w') f.write("# This file is auto-generated.\n") f.write("version = %r\n" % version) f.close() 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>/dev/null") # 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)