| 
									
										
										
										
											2004-08-29 16:34:40 +00:00
										 |  |  | """ Command line interface to difflib.py providing diffs in four formats:
 | 
					
						
							| 
									
										
										
										
											2003-06-08 23:04:17 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | * ndiff:    lists every line and highlights interline changes. | 
					
						
							| 
									
										
										
										
											2004-08-29 16:34:40 +00:00
										 |  |  | * context:  highlights clusters of changes in a before/after format. | 
					
						
							| 
									
										
										
										
											2003-06-08 23:04:17 +00:00
										 |  |  | * unified:  highlights clusters of changes in an inline format. | 
					
						
							| 
									
										
										
										
											2004-08-29 16:34:40 +00:00
										 |  |  | * html:     generates side by side comparison with change highlights. | 
					
						
							| 
									
										
										
										
											2003-06-08 23:04:17 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | """
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-25 00:12:32 +03:00
										 |  |  | import sys, os, difflib, argparse | 
					
						
							| 
									
										
										
										
											2012-06-22 12:46:19 -04:00
										 |  |  | from datetime import datetime, timezone | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | def file_mtime(path): | 
					
						
							|  |  |  |     t = datetime.fromtimestamp(os.stat(path).st_mtime, | 
					
						
							|  |  |  |                                timezone.utc) | 
					
						
							|  |  |  |     return t.astimezone().isoformat() | 
					
						
							| 
									
										
										
										
											2003-06-08 23:04:17 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-08-09 17:27:55 +00:00
										 |  |  | def main(): | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-07-15 13:23:58 +03:00
										 |  |  |     parser = argparse.ArgumentParser() | 
					
						
							|  |  |  |     parser.add_argument('-c', action='store_true', default=False, | 
					
						
							|  |  |  |                         help='Produce a context format diff (default)') | 
					
						
							|  |  |  |     parser.add_argument('-u', action='store_true', default=False, | 
					
						
							|  |  |  |                         help='Produce a unified format diff') | 
					
						
							|  |  |  |     parser.add_argument('-m', action='store_true', default=False, | 
					
						
							|  |  |  |                         help='Produce HTML side by side diff ' | 
					
						
							|  |  |  |                              '(can use -c and -l in conjunction)') | 
					
						
							|  |  |  |     parser.add_argument('-n', action='store_true', default=False, | 
					
						
							|  |  |  |                         help='Produce a ndiff format diff') | 
					
						
							|  |  |  |     parser.add_argument('-l', '--lines', type=int, default=3, | 
					
						
							|  |  |  |                         help='Set number of context lines (default 3)') | 
					
						
							|  |  |  |     parser.add_argument('fromfile') | 
					
						
							|  |  |  |     parser.add_argument('tofile') | 
					
						
							|  |  |  |     options = parser.parse_args() | 
					
						
							| 
									
										
										
										
											2004-08-09 17:27:55 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     n = options.lines | 
					
						
							| 
									
										
										
										
											2014-07-15 13:23:58 +03:00
										 |  |  |     fromfile = options.fromfile | 
					
						
							|  |  |  |     tofile = options.tofile | 
					
						
							| 
									
										
										
										
											2004-08-09 17:27:55 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-06-22 12:46:19 -04:00
										 |  |  |     fromdate = file_mtime(fromfile) | 
					
						
							|  |  |  |     todate = file_mtime(tofile) | 
					
						
							| 
									
										
										
										
											2013-11-23 22:12:06 +02:00
										 |  |  |     with open(fromfile) as ff: | 
					
						
							| 
									
										
										
										
											2012-06-22 12:46:19 -04:00
										 |  |  |         fromlines = ff.readlines() | 
					
						
							| 
									
										
										
										
											2013-11-23 22:12:06 +02:00
										 |  |  |     with open(tofile) as tf: | 
					
						
							| 
									
										
										
										
											2012-06-22 12:46:19 -04:00
										 |  |  |         tolines = tf.readlines() | 
					
						
							| 
									
										
										
										
											2004-08-09 17:27:55 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     if options.u: | 
					
						
							|  |  |  |         diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n) | 
					
						
							|  |  |  |     elif options.n: | 
					
						
							|  |  |  |         diff = difflib.ndiff(fromlines, tolines) | 
					
						
							| 
									
										
										
										
											2004-08-29 16:34:40 +00:00
										 |  |  |     elif options.m: | 
					
						
							|  |  |  |         diff = difflib.HtmlDiff().make_file(fromlines,tolines,fromfile,tofile,context=options.c,numlines=n) | 
					
						
							| 
									
										
										
										
											2004-08-09 17:27:55 +00:00
										 |  |  |     else: | 
					
						
							|  |  |  |         diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     sys.stdout.writelines(diff) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | if __name__ == '__main__': | 
					
						
							|  |  |  |     main() |