Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/largefiles/reposetup.py
changeset 15789 2c10ea43c801
parent 15783 927712d9853b
child 15793 3ef07ecdb0d5 
--- a/hgext/largefiles/reposetup.py	Sun Jan 08 14:50:20 2012 +0100
+++ b/hgext/largefiles/reposetup.py	Sun Jan 08 11:23:21 2012 +0100
@@ -11,7 +11,8 @@
 import types
 import os
 
-from mercurial import context, error, manifest, match as match_, node, util
+from mercurial import context, error, manifest, match as match_, util
+from mercurial import node as node_
 from mercurial.i18n import _
 
 import lfcommands
@@ -407,7 +408,7 @@
                 o = repo.changelog.nodesbetween(o, revs)[0]
                 for n in o:
                     parents = [p for p in repo.changelog.parents(n)
-                               if p != node.nullid]
+                               if p != node_.nullid]
                     ctx = repo[n]
                     files = set(ctx.files())
                     if len(parents) == 2:
mercurial