Patchwork largefiles: update comments to refer to the right overridden method

login
register
mail settings
Submitter Martin von Zweigbergk
Date Nov. 14, 2014, 2:08 p.m.
Message ID <9cf94cebd26e059b2c8c.1415974087@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6731/
State Accepted
Commit 9dd0d0d61a24319dd45993970ccd9bd6710abeb9
Headers show

Comments

Martin von Zweigbergk - Nov. 14, 2014, 2:08 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1415973539 28800
#      Fri Nov 14 05:58:59 2014 -0800
# Node ID 9cf94cebd26e059b2c8c5d1469271bb0f1fc845f
# Parent  f8b5c3e77d4b8d92d6085d45d7193433c85cc0ee
largefiles: update comments to refer to the right overridden method

This cleans up leftovers from b228ad1f79d7 (largefiles: override
calculateupdates instead of manifestmerge, 2014-03-02).
Pierre-Yves David - Nov. 14, 2014, 2:16 p.m.
On 11/14/2014 02:08 PM, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz@google.com>
> # Date 1415973539 28800
> #      Fri Nov 14 05:58:59 2014 -0800
> # Node ID 9cf94cebd26e059b2c8c5d1469271bb0f1fc845f
> # Parent  f8b5c3e77d4b8d92d6085d45d7193433c85cc0ee
> largefiles: update comments to refer to the right overridden method

Obviously correct after due verification, pushed to the clowncopter.

Patch

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -380,7 +380,7 @@ 
 #
 # The overridden function filters the unknown files by removing any
 # largefiles. This makes the merge proceed and we can then handle this
-# case further in the overridden manifestmerge function below.
+# case further in the overridden calculateupdates function below.
 def overridecheckunknownfile(origfn, repo, wctx, mctx, f):
     if lfutil.standin(repo.dirstate.normalize(f)) in wctx:
         return False
@@ -389,7 +389,7 @@ 
 # The manifest merge handles conflicts on the manifest level. We want
 # to handle changes in largefile-ness of files at this level too.
 #
-# The strategy is to run the original manifestmerge and then process
+# The strategy is to run the original calculateupdates and then process
 # the action list it outputs. There are two cases we need to deal with:
 #
 # 1. Normal file in p1, largefile in p2. Here the largefile is