Merge lp:~spud/spud/xmldiff into lp:spud

[Fraser Waters]

Adds xmldiff tool and diff view to Diamond.

[lp:~spud/spud/xmldiff]

454. By Patrick Farrell on 2011-08-23

Set some executable flags (how did these get lost?)

[Patrick Farrell (pefarrell)]

[pef@caoimhe:/tmp/xmldiff/diamond]$ python bin/diamond
Traceback (most recent call last):
  File "bin/diamond", line 228, in <module>
    main()
  File "bin/diamond", line 92, in main
    import diamond.interface as interface
  File "/tmp/xmldiff/diamond/bin/../diamond/interface.py", line 50, in <module>
    import diffview
ImportError: No module named diffview

Did you forget to bzr add?

[lp:~spud/spud/xmldiff]

455. By Fraser Waters on 2011-08-23

Added xmldiff/

456. By Fraser Waters on 2011-08-23

Added diffview.py

457. By Fraser Waters on 2011-08-23

Fixing pathing bugs, still more to go.

458. By Fraser Waters on 2011-08-23

Fixed more pathing bugs.

459. By Fraser Waters on 2011-08-23

Pathing bugs squashed.

460. By Fraser Waters on 2011-08-23

Renamed xmldiff to dxdiff (Diamond Xml diff). Added dxdiff to packages.

461. By Fraser Waters on 2011-08-23

Can no longer diff against save if no save.

462. By Fraser Waters on 2011-08-23

Added diamond -d [FILE] option.

463. By Fraser Waters on 2011-08-24

Don't delete text() nodes

464. By Fraser Waters on 2011-08-24

remove xpath names, fix __floodfill

465. By Fraser Waters on 2011-08-24

Properly fixed __floodfill

466. By Fraser Waters on 2011-08-24

Fixed indexing bugs

467. By Fraser Waters on 2011-08-24

Diff timed, fixed typo in _match

468. By Fraser Waters on 2011-08-24

dxdiff bug fixed

469. By Fraser Waters on 2011-08-24

Fixed indent typo, removed debuging code

470. By Fraser Waters on 2011-08-24

Removed more debug code

471. By Fraser Waters on 2011-08-24

Changed getopt to gnu_getopt

=== modified file 'Makefile.in'
--- Makefile.in	2011-08-04 21:30:53 +0000
+++ Makefile.in	2011-08-24 16:38:18 +0000
@@ -101,11 +101,21 @@
 	cd python; for python in $(shell pyversions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..
 endif
 
+install-dxdiff:
+ifeq ($(origin DESTDIR),undefined)
+	cd dxdiff; python setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
+else
+	cd dxdiff; for python in $(shell pyversions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..
+endif
+
 clean:
 	@cd doc; $(MAKE) clean
 	rm -f *.o libspud.a libspud.so *.o *.la *.mod *.lo
 	rm -rf .libs
 	@cd src/tests; $(MAKE) clean
+	@cd python; rm -rf build; cd ..
+	@cd dxdiff; rm -rf build; cd ..
+
 
 distclean: clean
 	@cd src/tests; $(MAKE) distclean

=== modified file 'config.guess' (properties changed: +x to -x)
=== modified file 'config.sub' (properties changed: +x to -x)
=== modified file 'debian/control'
--- debian/control	2011-08-15 20:50:30 +0000
+++ debian/control	2011-08-24 16:38:18 +0000
@@ -9,7 +9,7 @@
 
 Package: diamond
 Architecture: all
-Depends: python-gtk2, python-lxml, libxml2-utils, python, spudtools, python-gtksourceview2
+Depends: python-gtk2, python-lxml, libxml2-utils, python, spudtools, python-gtksourceview2, python-dxdiff
 Recommends: python-psyco
 Suggests: 
 Conflicts: python-diamond
@@ -62,3 +62,12 @@
  file is generated using a spud-compatible RELAX NG schema and a
  schema-aware editor such as Diamond. This package contains the Python
  bindings for libspud.
+
+Package: python-dxdiff
+Section: python
+Architecture: any
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}
+Description: An XML aware diff tool.
+ DXdiff (Diamond Xml diff) is an XML aware diff tool for finding edit scripts
+ between two XML files.

=== modified file 'debian/rules'
--- debian/rules	2011-08-16 22:52:44 +0000
+++ debian/rules	2011-08-24 16:38:18 +0000
@@ -83,6 +83,9 @@
 install-pyspud:
 	$(MAKE) install-pyspud DESTDIR=$(CURDIR)/debian/python-spud
 
+install-dxdiff:
+	$(MAKE) install-dxdiff DESTDIR=$(CURDIR)/debian/python-dxdiff
+
 binary-arch: build-libspud install-libspud install-spudtools install-pyspud
 	dh_testdir
 	dh_testroot
@@ -114,7 +117,7 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-indep: build-diamond install-diamond build-libspud install-libspud install-spudtools
+binary-indep: build-diamond install-diamond build-libspud install-libspud install-spudtools install-dxdiff
 	dh_testdir -i
 	dh_testroot -i
 	DH_PYCENTRAL=include-links dh_pycentral -i

=== modified file 'diamond/bin/diamond'
--- diamond/bin/diamond	2011-07-05 11:42:44 +0000
+++ diamond/bin/diamond	2011-08-24 16:38:18 +0000
@@ -29,6 +29,8 @@
 # do this right at the start, so we can find the diamond modules
 diamond_path = os.path.join( os.path.realpath(os.path.dirname(__file__)), os.pardir )
 sys.path.insert(0, diamond_path)
+dxdiff_path = os.path.join( os.path.realpath(os.path.dirname(__file__)), os.pardir, os.pardir, "dxdiff" )
+sys.path.insert(0, dxdiff_path)
 
 import diamond.debug as debug
 
@@ -48,6 +50,7 @@
                "-f               Forks at startup\n" + \
                "-s [SCHEMAFILE]  Use the supplied schema file *\n" + \
                "-t [TRONFILE]    Use the supplied schematron file for extended validation\n" + \
+               "-d [FILE]        Diff against the supplied file. (FILE must be specified)\n" + \
                "-v               Verbosity switch - if supplied Diamond prints additional\n" + \
                "                 debugging information to standard output and standard error\n" + \
                "\n" + \
@@ -59,7 +62,7 @@
 def main():
 
   try:
-    opts, args = getopt.getopt(sys.argv[1:], "hvfs:t:")
+    opts, args = getopt.gnu_getopt(sys.argv[1:], "hvfs:t:d:")
   except:
     Help()
     sys.exit(1)
@@ -99,8 +102,13 @@
   except IndexError:
     input_filename = None
 
+  if sys.platform == "win32" or sys.platform == "win64":
+    possible_logofiles = [os.path.join(diamond_path, "gui", "diamond.png")]
+  else:
+    possible_logofiles = [os.path.join(diamond_path, "gui", "diamond.svg"), "/usr/share/diamond/gui/diamond.svg"]
+	
   logofile = None
-  for possible_logofile in [os.path.join(diamond_path, "gui", "diamond.svg"), "/usr/share/diamond/gui/diamond.svg"]:
+  for possible_logofile in possible_logofiles:
     try:
       os.stat(possible_logofile)
       logofile = possible_logofile
@@ -209,7 +217,20 @@
 
   i.main_window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
   i.open_file(schemafile = input_schemafile, filename = input_filename)
-  i.main_window.window.set_cursor(None)  
+  i.main_window.window.set_cursor(None)
+
+  # see if the user wants to diff against a file
+  input_difffile = None
+  for opt in opts:
+    if opt[0] == "-d":
+      input_difffile = opt[1]
+
+  if input_difffile:
+    if input_filename:
+      i.on_diff(None, input_difffile)
+    else:
+      debug.dprint("Cannot diff if against nothing.", 0)
+
 
   gtk.main()
 

=== added file 'diamond/diamond/diffview.py'
--- diamond/diamond/diffview.py	1970-01-01 00:00:00 +0000
+++ diamond/diamond/diffview.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,558 @@
+#!/usr/bin/env python
+
+#    This file is part of Diamond.
+#
+#    Diamond is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diamond is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import os.path
+import sys
+import cStringIO as StringIO
+
+import gobject
+import gtk
+
+from lxml import etree
+
+import attributewidget
+import databuttonswidget
+import datawidget
+import mixedtree
+
+#diff_path = os.path.join( os.path.realpath(os.path.dirname(__file__)), os.pardir, os.pardir, "xmldiff")
+#sys.path.insert(0, diff_path)
+
+import dxdiff.diff as xmldiff
+
+class DiffView(gtk.Window):
+
+  def __init__(self, path, tree):
+    gtk.Window.__init__(self)
+    self.__add_controls()
+
+    if path and os.path.isfile(path):
+      filename = path
+    else:
+      dialog = gtk.FileChooserDialog(title = "Diff against", 
+                                   action = gtk.FILE_CHOOSER_ACTION_OPEN, 
+                                   buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK))
+      if path:
+        dialog.set_current_folder(path)
+
+      response = dialog.run()
+      if response != gtk.RESPONSE_OK:
+        dialog.destroy()
+        self.destroy()
+        return
+
+      filename = dialog.get_filename()
+      dialog.destroy()
+
+    tree1 = etree.parse(filename)
+    tree2 = etree.ElementTree(tree.write_core(None))
+
+    editscript = xmldiff.diff(tree1, tree2)
+    self.__update(tree1, editscript)
+
+    self.show_all()
+
+  def __add_controls(self):
+    self.set_default_size(800, 600)
+    self.set_title("Diff View")
+
+    mainvbox = gtk.VBox()
+
+    menubar = gtk.MenuBar()
+    edititem = gtk.MenuItem("_Edit")
+    menubar.append(edititem)
+
+    agr = gtk.AccelGroup()
+    self.add_accel_group(agr)
+
+    self.popup = editmenu = gtk.Menu()
+    edititem.set_submenu(editmenu)
+    copyitem = gtk.MenuItem("Copy")
+    copyitem.connect("activate", self.on_copy)
+    key, mod = gtk.accelerator_parse("<Control>C")
+    copyitem.add_accelerator("activate", agr, key, mod, gtk.ACCEL_VISIBLE)
+    editmenu.append(copyitem)
+
+    mainvbox.pack_start(menubar, expand = False)
+
+    hpane = gtk.HPaned()
+
+    self.treeview = gtk.TreeView()
+
+    self.treeview.get_selection().set_mode(gtk.SELECTION_SINGLE)
+    self.treeview.get_selection().connect("changed", self.on_select_row)
+
+    # Node column
+    celltext = gtk.CellRendererText()
+    column = gtk.TreeViewColumn("Node", celltext)
+    column.set_cell_data_func(celltext, self.set_celltext)
+
+    self.treeview.append_column(column)
+
+    # 0: The node tag
+    # 1: The attributes dict
+    # 2: The value of the node if any
+    # 3: The old value of the node
+    # 4: "insert", "delete", "update",  ""
+    self.treestore = gtk.TreeStore(gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)
+    self.treeview.set_model(self.treestore)
+    self.treeview.set_enable_search(False)
+    self.treeview.connect("button_press_event", self.on_treeview_button_press)
+    self.treeview.connect("popup_menu", self.on_treeview_popup)
+    hpane.pack1(self.treeview)
+
+    vpane = gtk.VPaned()
+    frame = gtk.Frame()
+    label = gtk.Label()
+    label.set_markup("<b>Attributes</b>")
+    frame.set_label_widget(label)
+    frame.set_shadow_type(gtk.SHADOW_NONE)
+
+    self.attribview = gtk.TreeView()
+
+    celltext = gtk.CellRendererText()
+    keycolumn = gtk.TreeViewColumn("Key", celltext)
+    keycolumn.set_cell_data_func(celltext, self.set_cellkey)
+
+    self.attribview.append_column(keycolumn)
+
+    celltext = gtk.CellRendererText()
+    valuecolumn = gtk.TreeViewColumn("Value", celltext)
+    valuecolumn.set_cell_data_func(celltext, self.set_cellvalue)
+
+    self.attribview.append_column(valuecolumn)
+
+    frame.add(self.attribview)
+    vpane.pack1(frame)
+
+    frame = gtk.Frame()
+    label = gtk.Label()
+    label.set_markup("<b>Data</b>")
+    frame.set_label_widget(label)
+    frame.set_shadow_type(gtk.SHADOW_NONE)
+
+    self.dataview = gtk.TextView()
+    self.dataview.set_cursor_visible(False)
+    self.dataview.set_editable(False)
+    self.__create_tags(self.dataview.get_buffer())
+
+    frame.add(self.dataview)
+    vpane.pack2(frame)
+
+    hpane.pack2(vpane)
+    mainvbox.pack_start(hpane)
+    self.add(mainvbox)
+
+  def on_treeview_button_press(self, treeview, event):
+    pathinfo = treeview.get_path_at_pos(int(event.x), int(event.y))
+    if event.button == 3:
+      if pathinfo is not None:
+        treeview.get_selection().select_path(pathinfo[0])
+        self.show_popup(None, event.button, event.time)
+        return True
+
+  def popup_location(self, widget, user_data):
+    column = self.treeview.get_column(0)
+    path = self.treeview.get_selection().get_selected()[1]
+    area = self.treeview.get_cell_area(path, column)
+    tx, ty = area.x, area.y
+    x, y = self.treeview.tree_to_widget_coords(tx, ty)
+    return (x, y, True)
+
+  def on_treeview_popup(self, treeview):
+    self.show_popup(None, self.popup_location, gtk.get_current_event_time())
+    return
+
+  def show_popup(self, func, button, time):
+    self.popup.popup( None, None, func, button, time)
+    return
+
+  def __update(self, tree, editscript):
+    self.__set_treestore(tree.getroot())
+    self.__parse_editscript(editscript)
+    self.__floodfill(self.treestore.get_iter_root())
+
+  def __set_treestore(self, tree, iter = None):
+
+    attrib = {}
+    for key, value in tree.attrib.iteritems():
+      #             (new,   old,   edit)
+      attrib[key] = (value, value, None)
+
+    child_iter = self.treestore.append(iter, [tree.tag, attrib, tree.text, tree.text, None]) 
+    for child in tree:
+      self.__set_treestore(child, child_iter)
+
+  def __parse_editscript(self, editscript):
+    for edit in editscript:
+      iter, key = self.__get_iter(edit["location"])
+      if key:
+        attribs = self.treestore.get_value(iter, 1)
+        old = attribs[key][1]
+        if edit["type"] == "delete":
+          attribs[key] = (None, old, "delete")
+        elif edit["type"] == "update":
+          attribs[key] = (edit["value"], old, "update")
+        elif edit["type"] == "move":
+          attribs[key] = (None, old, "delete")
+          self.__insert(self.__get_iter(edit["value"])[0], key + " " + old, 0)
+
+      else:
+
+        if edit["type"] == "insert":
+          self.__insert(iter, edit["value"], int(edit["index"]))
+        elif edit["type"] == "delete":
+          self.treestore.set(iter, 2, None)
+          self.treestore.set(iter, 4, "delete")
+        elif edit["type"] == "update":
+          self.treestore.set(iter, 2, edit["value"])
+        elif edit["type"] == "move":
+          self.__move(iter, edit["value"], int(edit["index"]))
+
+  def __floodfill(self, iter, parentedit = None):
+    """
+    Floodfill the tree with the correct edit types.
+    If something has changed below you, "subupdate"
+    If your value or attrs has changed "update"
+    If insert, all below insert
+    If delete, all below delete
+    """
+    attribs, new, old, edit = self.treestore.get(iter, 1, 2, 3, 4)
+
+    if parentedit == "insert":
+      edit = "insert"
+    elif parentedit == "delete":
+      edit = "delete"
+
+    if edit == "insert" or edit == "delete":
+      for key, (valuenew, valueold, valueedit) in attribs.iteritems():
+        attribs[key] = (valuenew, valueold, edit)
+
+      child = self.treestore.iter_children(iter)
+      while child is not None:
+        self.__floodfill(child, edit)
+        child = self.treestore.iter_next(child)
+
+      self.treestore.set(iter, 4, edit)
+    else:
+      update = False
+      for key in attribs:
+        # edit value
+        if attribs[key][2] is not None:
+          update = True
+          break
+      if new != old:
+        update = True
+
+      if update:
+        self.treestore.set(iter, 4, "update")
+      else:
+        child = self.treestore.iter_children(iter)
+        while child is not None:
+          change = self.__floodfill(child, edit)
+          if change is not None:
+            self.treestore.set(iter, 4, "subupdate")
+          child = self.treestore.iter_next(child)
+
+    return self.treestore.get_value(iter, 4)
+
+  def __insert(self, iter, value, index):
+    if " " in value:
+      key, value = value.split(" ")
+      attrib = self.treestore.get_value(iter, 1)
+      attrib[key] = (value, None, "insert")
+    else:
+      before = self.__iter_nth_child(iter, index - 1)
+      if before:
+        self.treestore.insert_before(iter, before, [value, {}, None, None, "insert"]) 
+      else:
+        self.treestore.append(iter, [value, {}, None, None, "insert"])
+
+  def __move(self, iter, value, index):
+    """
+    Copy the entire subtree at iter to the path at value[index],
+    mark all of iter as deleted, and all of the copy inserted.
+    """
+    tag, attrib, text = self.treestore.get(iter, 0, 1, 2)
+    self.treestore.set(iter, 2, None)
+    self.treestore.set(iter, 4, "delete")
+
+    destiter = self.__get_iter(value)[0]
+
+    before = self.__iter_nth_child(destiter, index - 1)
+    if before:
+      destiter = self.treestore.insert_before(destiter, before, [tag, attrib, text, None, "insert"]) 
+    else:
+      destiter = self.treestore.append(destiter, [tag, attrib, text, None, "insert"])
+
+    def move(iterfrom, iterto):
+      for childfrom in self.__iter_children(iterfrom):
+        tag, attrib, text = self.treestore.get(childfrom, 0, 1, 2)
+        self.treestore.set(childfrom, 2, None)
+        self.treestore.set(childfrom, 4, "delete")
+
+        childto = self.treestore.append(iterto, [tag, attrib, text, None, "insert"])
+        move(childfrom, childto)
+
+    move(iter, destiter)
+
+  def __iter_children(self, iter):
+    child = self.treestore.iter_children(iter)
+
+    while child:
+      active = self.treestore.get_value(child, 4) != "delete"
+      if active:
+        yield child
+      child = self.treestore.iter_next(child)
+
+  def __iter_nth_child(self, iter, n):
+
+    for child in self.__iter_children(iter):
+      if n == 0:
+        return child
+      else:
+        n -= 1
+    return None
+
+  def __get_iter(self, path, iter = None):
+    """
+    Convert the given XML path to an iter into the treestore.
+    """
+
+    if iter is None:
+      iter = self.treestore.get_iter_first()
+
+    tag, edit = self.treestore.get(iter, 0, 4)
+    if edit == "delete":
+      return None # don't search deleted paths
+
+    parentiter = self.treestore.iter_parent(iter)
+    if parentiter:
+      siblings = []
+      for siblingiter in self.__iter_children(parentiter):
+        siblingtag = self.treestore.get_value(siblingiter, 0)
+        if siblingtag == tag:
+          siblings.append(self.treestore.get_path(siblingiter))
+
+      if len(siblings) != 1:
+        index = "[" + str(siblings.index(self.treestore.get_path(iter)) + 1) + "]"
+      else:
+        index = ""
+
+      tag = "/" + tag + index
+    else:
+      tag = "/" + tag
+
+    index = path.find("/", 1)
+    if index == -1:
+      index = len(path)
+
+    root = path[:index]
+    path = path[index:]
+
+    #check we match root
+    if root != tag:
+      return None
+
+    if path:
+      # check for text()
+      if path == "/text()":
+        return (iter, None)
+
+      # check attributes
+      if path.startswith("/@"):
+        attrib = self.treestore.get_value(iter, 1)
+        for key in attrib:
+          if path == "/@" + key:
+            return (iter, key)
+        return None
+
+      # check children
+      for iter in self.__iter_children(iter):
+        edit = self.treestore.get_value(iter, 4)
+        if edit != "delete":
+          result = self.__get_iter(path, iter)
+          if result:
+            return result
+
+      return None
+    else:
+      # must be us
+      return (iter, None)
+
+  def on_select_row(self, selection):
+    """
+    Called when a row is selected.
+    """
+    (model, row) = selection.get_selected()
+    if row is None:
+      return
+
+    attrib, new, old, edit = model.get(row, 1, 2, 3, 4)
+
+    databuffer = self.dataview.get_buffer()
+    tag = databuffer.get_tag_table().lookup("tag")
+    if new or old: 
+      self.__set_textdiff(self.dataview.get_buffer(), old, new)
+      tag.set_property("background-set", False)
+      tag.set_property("foreground", "black")
+    else:
+      databuffer.set_text("No data")
+      self.__set_cell_property(tag, None)
+      tag.set_property("foreground", "grey")
+
+    bounds = databuffer.get_bounds()
+    databuffer.apply_tag(tag, bounds[0], bounds[1])
+
+    # 0: Key
+    # 1: Value
+    # 2: Old value
+    # 3: "insert", "delete", "update",  ""
+
+    attribstore = gtk.TreeStore(gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)
+
+    for key, (new, old, diff) in attrib.iteritems():
+      attribstore.append(None, [key, new, old, diff])
+
+    self.attribview.set_model(attribstore)
+
+  def __set_textdiff(self, databuffer, old, new):
+    text1 = old.splitlines() if old else []
+    text2 = new.splitlines() if new else []
+
+    from difflib import Differ
+    differ = Differ()
+    result = differ.compare(text1, text2)
+    result = [line + "\n" for line in result if not line.startswith("? ")]
+
+    databuffer.set_text("") 
+    for line in result:
+      iter = databuffer.get_end_iter()
+      if line.startswith("  "):
+        databuffer.insert(iter, line)
+      elif line.startswith("+ "):
+        databuffer.insert_with_tags_by_name(iter, line, "add")
+      elif line.startswith("- "):
+        databuffer.insert_with_tags_by_name(iter, line, "rem") 
+
+   
+  def __create_tags(self, databuffer):
+    databuffer.create_tag("tag")
+    add = databuffer.create_tag("add")
+    rem = databuffer.create_tag("rem")
+
+    add.set_property("background", "lightgreen")
+    rem.set_property("background", "indianred")
+
+  def __set_cell_property(self, cell, edit):
+    if edit is None:
+      cell.set_property("foreground", "black")
+    elif edit == "insert":
+      cell.set_property("foreground", "green")
+    elif edit == "delete":
+      cell.set_property("foreground", "red")
+    elif edit == "update":
+      cell.set_property("foreground", "blue")
+    elif edit == "subupdate":
+      cell.set_property("foreground", "cornflowerblue")
+
+  def set_celltext(self, column, cell, model, iter):
+  
+    tag, text, edit = model.get(iter, 0, 2, 4)
+
+    cell.set_property("text", tag)
+    self.__set_cell_property(cell, edit) 
+
+  def set_cellkey(self, column, cell, model, iter):
+    
+    key, edit = model.get(iter, 0, 3)
+    cell.set_property("text", key)
+    self.__set_cell_property(cell, edit) 
+
+  def set_cellvalue(self, column, cell, model, iter):
+ 
+    new, old, edit = model.get(iter, 1, 2, 3)
+    if edit == "delete":
+      cell.set_property("text", old)
+    else:
+      cell.set_property("text", new)
+    self.__set_cell_property(cell, edit) 
+
+  def _get_focus_widget(self, parent):
+    """
+    Gets the widget that is a child of parent with the focus.
+    """
+    focus = parent.get_focus_child()
+    if focus is None or (focus.flags() & gtk.HAS_FOCUS):
+      return focus
+    else:
+      return self._get_focus_widget(focus)
+
+  def _handle_clipboard(self, widget, signal):
+    """
+    This finds the currently focused widget.
+    If no widget is focused or the focused widget doesn't support 
+    the given clipboard operation use the treeview (False), otherwise
+    signal the widget to handel the clipboard operation (True).
+    """
+    widget = self._get_focus_widget(self)
+
+    if widget is None or widget is self.treeview:
+      return False
+
+    if gobject.signal_lookup(signal + "-clipboard", widget):
+      widget.emit(signal + "-clipboard")
+      return True
+    else:
+      return False
+
+  def __get_treestore(self, iter):
+
+    tag, attrib, text = self.treestore.get(iter, 0, 1, 2)
+
+    tree = etree.Element(tag)
+
+    for key, (newvalue, oldvalue, edit) in attrib.iteritems():
+      tree.attrib[key] = newvalue
+
+    child_iter = self.treestore.iter_children(iter)
+    while child_iter:
+      child = self.__get_treestore(child_iter)
+      tree.append(child)
+      child_iter = self.treestore.iter_next(child_iter)
+
+    return tree
+
+  def on_copy(self, widget=None):
+    if self._handle_clipboard(widget, "copy"):
+      return
+
+    (model, row) = self.treeview.get_selection().get_selected()
+    if row is None:
+      return
+
+    tree = etree.ElementTree(self.__get_treestore(row))
+
+    ios = StringIO.StringIO()
+    tree.write(ios, pretty_print = True, xml_declaration = False, encoding = "utf-8")
+
+    clipboard = gtk.clipboard_get()
+    clipboard.set_text(ios.getvalue())
+    clipboard.store()
+
+    ios.close()

