[oe-commits] org.oe.dev contrib/mtn2git/mtn2git.py: Add modifications to the right list, check if _file_revision and file_revision of the manifest are equal

[freyther commit]

contrib/mtn2git/mtn2git.py: Add modifications to the right list, check if _file_revision and file_revision of the manifest are equal

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: d0e82d27834ac45f302a2295996d66046bd047b6
ViewMTN: http://monotone.openembedded.org/revision/info/d0e82d27834ac45f302a2295996d66046bd047b6
Files:
1
contrib/mtn2git/mtn2git.py
Diffs:

#
# mt diff -rd6527bc02f6e5590c50e502688c29a7855e5153f -rd0e82d27834ac45f302a2295996d66046bd047b6
#
# 
# 
# patch "contrib/mtn2git/mtn2git.py"
#  from [f819d5be7ee1a3ebec96020f0297404080758e0b]
#    to [61d60d3d255cde2b77a98b6eb83875852ab91c04]
# 
============================================================
--- contrib/mtn2git/mtn2git.py	f819d5be7ee1a3ebec96020f0297404080758e0b
+++ contrib/mtn2git/mtn2git.py	61d60d3d255cde2b77a98b6eb83875852ab91c04
@@ -204,10 +204,10 @@ def fast_import(ops, revision):
     # will simply add it to the modified list and ask to retrieve the status from the manifest
     for (file, attribute, value, rev) in revision["set_attributes"]:
         if attribute == "mtn:execute":
-            revision["modified"].append((file, None, rev))
+            all_modifications.add( (file, None, rev) )
     for (file, attribute, rev) in revision["clear_attributes"]:
         if attribute == "mtn:execute":
-            revision["modified"].append((file, None, rev))
+            all_modifications.add( (file, None, rev) )
 
 
 
@@ -260,6 +260,9 @@ def get_file_and_mode(operations, file_t
     assert file_name in file_tree.files, "get_file_and_mode: Revision '%s', file_name='%s' " % (rev, file_name)
 
     (file_revision, executable) = file_tree.files[file_name]
+    if _file_revision:
+        assert _file_revision == file_revision, "Same filerevision for file_name='%s' in rev='%s' (%s,%s)" % (file_name, rev, file_revision, _file_revision)
+
     if executable:
         mode = 755
     else: