[oe-commits] org.oe.dev merge of '32b7fa94caf6c038558548e252b9c813f4bf0891'

[mickeyl commit]

merge of '32b7fa94caf6c038558548e252b9c813f4bf0891'
     and '51afccca79d0092ea2860950ddbfa96d1c141bb1'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 33d3ce9b0fb41e328300ff99493dbb65bcd3a005
ViewMTN: http://monotone.openembedded.org/revision/info/33d3ce9b0fb41e328300ff99493dbb65bcd3a005
Files:
1
packages/e17/edje-viewer_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
contrib/mtn2git/mtn2git.py
Diffs:

#
# mt diff -r32b7fa94caf6c038558548e252b9c813f4bf0891 -r33d3ce9b0fb41e328300ff99493dbb65bcd3a005
#
# 
# 
# patch "packages/e17/edje-viewer_cvs.bb"
#  from [a789e404a347e1eedc48636e834ce762cb837e4a]
#    to [0b95ce6b64174048bea555e81404fb6c60d7a9db]
# 
# patch "packages/efl1/ecore.inc"
#  from [5ef6dea417efa9f7631ce9cec1d293af7ba5a110]
#    to [934d94fad3c6bfd69212decb7aab06ab9b476048]
# 
# patch "packages/efl1/ecore_cvs.bb"
#  from [34fa2c31d706db70d37636189c65cd730d33abc0]
#    to [e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c]
# 
============================================================
--- packages/e17/edje-viewer_cvs.bb	a789e404a347e1eedc48636e834ce762cb837e4a
+++ packages/e17/edje-viewer_cvs.bb	0b95ce6b64174048bea555e81404fb6c60d7a9db
@@ -1,8 +1,8 @@ PV = "0.0.0+cvs${SRCDATE}"
 DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
 LICENSE = "MIT"
 PV = "0.0.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit e
 
============================================================
--- packages/efl1/ecore.inc	5ef6dea417efa9f7631ce9cec1d293af7ba5a110
+++ packages/efl1/ecore.inc	934d94fad3c6bfd69212decb7aab06ab9b476048
@@ -22,6 +22,8 @@ PACKAGES += "\
     ${PN}-evas \
     ${PN}-fb \
     ${PN}-file \
+    ${PN}-imf \
+    ${PN}-imf-evas \
     ${PN}-ipc \
     ${PN}-job \
     ${PN}-txt \
@@ -36,6 +38,8 @@ FILES_${PN}-file = "${libdir}/libecore_f
 FILES_${PN}-evas = "${libdir}/libecore_evas.so.*"
 FILES_${PN}-fb = "${libdir}/libecore_fb.so.*"
 FILES_${PN}-file = "${libdir}/libecore_file.so.*"
+FILES_${PN}-imf = "${libdir}/libecore_imf.so.*"
+FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas.so.*"
 FILES_${PN}-ipc = "${libdir}/libecore_ipc.so.*"
 FILES_${PN}-job = "${libdir}/libecore_job.so.*"
 FILES_${PN}-txt = "${libdir}/libecore_txt.so.*"
============================================================
--- packages/efl1/ecore_cvs.bb	34fa2c31d706db70d37636189c65cd730d33abc0
+++ packages/efl1/ecore_cvs.bb	e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c
@@ -1,5 +1,5 @@ require ecore.inc
 require ecore.inc
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
 		--enable-ecore-txt \


#
# mt diff -r51afccca79d0092ea2860950ddbfa96d1c141bb1 -r33d3ce9b0fb41e328300ff99493dbb65bcd3a005
#
# 
# 
# patch "contrib/mtn2git/mtn2git.py"
#  from [152252b8f2f7f57c70d678432bd6cb8fa63f8946]
#    to [1358f112d3cb844a52d78b014809a8a5a6609bc4]
# 
============================================================
--- contrib/mtn2git/mtn2git.py	152252b8f2f7f57c70d678432bd6cb8fa63f8946
+++ contrib/mtn2git/mtn2git.py	1358f112d3cb844a52d78b014809a8a5a6609bc4
@@ -244,6 +244,12 @@ def fast_import(ops, revision):
         all_modifications = all_modifications.union(modified)
         all_deleted = all_deleted.union(deleted) 
 
+    if len(revision["parent"]) == 0:
+        (added, modified, deleted) = diff_manifest(build_tree([],""), current_tree)
+        all_added = all_added.union(added)
+        all_modifications = all_modifications.union(modified)
+        all_deleted = all_deleted.union(deleted) 
+
     # TODO:
     # Readd the sanity check to see if we deleted and modified an entry. This
     # could probably happen if we have more than one parent (on a merge)?
@@ -424,10 +430,7 @@ def main(mtn_cli, db, rev):
         for head in heads:
             print >> sys.stderr, old_heads, head
             all_revs += ops.ancestry_difference(head, old_heads)
-            for rev in all_revs:
-                if not rev in branch_heads:
-                    branch_heads[rev] = []
-                branch_heads[rev].append(branch)
+        status.former_heads[branch] = heads
 
     
     sorted_revs = [rev for rev in ops.toposort(all_revs)]
@@ -437,10 +440,6 @@ def main(mtn_cli, db, rev):
         else:
             print >> sys.stderr, "Going to import revision ", rev
             fast_import(ops, parse_revision(ops, rev))
-        branches = branch_heads[rev]
-        for branch in branches:
-            status.former_heads[branch] = [rev]
-        
 
 if __name__ == "__main__":
     import optparse
@@ -465,3 +464,4 @@ if __name__ == "__main__":
         print >> sys.stderr, "Failed to open the status file"
     main(options.mtn, options.database, options.rev)
     status.store(options.status)
+