=== modified file 'diamond/diamond/interface.py'
--- diamond/diamond/interface.py	2011-08-16 15:22:31 +0000
+++ diamond/diamond/interface.py	2011-08-24 16:38:18 +0000
@@ -18,6 +18,7 @@
 import os
 import os.path
 import re
+import time
 import sys
 import tempfile
 import cStringIO as StringIO
@@ -47,6 +48,7 @@
 import descriptionwidget
 import databuttonswidget
 import datawidget
+import diffview
 import sliceview
 
 from lxml import etree
@@ -140,6 +142,8 @@
                     "on_copy": self.on_copy,
                     "on_paste": self.on_paste,
                     "on_slice": self.on_slice,
+                    "on_diff": self.on_diff,
+                    "on_diffsave": self.on_diffsave,
                     "on_group": self.on_group,
                     "on_ungroup": self.on_ungroup}
 
@@ -601,15 +605,16 @@
                       "You should have received a copy of the GNU General Public License\n"+
                       "along with Diamond.  If not, see http://www.gnu.org/licenses/.")
 
-    logo = gtk.gdk.pixbuf_new_from_file(self.logofile)
-
+    if self.logofile is not None:
+      logo = gtk.gdk.pixbuf_new_from_file(self.logofile)
+      about.set_logo(logo)
+      
     try:
       image = about.get_children()[0].get_children()[0].get_children()[0]
       image.set_tooltip_text("Diamond: it's clearer than GEM")
     except:
       pass
