Mercurial > hg-stable
changeset 13710:cb8d0bc8c021
changegroupsubset: simplify filenode_collector
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 20 Mar 2011 19:43:28 -0500 |
| parents | 53826e7a1d22 |
| children | ed913fd7837b |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 4 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun Mar 20 19:43:28 2011 -0500 +++ b/mercurial/localrepo.py Sun Mar 20 19:43:28 2011 -0500 @@ -1472,6 +1472,7 @@ # the first manifest that references it belongs to. def collect(mnode): r = mf.rev(mnode) + clnode = mfs[mnode] if mf.deltaparent(r) in mf.parentrevs(r): # If the previous rev is one of the parents, # we only need to see a diff. @@ -1481,26 +1482,16 @@ # And if the file is in the list of files we care # about. if f in changedfiles: - # Get the changenode this manifest belongs to - clnode = mfs[mnode] # Create the set of filenodes for the file if # there isn't one already. - ndset = fnodes.setdefault(f, {}) - # And set the filenode's changelog node to the - # manifest's if it hasn't been set already. - ndset.setdefault(fnode, clnode) + fnodes.setdefault(f, {}).setdefault(fnode, clnode) else: # Otherwise we need a full manifest. m = mf.read(mnode) # For every file in we care about. for f in changedfiles: - fnode = m.get(f, None) - # If it's in the manifest - if fnode is not None: - # See comments above. - clnode = mfs[mnode] - ndset = fnodes.setdefault(f, {}) - ndset.setdefault(fnode, clnode) + if f in m: + fnodes.setdefault(f, {}).setdefault(m[f], clnode) return collect # If we determine that a particular file or manifest node must be a