Show More
@@ -146,10 +146,10 b' def dodiff(ui, repo, diffcmd, diffopts, ' | |||||
146 | if node2: |
|
146 | if node2: | |
147 | dir2 = snapshot(ui, repo, modadd, node2, tmproot)[0] |
|
147 | dir2 = snapshot(ui, repo, modadd, node2, tmproot)[0] | |
148 | elif len(common) > 1: |
|
148 | elif len(common) > 1: | |
149 |
#we only actually need to get the files to copy back to |
|
149 | #we only actually need to get the files to copy back to | |
150 |
#dir in this case (because the other cases |
|
150 | #the working dir in this case (because the other cases | |
151 | #or single file -- in which case the file is already directly passed |
|
151 | #are: diffing 2 revisions or single file -- in which case | |
152 | #to the diff tool). |
|
152 | #the file is already directly passed to the diff tool). | |
153 | dir2, fns_and_mtime = snapshot(ui, repo, modadd, None, tmproot) |
|
153 | dir2, fns_and_mtime = snapshot(ui, repo, modadd, None, tmproot) | |
154 | else: |
|
154 | else: | |
155 | # This lets the diff tool open the changed file directly |
|
155 | # This lets the diff tool open the changed file directly | |
@@ -169,8 +169,9 b' def dodiff(ui, repo, diffcmd, diffopts, ' | |||||
169 | dir1b = os.devnull |
|
169 | dir1b = os.devnull | |
170 | dir2 = os.path.join(dir2root, dir2, common_file) |
|
170 | dir2 = os.path.join(dir2root, dir2, common_file) | |
171 |
|
171 | |||
172 | # Function to quote file/dir names in the argument string |
|
172 | # Function to quote file/dir names in the argument string. | |
173 |
# When not operating in 3-way mode, an empty string is |
|
173 | # When not operating in 3-way mode, an empty string is | |
|
174 | # returned for parent2 | |||
174 | replace = dict(parent=dir1a, parent1=dir1a, parent2=dir1b, child=dir2) |
|
175 | replace = dict(parent=dir1a, parent1=dir1a, parent2=dir1b, child=dir2) | |
175 | def quote(match): |
|
176 | def quote(match): | |
176 | key = match.group()[1:] |
|
177 | key = match.group()[1:] | |
@@ -257,13 +258,14 b' def uisetup(ui):' | |||||
257 | doc = _('''\ |
|
258 | doc = _('''\ | |
258 | use %(path)s to diff repository (or selected files) |
|
259 | use %(path)s to diff repository (or selected files) | |
259 |
|
260 | |||
260 |
Show differences between revisions for the specified files, using |
|
261 | Show differences between revisions for the specified files, using | |
261 | %(path)s program. |
|
262 | the %(path)s program. | |
262 |
|
263 | |||
263 |
When two revision arguments are given, then changes are shown |
|
264 | When two revision arguments are given, then changes are shown | |
264 |
those revisions. If only one revision is specified then |
|
265 | between those revisions. If only one revision is specified then | |
265 |
compared to the working directory, and, when no |
|
266 | that revision is compared to the working directory, and, when no | |
266 |
the working directory files are compared |
|
267 | revisions are specified, the working directory files are compared | |
|
268 | to its parent.\ | |||
267 | ''') % dict(path=util.uirepr(path)) |
|
269 | ''') % dict(path=util.uirepr(path)) | |
268 |
|
270 | |||
269 | # We must translate the docstring right away since it is |
|
271 | # We must translate the docstring right away since it is |
General Comments 0
You need to be logged in to leave comments.
Login now