-
-    about.set_logo(logo)
+    
     about.show()
 
     return
@@ -730,13 +735,31 @@
           msg += "Warning: added xml attributes:\n"
           for ele in added_attrs:
             msg += ele + "\n"
-      
+
         dialogs.long_message(self.main_window, msg)
- 
-      self.set_saved(False)     
+
+      self.set_saved(False)
 
     return
 
+  def __diff(self, path):
+    self.statusbar.set_statusbar("Calculating diff... (this may take a while)")
+    start = time.clock()
+    diffview.DiffView(path, self.tree)
+    seconds = time.clock() - start
+    self.statusbar.set_statusbar("Diff calculated (took " + str(seconds) + " seconds)")
+
+  def on_diff(self, widget = None, path = None):
+    if path is None:
+      path = os.path.dirname(self.filename) if self.filename else None
+    self.__diff(path)
+
+  def on_diffsave(self, widget = None):
+    if self.filename:
+      self.__diff(self.filename)
+    else:
+      dialogs.error(self.main_window, "No save to diff against.")
+
   def on_slice(self, widget = None):
     if not self.selected_node.is_sliceable():
       self.statusbar.set_statusbar("Cannot slice on this element.")

=== modified file 'diamond/diamond/triangle_reader.py' (properties changed: +x to -x)
=== modified file 'diamond/gui/gui.glade'
--- diamond/gui/gui.glade	2011-07-26 11:06:34 +0000
+++ diamond/gui/gui.glade	2011-08-24 16:38:18 +0000
@@ -131,7 +131,7 @@
                         <signal name="activate" handler="on_paste"/>
                         <accelerator key="V" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
-                    </child>
+                    </child> 
                     <child>
                       <widget class="GtkMenuItem" id="menuitemGroup">
                         <property name="visible">True</property>
@@ -221,6 +221,20 @@
                   <widget class="GtkMenu" id="menu4">
                     <property name="visible">True</property>
                     <child>
+                      <widget class="GtkMenuItem" id="menuitemDiff">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Diff</property>
+                        <signal name="activate" handler="on_diff"/>
+                      </widget>
+                    </child>
+                     <child>
+                      <widget class="GtkMenuItem" id="menuitemDiffSave">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Diff against last save</property>
+                        <signal name="activate" handler="on_diffsave"/>
+                      </widget>
+                    </child>
+                    <child>
                       <widget class="GtkCheckMenuItem" id="display_properties">
                         <property name="visible">True</property>
                         <property name="tooltip" translatable="yes">Display the option properties on the right hand side of the main window.</property>

