This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2976

extdiff: document that it copies modified files back to working directory
ClosedPublic

Authored by spectral on Mar 30 2018, 3:17 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG2208149c4b8e: extdiff: document that it copies modified files back to working directory

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Mar 30 2018, 3:17 PM
yuja accepted this revision.Mar 30 2018, 9:01 PM
This revision is now accepted and ready to land.Mar 30 2018, 9:01 PM
Closed by commit rHG2208149c4b8e: extdiff: document that it copies modified files back to working directory (authored by spectral). · Explain WhyMar 30 2018, 9:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (5 lines)
Mtests/test-extension.t (4 lines)

Diff 7452

hgext/extdiff.py

# extdiff.py - external diff program support for mercurial # extdiff.py - external diff program support for mercurial
# #
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
'''command to allow external programs to compare revisions '''command to allow external programs to compare revisions
The extdiff Mercurial extension allows you to use external programs The extdiff Mercurial extension allows you to use external programs
to compare revisions, or revision with working directory. The external to compare revisions, or revision with working directory. The external
diff programs are called with a configurable set of options and two diff programs are called with a configurable set of options and two
non-option arguments: paths to directories containing snapshots of non-option arguments: paths to directories containing snapshots of
files to compare. files to compare.
If there is more than one file being compared and the "child" revision
is the working directory, any modifications made in the external diff
program will be copied back to the working directory from the temporary
directory.
The extdiff extension also allows you to configure new diff commands, so The extdiff extension also allows you to configure new diff commands, so
you do not need to type :hg:`extdiff -p kdiff3` always. :: you do not need to type :hg:`extdiff -p kdiff3` always. ::
[extdiff] [extdiff]
# add new command that runs GNU diff(1) in 'context diff' mode # add new command that runs GNU diff(1) in 'context diff' mode
cdiff = gdiff -Nprc5 cdiff = gdiff -Nprc5
## or the old way: ## or the old way:
#cmd.cdiff = gdiff #cmd.cdiff = gdiff

tests/test-extension.t

$ hg help --extension extdiff $ hg help --extension extdiff
extdiff extension - command to allow external programs to compare revisions extdiff extension - command to allow external programs to compare revisions
The extdiff Mercurial extension allows you to use external programs to compare The extdiff Mercurial extension allows you to use external programs to compare
revisions, or revision with working directory. The external diff programs are revisions, or revision with working directory. The external diff programs are
called with a configurable set of options and two non-option arguments: paths called with a configurable set of options and two non-option arguments: paths
to directories containing snapshots of files to compare. to directories containing snapshots of files to compare.
If there is more than one file being compared and the "child" revision is the
working directory, any modifications made in the external diff program will be
copied back to the working directory from the temporary directory.
The extdiff extension also allows you to configure new diff commands, so you The extdiff extension also allows you to configure new diff commands, so you
do not need to type 'hg extdiff -p kdiff3' always. do not need to type 'hg extdiff -p kdiff3' always.
[extdiff] [extdiff]
# add new command that runs GNU diff(1) in 'context diff' mode # add new command that runs GNU diff(1) in 'context diff' mode
cdiff = gdiff -Nprc5 cdiff = gdiff -Nprc5
## or the old way: ## or the old way:
#cmd.cdiff = gdiff #cmd.cdiff = gdiff