hgbook
changeset 286:f992b16d18a1
hg-interdiff: handle single-file diffs
author | Nicholas Riley <njriley@uiuc.edu> |
---|---|
date | Sun Jan 13 08:16:21 2008 -0800 (2008-01-13) |
parents | 814698eebbaf |
children | 0a5879ea5416 |
files | examples/hg-interdiff |
line diff
1.1 --- a/examples/hg-interdiff Fri Jan 04 22:09:00 2008 +0100 1.2 +++ b/examples/hg-interdiff Sun Jan 13 08:16:21 2008 -0800 1.3 @@ -15,6 +15,9 @@ 1.4 for f in files: 1.5 path = os.path.join(root, f) 1.6 yield path[len(base)+1:], path 1.7 + else: 1.8 + if os.path.isfile(base): 1.9 + yield '', base 1.10 1.11 # create list of unique file names under both directories. 1.12 files = dict(walk(sys.argv[1])) 1.13 @@ -23,8 +26,11 @@ 1.14 files.sort() 1.15 1.16 def name(base, f): 1.17 + if f: 1.18 + path = os.path.join(base, f) 1.19 + else: 1.20 + path = base 1.21 # interdiff requires two files; use /dev/null if one is missing. 1.22 - path = os.path.join(base, f) 1.23 if os.path.exists(path): 1.24 return path 1.25 return '/dev/null'