Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/version.py @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 02 May 2006 18:44:02 +0200 |
parents | 7eb694a1c1af |
children | 345bac2bc4ec |
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 import util 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.""" 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() 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)