Mercurial > hg
view hgext/commitextras.py @ 34940:c2b30348930f stable
dirstate: clean up when restoring identical backups
When a dirstate backup is restored, it is possible that no actual changes to
the dirstate have been made. In this case, the backup is still a hardlink
to the original dirstate.
Unfortunately, `os.rename` silently fails (nothing happens, and no error
occurs) when `src` and `dst` are hardlinks to the same file. As a result,
the backup is left lying around. Over time, these files accumulate.
When restoring dirstate backups, check if the backup and the dirstate are
the same file, and if so, just delete the backup.
Differential Revision: https://phab.mercurial-scm.org/D1201
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Fri, 20 Oct 2017 05:53:35 -0700 |
parents | 806351695c6a |
children | 901a18b03e00 |
line wrap: on
line source
# commitextras.py # # Copyright 2013 Facebook, Inc. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. '''adds a new flag extras to commit (ADVANCED)''' from __future__ import absolute_import import re from mercurial.i18n import _ from mercurial import ( commands, error, extensions, registrar, ) cmdtable = {} command = registrar.command(cmdtable) testedwith = 'ships-with-hg-core' usedinternally = { 'amend_source', 'branch', 'close', 'histedit_source', 'topic', 'rebase_source', 'intermediate-source', '__touch-noise__', 'source', 'transplant_source', } def extsetup(ui): entry = extensions.wrapcommand(commands.table, 'commit', _commit) options = entry[1] options.append(('', 'extra', [], _('set a changeset\'s extra values'), _("KEY=VALUE"))) def _commit(orig, ui, repo, *pats, **opts): origcommit = repo.commit try: def _wrappedcommit(*innerpats, **inneropts): extras = opts.get('extra') if extras: for raw in extras: if '=' not in raw: msg = _("unable to parse '%s', should follow " "KEY=VALUE format") raise error.Abort(msg % raw) k, v = raw.split('=', 1) if not k: msg = _("unable to parse '%s', keys can't be empty") raise error.Abort(msg % raw) if re.search('[^\w-]', k): msg = _("keys can only contain ascii letters, digits," " '_' and '-'") raise error.Abort(msg) if k in usedinternally: msg = _("key '%s' is used internally, can't be set " "manually") raise error.Abort(msg % k) inneropts['extra'][k] = v return origcommit(*innerpats, **inneropts) # This __dict__ logic is needed because the normal # extension.wrapfunction doesn't seem to work. repo.__dict__['commit'] = _wrappedcommit return orig(ui, repo, *pats, **opts) finally: del repo.__dict__['commit']