Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 15890:e234eda20984

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: make addgroup returns a list of node contained in the added source This list will contains any node see in the source, not only the added one. This is intended to allow phase to be move according what was pushed by client not only what was added.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 13 Jan 2012 01:29:03 +0100
parents 816209eaf963
children 249d3420ec9c
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Jan 12 01:25:57 2012 +0100
+++ b/mercurial/localrepo.py	Fri Jan 13 01:29:03 2012 +0100
@@ -2015,8 +2015,8 @@
             source.callback = pr
 
             source.changelogheader()
-            if (cl.addgroup(source, csmap, trp) is None
-                and not emptyok):
+            srccontent = cl.addgroup(source, csmap, trp)
+            if not (srccontent or emptyok):
                 raise util.Abort(_("received changelog group is empty"))
             clend = len(cl)
             changesets = clend - clstart
@@ -2064,7 +2064,7 @@
                 pr()
                 fl = self.file(f)
                 o = len(fl)
-                if fl.addgroup(source, revmap, trp) is None:
+                if not fl.addgroup(source, revmap, trp):
                     raise util.Abort(_("received file revlog group is empty"))
                 revisions += len(fl) - o
                 files += 1