equal
deleted
inserted
replaced
205 label2 = common_file + rev2 |
205 label2 = common_file + rev2 |
206 |
206 |
207 # Function to quote file/dir names in the argument string. |
207 # Function to quote file/dir names in the argument string. |
208 # When not operating in 3-way mode, an empty string is |
208 # When not operating in 3-way mode, an empty string is |
209 # returned for parent2 |
209 # returned for parent2 |
210 replace = dict(parent=dir1a, parent1=dir1a, parent2=dir1b, |
210 replace = {'parent': dir1a, 'parent1': dir1a, 'parent2': dir1b, |
211 plabel1=label1a, plabel2=label1b, |
211 'plabel1': label1a, 'plabel2': label1b, |
212 clabel=label2, child=dir2, |
212 'clabel': label2, 'child': dir2, |
213 root=repo.root) |
213 'root': repo.root} |
214 def quote(match): |
214 def quote(match): |
215 key = match.group()[1:] |
215 key = match.group()[1:] |
216 if not do3way and key == 'parent2': |
216 if not do3way and key == 'parent2': |
217 return '' |
217 return '' |
218 return util.shellquote(replace[key]) |
218 return util.shellquote(replace[key]) |
314 When two revision arguments are given, then changes are shown |
314 When two revision arguments are given, then changes are shown |
315 between those revisions. If only one revision is specified then |
315 between those revisions. If only one revision is specified then |
316 that revision is compared to the working directory, and, when no |
316 that revision is compared to the working directory, and, when no |
317 revisions are specified, the working directory files are compared |
317 revisions are specified, the working directory files are compared |
318 to its parent.\ |
318 to its parent.\ |
319 ''') % dict(path=util.uirepr(path)) |
319 ''') % {'path': util.uirepr(path)} |
320 |
320 |
321 # We must translate the docstring right away since it is |
321 # We must translate the docstring right away since it is |
322 # used as a format string. The string will unfortunately |
322 # used as a format string. The string will unfortunately |
323 # be translated again in commands.helpcmd and this will |
323 # be translated again in commands.helpcmd and this will |
324 # fail when the docstring contains non-ASCII characters. |
324 # fail when the docstring contains non-ASCII characters. |