Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 18852:300844cb1a56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
duplicatecopies: fix arg name and docstring While most callers do indeed use duplicatecopies with a rev and its parent, rebase doesn't.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 28 Mar 2013 00:14:27 -0700
parents 49ef9d0ca815
children 78d760aa3607
comparison
equal deleted inserted replaced
18851:a60963c02f92 18852:300844cb1a56
1588 rejected = wctx.forget(forget, prefix) 1588 rejected = wctx.forget(forget, prefix)
1589 bad.extend(f for f in rejected if f in match.files()) 1589 bad.extend(f for f in rejected if f in match.files())
1590 forgot.extend(forget) 1590 forgot.extend(forget)
1591 return bad, forgot 1591 return bad, forgot
1592 1592
1593 def duplicatecopies(repo, rev, p1): 1593 def duplicatecopies(repo, rev, fromrev):
1594 "Reproduce copies found in the source revision in the dirstate for grafts" 1594 '''reproduce copies from fromrev to rev in the dirstate'''
1595 for dst, src in copies.pathcopies(repo[p1], repo[rev]).iteritems(): 1595 for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems():
1596 repo.dirstate.copy(src, dst) 1596 repo.dirstate.copy(src, dst)
1597 1597
1598 def commit(ui, repo, commitfunc, pats, opts): 1598 def commit(ui, repo, commitfunc, pats, opts):
1599 '''commit the specified files or all outstanding changes''' 1599 '''commit the specified files or all outstanding changes'''
1600 date = opts.get('date') 1600 date = opts.get('date')