Mercurial > hg > config

annotate python/ymldiff.py @ 694:ebca6d85213a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
File "/usr/lib/python3/dist-packages/IPython/config/__init__.py", line 16, in <module> from .application import * File "/usr/lib/python3/dist-packages/IPython/config/application.py", line 31, in <module> from IPython.config.configurable import SingletonConfigurable File "/usr/lib/python3/dist-packages/IPython/config/configurable.py", line 33, in <module> from IPython.utils.text import indent, wrap_paragraphs File "/usr/lib/python3/dist-packages/IPython/utils/text.py", line 28, in <module> from IPython.external.path import path File "/usr/lib/python3/dist-packages/IPython/external/path/__init__.py", line 2, in <module> from path import * File "/home/jhammel/python/path.py", line 25 print root(path) ^
author Jeff Hammel <k0scist@gmail.com>
date Wed, 09 Jul 2014 16:26:49 -0700
parents d213d21e371b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
220
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
1 #!/usr/bin/env python
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
2
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
3 import datadiff
221
d213d21e371b fix silly mistakes
Jeff Hammel <jhammel@mozilla.com>
parents: 220
diff changeset
4 import optparse
220
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
5 import sys
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
6 import yaml
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
7
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
8 def main(args=sys.argv[1:]):
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
9 usage = '%prog [options] from.yml to.yml'
221
d213d21e371b fix silly mistakes
Jeff Hammel <jhammel@mozilla.com>
parents: 220
diff changeset
10 parser = optparse.OptionParser(usage=usage)
220
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
11 options, args = parser.parse_args()
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
12 if len(args) != 2:
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
13 parser.error("Please supply two .yml files")
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
14
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
15 # compare the output
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
16 output0 = yaml.load(file(args[0]))
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
17 output1 = yaml.load(file(args[1]))
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
18 diff = datadiff.diff(output0, output1, context=1, fromfile=args[0], tofile=args[1])
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
19 print diff
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
20
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
21 if __name__ == '__main__':
192015ae3e4c add ymldiff.py, requires datadiff and pyyaml to be installed
Jeff Hammel <jhammel@mozilla.com>
parents:
diff changeset
22 main()