=== modified file 'diamond/tests/plist/plist.py' (properties changed: +x to -x)
=== modified file 'diamond/tests/read_xml/find_hidden_xmldata.py' (properties changed: +x to -x)
=== modified file 'diamond/tests/schema/test_simple_schema.py' (properties changed: +x to -x)
=== added directory 'dxdiff'
=== added file 'dxdiff/COPYING'
--- dxdiff/COPYING	1970-01-01 00:00:00 +0000
+++ dxdiff/COPYING	2011-08-24 16:38:18 +0000
@@ -0,0 +1,15 @@
+dxdiff is copyright (C) 2011 Imperial College London and others. 
+For a full list of contributors see the AUTHORS file.
+
+dxdiff is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+The complete text of the GNU General Public License can be found 
+in the file `GPL-3'.

=== added file 'dxdiff/GPL-3'
--- dxdiff/GPL-3	1970-01-01 00:00:00 +0000
+++ dxdiff/GPL-3	2011-08-24 16:38:18 +0000
@@ -0,0 +1,676 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

=== added directory 'dxdiff/dxdiff'
=== added file 'dxdiff/dxdiff/__init__.py'
=== added file 'dxdiff/dxdiff/bimap.py'
--- dxdiff/dxdiff/bimap.py	1970-01-01 00:00:00 +0000
+++ dxdiff/dxdiff/bimap.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+#    This file is part of dxdiff.
+#
+#    dxdiff is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    dxdiff is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+
+
+class Bimap:
+  """
+  Bimap is a simple wrapper class over two dicts,
+  it behaves as a bi-directional map.
+  """
+
+  def __init__(self):
+    self.left = {}
+    self.right = {}    
+
+  def __len__(self):
+    return len(self.left)
+
+  def __iter__(self):
+    # we iter over the left dict so that the left item is
+    # on the left side of the tuple returned
+    for item in self.left.iteritems():
+      yield item
+  
+  def __contains__(self, item):
+    # check that the left dict contains left and points to right
+    try:
+      left, right = item
+      return self.left[left] == right
+    except KeyError:
+      return False
+
+  def add(self, item):
+    x, y = item
+    self.left[x] = y
+    self.right[y] = x

=== added file 'dxdiff/dxdiff/diff.py'
--- dxdiff/dxdiff/diff.py	1970-01-01 00:00:00 +0000
+++ dxdiff/dxdiff/diff.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+
+#    This file is part of dxdiff.
+#
+#    dxdiff is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    dxdiff is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+
+import fmes
+
+def diff(xmlold, xmlnew):
+  """
+  Compares two xml trees.
+  Returns an editscript to transform old into new. 
+  """
+
+  return fmes.diff(xmlold, xmlnew)

=== added file 'dxdiff/dxdiff/dxdiff'
--- dxdiff/dxdiff/dxdiff	1970-01-01 00:00:00 +0000
+++ dxdiff/dxdiff/dxdiff	2011-08-24 16:38:18 +0000
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+
+#    This file is part of dxdiff.
+#
+#    dxdiff is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    dxdiff is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+
+from getopt import getopt
+import sys
+import os
+from lxml import etree
+from dxdiff.diff import diff
+ 
+def __display_help():
+  """
+  Prints usage information to standard output.
+  """
+
+  print "\n".join(["Usage: dxdiff [OPTIONS] ... [FILE1] [FILE2]",
+                   "", 
+                   "An XML aware diff tool. [FILE1] and [FILE2] are the XML files to be compared.",
+                   "[FILE1] should be the old file.",
+                   "", 
+                   "Options:", 
+                   ""
+                   "-h               Display this message", 
+                   ""])
+
+def __main():
+  """
+  Main routine to run dxdiff
+  """
+
+  try:
+    opts, args = getopt(sys.argv[1:], "hso:")
+  except:
+    __display_help()
+    sys.exit(1)
+
+  if len(args) != 2:
+    __display_help()
+    sys.exit(1)
+
+  if ("h", "") in opts:
+    __display_help()
+
+  output_file = None
+  for opt in opts:
+    if opt[0] == "-o":
+      output_file = opt[1]
+
+  file1 = args[0]
+  file2 = args[1]  
+  
+  try:
+    os.stat(file1)
+  except OSError:
+    print "Could not find " + file1 + "!"
+    sys.exit(1)
+
+  try:
+    os.stat(file2)
+  except OSError:
+    print "Could not find " + file2 + "!"
+    sys.exit(1)
+
+  xmlold = etree.parse(file1)
+  xmlnew = etree.parse(file2)
+
+  editscript = diff(xmlold, xmlnew)
+  if ("s", "") not in opts:
+    print editscript
+  if output_file is not None:
+    editscript.write(output_file)
+
+if __name__ == "__main__":
+  __main()

=== added file 'dxdiff/dxdiff/editscript.py'
--- dxdiff/dxdiff/editscript.py	1970-01-01 00:00:00 +0000
+++ dxdiff/dxdiff/editscript.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+
+#    This file is part of dxdiff.
+#
+#    dxdiff is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    dxdiff is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+
+from lxml import etree
+
+class EditScript:
+
+  def __init__(self):
+    self.script = []
+
+  def __str__(self):
+    return etree.tostring(self.to_xml(), pretty_print = True)
+
+  def __len__(self):
+    return len(self.script)
+
+  def __getitem__(self, key):
+    return self.script[key]
+
+  def __iter__(self):
+    return self.script.__iter__()
+
+  def update(self, path, value, userdata = None):
+    self.script.append({ "type": "update",
+                         "location": path,
+                         "value": value,
+                         "userdata": userdata })
+  
+  def insert(self, path, index, tag, value = None, userdata = None):
+    self.script.append({ "type": "insert",
+                         "location": path,
+                         "index": index,
+                         "value": tag + (" " + value if value is not None else ""),
+                         "userdata": userdata})
+
+  def delete(self, path, userdata = None):
+    self.script.append({ "type": "delete",
+                         "location": path,
+                         "userdata": userdata})
+
+  def move(self, path, destination, index, userdata = None):
+    self.script.append({ "type": "move",
+                         "location": path,
+                         "index": index,
+                         "value": destination,
+                         "userdata": userdata })
+
+  def to_xml(self):
+    tree = etree.Element("xmldiff")
+
+    for edit in self.script:
+      node = etree.Element(edit["type"], location = edit["location"])
+      if "index" in edit:
+        node.attrib["index"] = edit["index"]
+      if edit["userdata"] is not None:
+        node.attrib["userdata"] = edit["userdata"]
+
+      if "value" in edit:
+        node.text = edit["value"]
+      tree.append(node)
+
+    return etree.ElementTree(tree)
+
+  def write(self, path):
+    self.to_xml().write(path, pretty_print = True, xml_declaration = True, encoding = "utf-8")

=== added file 'dxdiff/dxdiff/fmes.py'
--- dxdiff/dxdiff/fmes.py	1970-01-01 00:00:00 +0000
+++ dxdiff/dxdiff/fmes.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,466 @@
+#!/usr/bin/env python
+
+#    This file is part of dxdiff.
+#
+#    dxdiff is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    dxdiff is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+"""
+Diff xml trees using a modification of FMES [http://infolab.stanford.edu/pub/papers/tdiff3-8.ps]
+"""
+
+from lxml import etree
+from collections import deque
+from bimap import Bimap
+from editscript import EditScript
+
+import lcs
+import utils
+
+class Dom:
+  def __init__(self, tag, value, parent, attribute = False):
+    self.tag = tag
+    self.value = value
+    self.parent = parent
+    self.children = []
+
+    if value is None:
+      self.typetag = "/Element"
+    elif attribute:
+      self.typetag = "/Attribute"
+    else:
+      self.typetag = "/Text"
+
+    if parent:
+      self.depth = parent.depth + 1
+    else:
+      self.depth = 0
+
+    self.inorder = False
+
+  def elements(self):
+    return [child for child in self.children if child.is_element()]
+
+  def attributes(self):
+    return [child for child in self.children if child.is_attribute()]
+
+  def text(self):
+    return [child for child in self.children if child.is_text()]
+
+  def is_element(self):
+    return self.typetag == "/Element"
+
+  def is_text(self):
+    return self.typetag == "/Text"
+
+  def is_attribute(self):
+    return self.typetag == "/Attribute"
+
+  def __repr__(self):
+    return "<" + self.label + ">" + (self.value or "")
+
+  def __str__(self, indent = ""):
+    title = indent + "<" + self.path() + ">" + (self.value or "") + "\n" + indent
+    children = ("\n" + indent).join(child.__str__(indent + "  ") for child in self.children)
+    return title + children
+
+  def path(self):
+    """
+    Finds the path of this element.
+    """
+    if self.is_text():
+      return self.parent.path() + "/text()"
+
+    if self.is_attribute():
+      return self.parent.path() + "/@" + self.tag
+
+    if self.parent:
+      siblings = [sibling for sibling in self.parent.elements() if sibling.tag == self.tag]
+      if len(siblings) != 1:
+        index = "[" + str(siblings.index(self) + 1) + "]"
+      else:
+        index = ""
+      return self.parent.path() + "/" + self.tag + index
+    else:
+      return "/" + self.tag
+
+  def find(self, path):
+
+    if self.is_text():
+      if path == "/text()":
+        return self
+      else: return None
+
+    if self.is_attribute():
+      if path == "/@" + self.tag:
+        return self
+      else: return None
+
+    index = path.find("/", 1)
+    if index == -1:
+      index = len(path)
+
+    root = path[:index]
+    path = path[index:]
+
+    if self.parent:
+      siblings = [sibling for sibling in self.parent.elements() if sibling.tag == self.tag]
+      if len(siblings) != 1:
+        index = "[" + str(siblings.index(self) + 1) + "]"
+      else:
+        index = ""
+
+      if root != "/" + self.tag + index:
+        return None
+    else:
+      if root != "/" + self.tag:
+        return None
+
+    if path:
+      for child in self.children:
+        result = child.find(path)
+        if result:
+          return result
+    else:
+      return self
+
+  def _real_index(self, parent, index):
+    if index == 0:
+      return 0
+
+    elements = parent.elements()
+    if len(elements) < index:
+      return len(parent.children)
+    return parent.children.index(elements[index - 1])
+
+  def insert(self, tag, tagtype, value, path, index):
+    parent = self.find(path)
+
+    node = Dom(tag, value, parent, tagtype == "/Attribute")
+    parent.children.insert(self._real_index(parent, index), node)
+    node.label = _strip_indexers(node.path()) + node.typetag
+    return node
+
+  def update(self, path, value):
+    node = self.find(path)
+
+    node.value = value
+    return node
+
+  def move(self, from_path, to_path, index):
+    node = self.find(from_path)
+    node.parent.children.remove(node)
+
+    parent = self.find(to_path)
+    parent.children.insert(self._real_index(parent, index), node)
+    node.parent = parent
+
+  def delete(self, path):
+    node = self.find(path)
+    node.parent.children.remove(node)
+    node.parent = None
+
+def _get_text(tree):
+  """
+  Returns the text and child tails.
+  """
+  return "".join([tree.text or ""] + [child.tail or "" for child in tree]).strip()
+
+def _strip_indexers(path):
+  """
+  Strips out indexers from an path.
+  """
+  while True:
+    lindex = path.find("[")
+    if lindex == -1:
+      break
+    rindex = path.find("]", lindex)
+    path = path[:lindex] + path[rindex + 1:]
+  return path
+
+def dom(root, tree = None, parent = None):
+  
+  if tree is None:
+    tree = root.getroot()
+
+  xpath = root.getpath(tree)
+  path = _strip_indexers(xpath)
+
+  node = Dom(tree.tag, None, parent)
+  node.label = path + node.typetag
+  node.xpath = xpath
+
+  text = _get_text(tree)
+  if text:
+    text = Dom(tree.tag, text, node)
+    text.label = path + text.typetag
+    text.xpath = xpath + "/text()"
+    node.children.append(text)
+
+  for key, value in tree.items():
+    attr = Dom(key, value, node, True)
+    attr.label = path + "/@" + key + attr.typetag
+    attr.xpath = path + "/@" + key
+    node.children.append(attr)
+
+  for child in tree:
+    node.children.append(dom(root, child, node))
+
+  return node
+
+def get_leaf_nodes(tree):
+  """
+  Gets all the leaf nodes of an xml tree.
+  """
+  if tree.children:
+    return utils.flatten([get_leaf_nodes(child) for child in tree.children])
+  else:
+    return [tree]
+
+def get_parent_nodes(tree):
+  """
+  Returns all the non leaf nodes of an xml tree.
+  """
+
+  if tree.children:
+    return utils.flatten([get_parent_nodes(child) for child in tree.children]) + [tree]
+  else:
+    return []
+
+def get_depth(tree):
+  """
+  Returns the maximum depth of a tree.
+  """
+  depth = tree.depth
+  for child in tree.children:
+    depth = max(depth, get_depth(child))
+  return depth
+
+def get_depth_nodes(tree, depth):
+  """
+  Gets all the nodes of a certain depth of an xml tree.
+  """
+  if tree.depth == depth:
+    return [tree]
+  else:
+    if tree.children:
+      return utils.flatten([get_depth_nodes(child, depth) for child in tree.children])
+    else:
+      return []  
+
+def get_chain(nodes, label):
+  return [node for node in nodes if node.label == label]
+
+def compare_value(value1, value2):
+  if value1 is None and value2 is None:
+    return 0.0
+  if value1 is None or value2 is None:
+    return 1.0
+  return 1.0 - (float(len(lcs.lcs(lcs.path(value1, value2)))) / max(len(value1), len(value2)))
+
+def leaf_equal(f, M, l1, l2):
+  return l1.label == l2.label and compare_value(l1.value, l2.value) <= f
+
+def common(children1, children2, M):
+  return [(x, y) for (x, y) in M if x in children1 and y in children2]
+
+def compare_children(children1, children2, M):
+  return (float(len(common(children1, children2, M))) / max(len(children1), len(children2)))
+
+def node_equal(t, M, n1, n2):
+  return n1.label == n2.label and compare_children(n1.children, n2.children, M) > t
+
+def depth_equal(f, t, M, n1, n2):
+  if n1.children or n2.children:
+    return node_equal(t, M, n1, n2)
+  else:
+    return leaf_equal(f, M, n1, n2)
+
+def _match(nodes1, nodes2, M, equal):
+  nodes = nodes1 + nodes2
+  for label in utils.nub([node.label for node in nodes]):
+
+    s1 = get_chain(nodes1, label)
+    s2 = get_chain(nodes2, label)
+
+    path = lcs.lcs(lcs.path(s1, s2, equal))
+
+    for x, y in path:
+      M.add((s1[x], s2[y]))
+    for x, y in reversed(path):
+      s1.pop(x)
+      s2.pop(y)
+
+    for x in range(len(s1)):
+      for y in range(len(s2)):
+        if equal(s1[x], s2[y]):
+          M.add((s1[x], s2[y]))
+          s2.pop(y)
+          break
+
+def fastmatch(t1, t2):
+  """
+  Calculates a match between t1 and t2.
+  See figure 10 in reference.
+  """
+  M = Bimap()
+
+  depth = max(get_depth(t1), get_depth(t2))
+
+  while 0 <= depth:
+    nodes1 = get_depth_nodes(t1, depth)
+    nodes2 = get_depth_nodes(t2, depth)
+
+    equal = utils.partial(depth_equal, 0.6, 0.5, M)
+
+    _match(nodes1, nodes2, M, equal)
+
+    depth -= 1
+
+  return M
+
+def breadth_iter(tree):
+  Q = deque()
+  Q.append(tree)
+  while Q:
+    t = Q.popleft()
+    if t is not tree:
+      yield t
+    if t.parent is not None or t is tree: #check we haven't deleted it
+      for child in t.children:
+        Q.append(child)
+
+def postorder_iter(tree):
+  S = []
+  O = []
+  S.append(tree)
+  while S:
+    t = S.pop()
+    O.append(t)
+    for child in t.children:
+      S.append(child)
+  while O:
+    t = O.pop()
+    if t is not tree:
+      yield t
+
+def editscript(t1, t2):
+  """
+  Finds an editscript between t1 and t2.
+  See figure 8 in reference.
+  """
+
+  E = EditScript()
+  M = fastmatch(t1, t2)
+
+  M.add((t1, t2))
+  alignchildren(t1, t2, M, E, t1, t2)
+
+  for x in breadth_iter(t2):
+    y = x.parent
+    z = M.right[y]
+
+    if x not in M.right:
+      if x.typetag == "/Text": #Can't insert Text, do an update
+        E.update(z.path(), x.value, x.xpath if hasattr(x, "xpath") else None)
+        w = t1.insert(x.tag, x.typetag, x.value, z.path(), 0)
+        M.add((w, x))
+      else:
+        x.inorder = True
+        k = findpos(M, x)
+        E.insert(z.path(), str(k), x.tag, x.value, x.xpath if hasattr(x, "xpath") else None)
+        w = t1.insert(x.tag, x.typetag, x.value, z.path(), k)
+        M.add((w, x))
+    else: # y is not None:
+      w = M.right[x]
+      v = w.parent
+      if w.value != x.value:
+        E.update(w.path(), x.value, w.xpath if hasattr(w, "xpath") else None)
+        t1.update(w.path(), x.value)
+      if (v, y) not in M:
+        x.inorder = True
+        k = findpos(M, x)
+        E.move(w.path(), z.path(), str(k), w.xpath if hasattr(w, "xpath") else None)
+        t1.move(w.path(), z.path(), k)
+
+    alignchildren(t1, t2, M, E, w, x)
+
+  for w in breadth_iter(t1):
+    if w not in M.left:
+      if w.typetag == "/Text": #Can't delete Text, do an update
+        E.update(w.path(), "", w.xpath if hasattr(w, "xpath") else None)
+        t1.update(w.path(), "")
+      else:
+        E.delete(w.path(), w.xpath if hasattr(w, "xpath") else None)
+        t1.delete(w.path())
+
+  return E
+
+def alignchildren(t1, t2, M, E, w, x):
+  """
+  See figure 9 in reference.
+  """
+
+  for c in w.elements():
+    c.inorder = False
+  for c in x.elements():
+    c.inorder = False
+
+  s1 = [child for child in w.elements() if child in M.left and M.left[child].parent == x]
+  s2 = [child for child in x.elements() if child in M.right and M.right[child].parent == w]
+
+  def equal(a, b):
+    return (a, b) in M
+
+  S = [(s1[x], s2[y]) for x, y in lcs.lcs(lcs.path(s1, s2, equal))]
+  for (a, b) in S:
+    a.inorder = b.inorder = True
+
+  for a in s1:
+    for b in s2:
+      if (a, b) in M and (a, b) not in S:
+        k = findpos(M, b)
+        E.move(a.path(), w.path(), k, a.xpath if hasattr(a, "xpath") else None)
+        t1.move(a.path(), w.path(), str(k))
+        a.inorder = b.inorder = True
+
+def findpos(M, x):
+  """
+  See figure 9 in reference.
+  """
+  if x.is_text() or x.is_attribute():
+    return 0
+
+  y = x.parent
+  children = y.elements()
+
+  #find the rightmost inorder node left of x (v)
+  index = children.index(x)
+  v = None
+  for i in range(index):
+    c = children[i]
+    if c.inorder:
+      v = c
+
+  if v is None:
+    return 1
+
+  u = M.right[v]
+  children = u.parent.elements()
+  index = children.index(u) + 1
+  return index + 1
+
+def diff(tree1, tree2):
+  t1 = dom(tree1)
+  t2 = dom(tree2)
+  E = editscript(t1, t2)
+  return E

=== added file 'dxdiff/dxdiff/lcs.py'
--- dxdiff/dxdiff/lcs.py	1970-01-01 00:00:00 +0000
+++ dxdiff/dxdiff/lcs.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,284 @@
+#!/usr/bin/env python
+
+#    This file is part of dxdiff.
+#
+#    dxdiff is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    dxdiff is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+"""
+Find the LCS (Longest Common Subsequence). Uses [http://www.xmailserver.org/diff2.pdf]
+"""
+
+from utils import irange
+
+def __path(V, D, k):
+  if D == 0:
+    return [(xy, xy) for xy in irange(V[0][0])]
+
+  tx = V[D][k]
+
+  if k == -D or (k != D and V[D][k - 1] < V[D][k + 1]):
+    x = V[D][k + 1]
+    y = x - (k + 1)
+    k = k + 1
+    y = y + 1
+  else:
+    x = V[D][k - 1]
+    y = x - (k - 1)
+    k = k - 1
+    x = x + 1
+
+  return __path(V, D - 1, k) + [(x + d, y + d) for d in irange(tx - x)]
+
+def __eq(a, b): return a == b
+
+def path(a, b, eq = __eq):
+  """
+  Finds the path through the match grid of sequence a and b,
+  using the function eq to determine equality.
+  Returns path
+  """
+
+  m = len(a)
+  n = len(b)
+  mn = m + n
+
+  if mn == 0: # two empty sequences
+    return [(0, 0)]
+  
+  Vd = []
+  V = {1: 0}
+
+  for D in irange(mn):
+    for k in irange(-D, D, 2):
+      if k == -D or (k != D and V[k - 1] < V[k + 1]):
+        x = V[k + 1]
+      else:
+        x = V[k - 1] + 1
+      y = x - k
+
+      while x < m and y < n and eq(a[x], b[y]):
+        x += 1
+        y += 1
+
+      V[k] = x
+    
+      if x >= m and y >= n:
+        Vd.append(V.copy())
+        return __path(Vd, D, k)
+
+    Vd.append(V.copy())
+
+  raise Exception("lcs should not reach here")  
+
+def lcs(path):
+  """
+  Given an edit script path returns the longest common subseqence.
+  """
+
+  result = []
+
+  for i in range(1, len(path)):
+    x, y = path[i]
+    px, py = path[i - 1]
+    dx, dy = x - px, y - py
+    if dx == 1 and dy == 1:
+      result.append((px, py))
+
+  return result
+
+def ses(path, b):
+  """
+  Returns an edit script for a given match grid path.
+  The edit script transforms sequence A of the match grid
+  into sequence B via deletions ("D", index) and inserations
+  ("I", A index, B value).
+  """
+
+  patch = []
+  for i in range(len(path) - 1):
+    x, y = path[i]
+    nx, ny = path[i + 1]
+    dx, dy = nx - x, ny - y
+    if dx == 1 and dy == 1:
+      pass #match
+    elif dx == 1:
+      patch.append(("D", x))
+    else: #dy == 1:
+      patch.append(("I", x, b[y]))
+
+  return patch
+
+def patch(patch, a):
+  """
+  Given a sequence and a patch from the ses function transforms a into b
+  """
+
+  seq = type(a)
+  result = seq()
+  i = 0
+
+  for op in patch:
+    while i < op[1]:
+      result += seq(a[i])
+      i += 1
+    
+    if op[0] == "D":
+      i += 1 
+    else:
+      result += seq(op[2])
+  
+  while i < len(a):
+    result += seq(a[i])
+    i += 1
+ 
+  return result
+
+##################
+### Unit Tests ###
+##################
+
+import unittest
+
+class __Test_lcs(unittest.TestCase):
+  def test_zero(self):
+    self.assertEqual(path("", ""), [(0, 0)]) 
+    self.assertEqual(path("", "a"), [(0, 0), (0, 1)])
+    self.assertEqual(path("a", ""), [(0, 0), (1, 0)])
+
+  def test_single(self):
+    self.assertEqual(path("a", "a"), [(0, 0), (1, 1)])
+    self.assertEqual(path("a", "b"), [(0, 0), (1, 0), (1, 1)])
+
+  def test_short(self):
+    self.assertEqual(path("ab", "ab"), [(0, 0), (1, 1), (2, 2)])
+    self.assertEqual(path("ab", "ac"), [(0, 0), (1, 1), (2, 1), (2, 2)])
+    self.assertEqual(path("abcabba", "cbabac"), [(0, 0), (1, 0), (2, 0), (3, 1), (3, 2), (4, 3), (5, 4), (6, 4), (7, 5), (7, 6)])
+    self.assertEqual(path("hello", "help me"), [(0, 0), (1, 1), (2, 2), (3, 3), (4, 3), (5, 3), (5, 4), (5, 5), (5, 6), (5, 7)])
+
+  def test_long(self):
+    self.assertEqual(path("hello", "night night"),
+                        [(0, 0), (0, 1), (0, 2), (0, 3), (1, 4), (2, 4),
+                         (3, 4), (4, 4), (5, 4), (5, 5), (5, 6), (5, 7),
+                         (5, 8), (5, 9), (5, 10), (5, 11)])
+
+    self.assertEqual(path([
+			"This part of the",
+			"document has stayed the",
+			"same from version to",
+			"version.  It shouldn't",
+			"be shown if it doesn't",
+			"change.  Otherwise, that",
+			"would not be helping to",
+			"compress the size of the",
+			"changes.",
+                        "",
+			"This paragraph contains",
+			"text that is outdated.",
+			"It will be deleted in the",
+			"near future.",
+                        "",
+			"It is important to spell",
+			"check this dokument. On",
+			"the other hand, a",
+			"misspelled word isn't",
+			"the end of the world.",
+			"Nothing in the rest of",
+			"this paragraph needs to",
+			"be changed. Things can",
+			"be added after it."
+			], [
+			"This is an important",
+			"notice! It should",
+			"therefore be located at",
+			"the beginning of this",
+			"document!",
+                        "",
+			"This part of the",
+			"document has stayed the",
+			"same from version to",
+			"version.  It shouldn't",
+			"be shown if it doesn't",
+			"change.  Otherwise, that",
+			"would not be helping to",
+			"compress anything.",
+                        "",
+			"It is important to spell",
+			"check this document. On",
+			"the other hand, a",
+			"misspelled word isn't",
+			"the end of the world.",
+			"Nothing in the rest of",
+			"this paragraph needs to",
+			"be changed. Things can",
+			"be added after it.",
+                        "",
+			"This paragraph contains",
+			"important new additions",
+			"to this document.",
+			]), [(0, 0), (0, 1), (0, 2), (0, 3), (0, 4),
+                             (0, 5), (0, 6), (1, 7), (2, 8), (3, 9), 
+                             (4, 10), (5, 11), (6, 12), (7, 13), (8, 13),
+                             (9, 13), (9, 14), (10, 15), (11, 15), (12, 15), 
+                             (13, 15), (14, 15), (15, 15), (16, 16), (17, 16),
+                             (17, 17), (18, 18), (19, 19), (20, 20), (21, 21), 
+                             (22, 22), (23, 23), (24, 24), (24, 25), (24, 26),
+                             (24, 27), (24, 28)])
+
+class __Test_diff(unittest.TestCase):
+  def test_zero(self):
+    p = path("", "")
+
+    self.assertEqual(ses(p, ""), [])
+
+  def test_delete(self):
+    p = path("a", "")
+    self.assertEqual(ses(p, ""), [("D", 0)])
+
+    p = path("abcd", "")
+    self.assertEqual(ses(p, ""), [("D", 0), ("D", 1), ("D", 2), ("D", 3)])
+
+    p = path("abcd", "cd")
+    self.assertEqual(ses(p, "cd"), [("D", 0), ("D", 1)])
+    
+    p = path("abcd", "ab")
+    self.assertEqual(ses(p, "ab"), [("D", 2), ("D", 3)])
+
+    p = path("abcd", "bc")
+    self.assertEqual(ses(p, "bc"), [("D", 0), ("D", 3)])
+
+  def test_insert(self):
+    p = path("", "a")
+    self.assertEqual(ses(p, "a"), [("I", 0, "a")])
+
+    p = path("", "abcd")
+    self.assertEqual(ses(p, "abcd"), [("I", 0, "a"), ("I", 0, "b"), ("I", 0, "c"), ("I", 0, "d")])
+
+  def test_delins(self):
+    p = path("abcd", "abef")
+    self.assertEqual(ses(p, "abef"), [("D", 2), ("D", 3), ("I", 4, "e"), ("I", 4, "f")])    
+
+class __Test_patch(unittest.TestCase):
+  def do_patch(self, a, b):
+    self.assertEqual(patch(ses(path(a, b), b), a), b)
+
+  def test_patch(self):
+    self.do_patch("", "hello")
+    self.do_patch("hello", "")
+    self.do_patch("hello", "hello")
+    self.do_patch("hello", "night night")
+    self.do_patch("hello", "help me")
+    self.do_patch("test bob", "kill bob")
+    self.do_patch("test bill", "test jane")
+
+if __name__ == "__main__":
+  unittest.main()

=== added file 'dxdiff/dxdiff/utils.py'
--- dxdiff/dxdiff/utils.py	1970-01-01 00:00:00 +0000
+++ dxdiff/dxdiff/utils.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,172 @@
+#!/usr/bin/env python
+
+#    This file is part of dxdiff.
+#
+#    dxdiff is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    dxdiff is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Diamond.  If not, see <http://www.gnu.org/licenses/>.
+
+def flatten(l):
+  """
+  Flattens a list of lists into a list.
+  """
+  return [item for sublist in l for item in sublist]
+
+def nub(l, reverse=False):
+  """
+  Removes duplicates from a list.
+  If reverse is true keeps the last duplicate item
+  as opposed to the first.
+  """
+  if reverse:
+    seen = {}
+    result = []
+    for item in reversed(l):
+      if item in seen: continue
+      seen[item] = 1
+      result.append(item)
+    return reversed(result)
+  else:
+    seen = {}
+    result = []
+    for item in l:
+      if item in seen: continue
+      seen[item] = 1
+      result.append(item)
+    return result
+
+def partial(fn, *cargs, **ckwargs):
+  """
+  Partial function application, taken from PEP 309.
+  """
+  ckwargs = ckwargs.copy()
+  def call_fn(*fargs, **fkwargs):
+    d = ckwargs
+    d.update(fkwargs)
+    return fn(*(cargs + fargs), **d)
+  return call_fn
+
+def irange(*args):
+  """
+  Similar to range but stop is an inclusive upper bound.
+  """
+  if len(args) == 0:
+    raise TypeError("irange expected at least 1 arguments, got 0")
+  elif len(args) == 1:
+    stop = args[0]
+    start = 0
+    step = 1
+  elif len(args) == 2:
+    start, stop = args
+    step = 1
+  elif len(args) == 3:
+    start, stop, step = args
+  else:
+    raise TypeError("irange expected at most 3 arguments, got " + str(len(args)))
+
+  if step == 0:
+    raise ValueError("irange() step argument must not be zero")
+
+  stop = stop + 1 if step > 0 else stop - 1
+  return range(start, stop, step)
+
+##################
+### Unit Tests ###
+##################
+
+import unittest
+
+class __Test_flatten(unittest.TestCase):
+  def test_type(self):
+    self.assertRaises(TypeError, flatten, 1, 2, 3)
+
+  def test_zero(self):
+    self.assertEqual(flatten([]), [])
+    self.assertEqual(flatten([[]]), [])
+    self.assertEqual(flatten([[], []]), [])
+  
+  def test_one(self):
+    self.assertEqual(flatten([[1]]), [1])
+    self.assertEqual(flatten([[1, 2], [3, 4]]), [1, 2, 3, 4])
+  
+  def test_two(self):
+    self.assertEqual(flatten([[[1, 2], [3, 4]], [[5, 6], [7, 8]]]), [[1, 2], [3, 4], [5, 6], [7, 8]])
+
+class __Test_nub(unittest.TestCase):
+  def test_zero(self):
+    self.assertEqual(nub([]), [])
+
+  def test_nodups(self):
+    self.assertEqual(nub([1, 2, 3, 4]), [1, 2, 3, 4])
+
+  def test_dups(self):
+    self.assertEqual(nub([1, 1, 2, 3, 4, 2]), [1, 2, 3, 4])
+
+class __Test_partial(unittest.TestCase):
+  def printer(*args, **kargs):
+    result = []
+    for arg in args:
+      result.append(str(args))
+    for k, v in kargs.items():
+      result.append(str(k) + ": " + str(v))
+    return ' '.join(result)
+  
+  def test_zero(self):
+    self.assertEqual(partial(self.printer)(), self.printer())
+  
+  def test_args(self):
+    self.assertEqual(partial(self.printer, 1)(), self.printer(1))
+    self.assertEqual(partial(self.printer)(1), self.printer(1))
+
+  def test_kargs(self):
+    self.assertEqual(partial(self.printer, a = 0)(), self.printer(a = 0))
+    self.assertEqual(partial(self.printer)(a = 0), self.printer(a = 0))
+ 
+class __Test_irange(unittest.TestCase):
+  def test_type(self):
+    self.assertRaises(TypeError, irange)
+    self.assertRaises(TypeError, irange, 0, 1, 2, 3)
+    self.assertRaises(TypeError, irange, 0, 1, 2, 3, 4)
+
+  def test_zerostep(self):
+    self.assertRaises(ValueError, irange, 0, 0, 0)
+    self.assertRaises(ValueError, irange, 1, 2, 0)
+
+  def test_zero(self):
+    self.assertEqual(irange(0), [0])
+
+  def test_stop(self):
+    self.assertEqual(irange(1), [0, 1])
+    self.assertEqual(irange(2), [0, 1, 2])
+
+  def test_start(self):
+    self.assertEqual(irange(5, 10), [5, 6, 7, 8, 9, 10])
+
+  def test_step(self):
+    self.assertEqual(irange(0, 4, 2), [0, 2, 4])
+    self.assertEqual(irange(0, 3, 2), [0, 2])
+
+  def test_negative(self):
+    self.assertEqual(irange(-10, -5), [-10, -9, -8, -7, -6, -5])
+    self.assertEqual(irange(-5, 5), [-5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5])
+
+  def test_negstep(self):
+    self.assertEqual(irange(5, 0, -1), [5, 4, 3, 2, 1, 0])
+    self.assertEqual(irange(2, -2, -1), [2, 1, 0, -1, -2])
+
+  def test_norange(self):
+    self.assertEqual(irange(5, 0), [])
+    self.assertEqual(irange(1, -1), [])
+    self.assertEqual(irange(0, 5, -1), [])
+
+if __name__ == "__main__":
+  unittest.main()

=== added file 'dxdiff/setup.py'
--- dxdiff/setup.py	1970-01-01 00:00:00 +0000
+++ dxdiff/setup.py	2011-08-24 16:38:18 +0000
@@ -0,0 +1,21 @@
+from distutils.core import setup
+import os
+import os.path
+import glob
+
+try:
+  destdir = os.environ["DESTDIR"]
+except KeyError:
+  destdir = ""
+
+setup(
+      name='dxdiff',
+      version='1.0',
+      description="An XML aware diff tool.",
+      author = "The ICOM team",
+      author_email = "[e-mail]",
+      url = "http://amcg.ese.ic.ac.uk",
+      packages = ['dxdiff'],
+      scripts=["dxdiff/dxdiff"],
+     )
+

=== modified file 'examples/show_ballistics' (properties changed: +x to -x)
=== modified file 'install-sh' (properties changed: +x to -x)