Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 5915:d0576d065993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prefer i in d over d.has_key(i)
author Christian Ebert <blacktrash@gmx.net>
date Sun, 20 Jan 2008 14:39:25 +0100
parents 7c2921a60035
children 11af38a592ae
comparison
equal deleted inserted replaced
5914:8e7796a990c5 5915:d0576d065993
996 # reasonable order 996 # reasonable order
997 mf2keys = mf2.keys() 997 mf2keys = mf2.keys()
998 mf2keys.sort() 998 mf2keys.sort()
999 getnode = lambda fn: mf1.get(fn, nullid) 999 getnode = lambda fn: mf1.get(fn, nullid)
1000 for fn in mf2keys: 1000 for fn in mf2keys:
1001 if mf1.has_key(fn): 1001 if fn in mf1:
1002 if (mf1.flags(fn) != mf2.flags(fn) or 1002 if (mf1.flags(fn) != mf2.flags(fn) or
1003 (mf1[fn] != mf2[fn] and 1003 (mf1[fn] != mf2[fn] and
1004 (mf2[fn] != "" or fcmp(fn, getnode)))): 1004 (mf2[fn] != "" or fcmp(fn, getnode)))):
1005 modified.append(fn) 1005 modified.append(fn)
1006 elif list_clean: 1006 elif list_clean:
1777 filerevlog = self.file(fname) 1777 filerevlog = self.file(fname)
1778 if filerevlog.count() == 0: 1778 if filerevlog.count() == 0:
1779 raise util.Abort(_("empty or missing revlog for %s") % fname) 1779 raise util.Abort(_("empty or missing revlog for %s") % fname)
1780 # Toss out the filenodes that the recipient isn't really 1780 # Toss out the filenodes that the recipient isn't really
1781 # missing. 1781 # missing.
1782 if msng_filenode_set.has_key(fname): 1782 if fname in msng_filenode_set:
1783 prune_filenodes(fname, filerevlog) 1783 prune_filenodes(fname, filerevlog)
1784 msng_filenode_lst = msng_filenode_set[fname].keys() 1784 msng_filenode_lst = msng_filenode_set[fname].keys()
1785 else: 1785 else:
1786 msng_filenode_lst = [] 1786 msng_filenode_lst = []
1787 # If any filenodes are left, generate the group for them, 1787 # If any filenodes are left, generate the group for them,
1796 # from filenodes. 1796 # from filenodes.
1797 group = filerevlog.group(msng_filenode_lst, 1797 group = filerevlog.group(msng_filenode_lst,
1798 lookup_filenode_link_func(fname)) 1798 lookup_filenode_link_func(fname))
1799 for chnk in group: 1799 for chnk in group:
1800 yield chnk 1800 yield chnk
1801 if msng_filenode_set.has_key(fname): 1801 if fname in msng_filenode_set:
1802 # Don't need this anymore, toss it to free memory. 1802 # Don't need this anymore, toss it to free memory.
1803 del msng_filenode_set[fname] 1803 del msng_filenode_set[fname]
1804 # Signal that no more groups are left. 1804 # Signal that no more groups are left.
1805 yield changegroup.closechunk() 1805 yield changegroup.closechunk()
1806 1806