Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 7387:7e9a15fa6c8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update help on git diffs
author Matt Mackall <mpm@selenic.com>
date Tue, 18 Nov 2008 15:35:34 -0600
parents e17dbf140035
children 040484030491
comparison
equal deleted inserted replaced
7386:86bfd65532ac 7387:7e9a15fa6c8f
1003 Without the -a option, diff will avoid generating diffs of files 1003 Without the -a option, diff will avoid generating diffs of files
1004 it detects as binary. With -a, diff will generate a diff anyway, 1004 it detects as binary. With -a, diff will generate a diff anyway,
1005 probably with undesirable results. 1005 probably with undesirable results.
1006 1006
1007 Use the --git option to generate diffs in the git extended diff 1007 Use the --git option to generate diffs in the git extended diff
1008 format. Read the gitdiffs help topic for more information. 1008 format. Read the diffs help topic for more information.
1009 """ 1009 """
1010 node1, node2 = cmdutil.revpair(repo, opts.get('rev')) 1010 node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
1011 1011
1012 m = cmdutil.match(repo, pats, opts) 1012 m = cmdutil.match(repo, pats, opts)
1013 it = patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts)) 1013 it = patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts))
1040 Without the -a option, export will avoid generating diffs of files 1040 Without the -a option, export will avoid generating diffs of files
1041 it detects as binary. With -a, export will generate a diff anyway, 1041 it detects as binary. With -a, export will generate a diff anyway,
1042 probably with undesirable results. 1042 probably with undesirable results.
1043 1043
1044 Use the --git option to generate diffs in the git extended diff 1044 Use the --git option to generate diffs in the git extended diff
1045 format. Read the gitdiffs help topic for more information. 1045 format. Read the diffs help topic for more information.
1046 1046
1047 With the --switch-parent option, the diff will be against the second 1047 With the --switch-parent option, the diff will be against the second
1048 parent. It can be useful to review a merge. 1048 parent. It can be useful to review a merge.
1049 """ 1049 """
1050 if not changesets: 1050 if not changesets: