##// END OF EJS Templates
extdiff: move from dict() construction to {} literals...
Augie Fackler -
r20674:2aafd585 default
parent child Browse files
Show More
@@ -207,10 +207,10 b' def dodiff(ui, repo, diffcmd, diffopts, '
207 207 # Function to quote file/dir names in the argument string.
208 208 # When not operating in 3-way mode, an empty string is
209 209 # returned for parent2
210 replace = dict(parent=dir1a, parent1=dir1a, parent2=dir1b,
211 plabel1=label1a, plabel2=label1b,
212 clabel=label2, child=dir2,
213 root=repo.root)
210 replace = {'parent': dir1a, 'parent1': dir1a, 'parent2': dir1b,
211 'plabel1': label1a, 'plabel2': label1b,
212 'clabel': label2, 'child': dir2,
213 'root': repo.root}
214 214 def quote(match):
215 215 key = match.group()[1:]
216 216 if not do3way and key == 'parent2':
@@ -316,7 +316,7 b' use %(path)s to diff repository (or sele'
316 316 that revision is compared to the working directory, and, when no
317 317 revisions are specified, the working directory files are compared
318 318 to its parent.\
319 ''') % dict(path=util.uirepr(path))
319 ''') % {'path': util.uirepr(path)}
320 320
321 321 # We must translate the docstring right away since it is
322 322 # used as a format string. The string will unfortunately
General Comments 0
You need to be logged in to leave comments. Login now