Show More
@@ -7,14 +7,13 b'' | |||||
7 |
|
7 | |||
8 | '''command to allow external programs to compare revisions |
|
8 | '''command to allow external programs to compare revisions | |
9 |
|
9 | |||
10 | The `extdiff' Mercurial extension allows you to use external programs |
|
10 | The `extdiff' Mercurial extension allows you to use external programs to | |
11 |
|
|
11 | compare revisions, or revision with working directory. The external diff | |
12 | programs are called with a configurable set of options and two |
|
12 | programs are called with a configurable set of options and two non-option | |
13 |
|
|
13 | arguments: paths to directories containing snapshots of files to compare. | |
14 | files to compare. |
|
|||
15 |
|
14 | |||
16 | The `extdiff' extension also allows to configure new diff commands, so |
|
15 | The `extdiff' extension also allows to configure new diff commands, so you do | |
17 |
|
|
16 | not need to type "hg extdiff -p kdiff3" always. | |
18 |
|
17 | |||
19 | [extdiff] |
|
18 | [extdiff] | |
20 | # add new command that runs GNU diff(1) in 'context diff' mode |
|
19 | # add new command that runs GNU diff(1) in 'context diff' mode | |
@@ -29,16 +28,15 b' you do not need to type "hg extdiff -p k' | |||||
29 | # add new command called meld, runs meld (no need to name twice) |
|
28 | # add new command called meld, runs meld (no need to name twice) | |
30 | meld = |
|
29 | meld = | |
31 |
|
30 | |||
32 | # add new command called vimdiff, runs gvimdiff with DirDiff plugin |
|
31 | # add new command called vimdiff, runs gvimdiff with DirDiff plugin (see | |
33 |
# |
|
32 | # http://www.vim.org/scripts/script.php?script_id=102) Non English user, be | |
34 |
# |
|
33 | # sure to put "let g:DirDiffDynamicDiffText = 1" in your .vimrc | |
35 | # your .vimrc |
|
|||
36 | vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' |
|
34 | vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' | |
37 |
|
35 | |||
38 | You can use -I/-X and list of file or directory names like normal "hg |
|
36 | You can use -I/-X and list of file or directory names like normal "hg diff" | |
39 |
|
|
37 | command. The `extdiff' extension makes snapshots of only needed files, so | |
40 |
|
|
38 | running the external diff program will actually be pretty fast (at least | |
41 |
|
|
39 | faster than having to compare the entire tree). | |
42 | ''' |
|
40 | ''' | |
43 |
|
41 | |||
44 | from mercurial.i18n import _ |
|
42 | from mercurial.i18n import _ | |
@@ -159,20 +157,20 b' def dodiff(ui, repo, diffcmd, diffopts, ' | |||||
159 | def extdiff(ui, repo, *pats, **opts): |
|
157 | def extdiff(ui, repo, *pats, **opts): | |
160 | '''use external program to diff repository (or selected files) |
|
158 | '''use external program to diff repository (or selected files) | |
161 |
|
159 | |||
162 | Show differences between revisions for the specified files, using |
|
160 | Show differences between revisions for the specified files, using an | |
163 |
|
|
161 | external program. The default program used is diff, with default options | |
164 |
|
|
162 | "-Npru". | |
165 |
|
163 | |||
166 | To select a different program, use the -p/--program option. The |
|
164 | To select a different program, use the -p/--program option. The program | |
167 |
|
|
165 | will be passed the names of two directories to compare. To pass additional | |
168 |
|
|
166 | options to the program, use -o/--option. These will be passed before the | |
169 |
|
|
167 | names of the directories to compare. | |
170 |
|
168 | |||
171 | When two revision arguments are given, then changes are shown |
|
169 | When two revision arguments are given, then changes are shown between | |
172 |
|
|
170 | those revisions. If only one revision is specified then that revision is | |
173 |
|
|
171 | compared to the working directory, and, when no revisions are specified, | |
174 |
|
|
172 | the working directory files are compared to its parent. | |
175 | to its parent.''' |
|
173 | ''' | |
176 | program = opts['program'] or 'diff' |
|
174 | program = opts['program'] or 'diff' | |
177 | if opts['program']: |
|
175 | if opts['program']: | |
178 | option = opts['option'] |
|
176 | option = opts['option'] |
General Comments 0
You need to be logged in to leave comments.
Login now