##// END OF EJS Templates
Fix file-changed-to-dir and dir-to-file commits (issue660)....
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.

File last commit:

r4785:be78ab21 default
r5487:7a64931e default
Show More
children.py
41 lines | 1.4 KiB | text/x-python | PythonLexer
# Mercurial extension to provide the 'hg children' command
#
# Copyright 2007 by Intevation GmbH <intevation@intevation.de>
# Author(s):
# Thomas Arendsen Hein <thomas@intevation.de>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
from mercurial import cmdutil
from mercurial.i18n import _
def children(ui, repo, file_=None, **opts):
"""show the children of the given or working dir revision
Print the children of the working directory's revisions.
If a revision is given via --rev, the children of that revision
will be printed. If a file argument is given, revision in
which the file was last changed (after the working directory
revision or the argument to --rev if given) is printed.
"""
rev = opts.get('rev')
if file_:
ctx = repo.filectx(file_, changeid=rev)
else:
ctx = repo.changectx(rev)
displayer = cmdutil.show_changeset(ui, repo, opts)
for node in [cp.node() for cp in ctx.children()]:
displayer.show(changenode=node)
cmdtable = {
"children":
(children,
[('r', 'rev', '', _('show children of the specified rev')),
('', 'style', '', _('display using template map file')),
('', 'template', '', _('display with template'))],
_('hg children [-r REV] [FILE]')),
}