Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 15777:12309c09d19a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: simplify duplicatecopies
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jan 2012 20:35:10 -0600
parents 91eb4512edd0
children 713ee57f817b
comparison
equal deleted inserted replaced
15776:55a85a55f020 15777:12309c09d19a
2625 ui.setconfig('ui', 'forcemerge', '') 2625 ui.setconfig('ui', 'forcemerge', '')
2626 # drop the second merge parent 2626 # drop the second merge parent
2627 repo.dirstate.setparents(current.node(), nullid) 2627 repo.dirstate.setparents(current.node(), nullid)
2628 repo.dirstate.write() 2628 repo.dirstate.write()
2629 # fix up dirstate for copies and renames 2629 # fix up dirstate for copies and renames
2630 cmdutil.duplicatecopies(repo, ctx.rev(), current.node(), nullid) 2630 cmdutil.duplicatecopies(repo, ctx.rev(), current.node())
2631 # report any conflicts 2631 # report any conflicts
2632 if stats and stats[3] > 0: 2632 if stats and stats[3] > 0:
2633 # write out state for --continue 2633 # write out state for --continue
2634 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] 2634 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2635 repo.opener.write('graftstate', ''.join(nodelines)) 2635 repo.opener.write('graftstate', ''.join(nodelines))