Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop underscore prefix from _checkunknown()
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 13 Nov 2014 23:12:15 -0800
changeset 23319 3177d710630d
parent 23318 fc73293f6060
child 23320 296b09dcef63
merge: drop underscore prefix from _checkunknown() The method has been called from commands.py since 3eab42088be4 (update: just merge unknown file collisions, 2012-02-09), so drop the underscore prefix that suggests that it's private.
hgext/largefiles/overrides.py file | annotate | diff | comparison | revisions
mercurial/commands.py file | annotate | diff | comparison | revisions
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/hgext/largefiles/overrides.py	Wed Nov 12 14:47:48 2014 +0000
+++ b/hgext/largefiles/overrides.py	Thu Nov 13 23:12:15 2014 -0800
@@ -372,7 +372,7 @@
         wlock.release()
 
 # Before starting the manifest merge, merge.updates will call
-# _checkunknown to check if there are any files in the merged-in
+# checkunknown to check if there are any files in the merged-in
 # changeset that collide with unknown files in the working copy.
 #
 # The largefiles are seen as unknown, so this prevents us from merging
--- a/mercurial/commands.py	Wed Nov 12 14:47:48 2014 +0000
+++ b/mercurial/commands.py	Thu Nov 13 23:12:15 2014 -0800
@@ -6184,7 +6184,7 @@
             raise util.Abort(_("uncommitted changes"))
         if rev is None:
             rev = repo[repo[None].branch()].rev()
-        mergemod._checkunknown(repo, repo[None], repo[rev])
+        mergemod.checkunknown(repo, repo[None], repo[rev])
 
     repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
 
--- a/mercurial/merge.py	Wed Nov 12 14:47:48 2014 +0000
+++ b/mercurial/merge.py	Thu Nov 13 23:12:15 2014 -0800
@@ -304,7 +304,7 @@
         and repo.dirstate.normalize(f) not in repo.dirstate
         and mctx[f].cmp(wctx[f]))
 
-def _checkunknown(repo, wctx, mctx):
+def checkunknown(repo, wctx, mctx):
     "check for collisions between unknown files and files in mctx"
 
     error = False
Mercurial