equal
deleted
inserted
replaced
5 # This software may be used and distributed according to the terms of the |
5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2, incorporated herein by reference. |
6 # GNU General Public License version 2, incorporated herein by reference. |
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 |
11 to compare revisions, or revision with working directory. The external |
11 to compare revisions, or revision with working directory. The external |
12 diff programs are called with a configurable set of options and two |
12 diff programs are called with a configurable set of options and two |
13 non-option arguments: paths to directories containing snapshots of |
13 non-option arguments: paths to directories containing snapshots of |
14 files to compare. |
14 files to compare. |
15 |
15 |
16 The `extdiff' extension also allows to configure new diff commands, so |
16 The extdiff extension also allows to configure new diff commands, so |
17 you do not need to type "hg extdiff -p kdiff3" always. :: |
17 you do not need to type "hg extdiff -p kdiff3" always. :: |
18 |
18 |
19 [extdiff] |
19 [extdiff] |
20 # add new command that runs GNU diff(1) in 'context diff' mode |
20 # add new command that runs GNU diff(1) in 'context diff' mode |
21 cdiff = gdiff -Nprc5 |
21 cdiff = gdiff -Nprc5 |
34 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in |
34 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in |
35 # your .vimrc |
35 # your .vimrc |
36 vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' |
36 vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' |
37 |
37 |
38 You can use -I/-X and list of file or directory names like normal "hg |
38 You can use -I/-X and list of file or directory names like normal "hg |
39 diff" command. The `extdiff' extension makes snapshots of only needed |
39 diff" command. The extdiff extension makes snapshots of only needed |
40 files, so running the external diff program will actually be pretty |
40 files, so running the external diff program will actually be pretty |
41 fast (at least faster than having to compare the entire tree). |
41 fast (at least faster than having to compare the entire tree). |
42 ''' |
42 ''' |
43 |
43 |
44 from mercurial.i18n import _ |
44 from mercurial.i18n import _ |