[PATCH 1 of 2] duplicatecopies: fix arg name and docstring
Siddharth Agarwal
sid0 at fb.com
Thu Mar 28 20:30:01 CDT 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1364454867 25200
# Thu Mar 28 00:14:27 2013 -0700
# Node ID 04f784d278a2b4ae3f42bb50c512e081a100246e
# Parent d118a416965d954763279e2b462dbfc307298d57
duplicatecopies: fix arg name and docstring
While most callers do indeed use duplicatecopies with a rev and its parent,
rebase doesn't.
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1590,9 +1590,9 @@ def forget(ui, repo, match, prefix, expl
forgot.extend(forget)
return bad, forgot
-def duplicatecopies(repo, rev, p1):
- "Reproduce copies found in the source revision in the dirstate for grafts"
- for dst, src in copies.pathcopies(repo[p1], repo[rev]).iteritems():
+def duplicatecopies(repo, rev, fromrev):
+ '''reproduce copies from fromrev to rev in the dirstate'''
+ for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems():
repo.dirstate.copy(src, dst)
def commit(ui, repo, commitfunc, pats, opts):
More information about the Mercurial-devel
mailing list