Show More
@@ -120,7 +120,7 b' def dodiff(ui, repo, diffcmd, diffopts, ' | |||
|
120 | 120 | |
|
121 | 121 | revs = opts.get('rev') |
|
122 | 122 | change = opts.get('change') |
|
123 | args = ' '.join(diffopts) | |
|
123 | args = ' '.join(map(util.shellquote, diffopts)) | |
|
124 | 124 | do3way = '$parent2' in args |
|
125 | 125 | |
|
126 | 126 | if revs and change: |
@@ -281,8 +281,7 b' def uisetup(ui):' | |||
|
281 | 281 | path = util.findexe(cmd) |
|
282 | 282 | if path is None: |
|
283 | 283 | path = filemerge.findexternaltool(ui, cmd) or cmd |
|
284 | diffopts = ui.config('extdiff', 'opts.' + cmd, '') | |
|
285 | diffopts = diffopts and [diffopts] or [] | |
|
284 | diffopts = shlex.split(ui.config('extdiff', 'opts.' + cmd, '')) | |
|
286 | 285 | elif cmd.startswith('opts.'): |
|
287 | 286 | continue |
|
288 | 287 | else: |
@@ -5477,7 +5477,7 b' def root(ui, repo):' | |||
|
5477 | 5477 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
5478 | 5478 | _('FILE')), |
|
5479 | 5479 | ('d', 'daemon', None, _('run server in background')), |
|
5480 |
('', 'daemon-pipefds', '', _('used internally by daemon mode'), _(' |
|
|
5480 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')), | |
|
5481 | 5481 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
5482 | 5482 | # use string type, then we can check if something was passed |
|
5483 | 5483 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
@@ -19,6 +19,8 b' Should diff cloned directories:' | |||
|
19 | 19 | $ echo "[extdiff]" >> $HGRCPATH |
|
20 | 20 | $ echo "cmd.falabala=echo" >> $HGRCPATH |
|
21 | 21 | $ echo "opts.falabala=diffing" >> $HGRCPATH |
|
22 | $ echo "cmd.edspace=echo" >> $HGRCPATH | |
|
23 | $ echo 'opts.edspace="name <user@example.com>"' >> $HGRCPATH | |
|
22 | 24 | |
|
23 | 25 | $ hg falabala |
|
24 | 26 | diffing a.000000000000 a |
@@ -168,6 +170,16 b' Test extdiff with --option:' | |||
|
168 | 170 | diffing this */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) |
|
169 | 171 | [1] |
|
170 | 172 | |
|
173 | Test extdiff's handling of options with spaces in them: | |
|
174 | ||
|
175 | $ hg edspace -c 1 | |
|
176 | name <user@example.com> */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) | |
|
177 | [1] | |
|
178 | ||
|
179 | $ hg extdiff -p echo -o "name <user@example.com>" -c 1 | |
|
180 | name <user@example.com> */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) | |
|
181 | [1] | |
|
182 | ||
|
171 | 183 | Test with revsets: |
|
172 | 184 | |
|
173 | 185 | $ hg extdif -p echo -c "rev(1)" |
General Comments 0
You need to be logged in to leave comments.
Login now