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