Mercurial > hg
changeset 6042:2da5b19a6460
Merge with crew
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed, 06 Feb 2008 19:57:52 -0800 |
| parents | dd714452c26e (diff) dd3267698d84 (current diff) |
| children | 6283316bcfd4 |
| files | doc/hgmerge.1.txt doc/ja/hgmerge.1.ja.txt hgext/hbisect.py hgext/mq.py hgmerge mercurial/commands.py mercurial/patch.py templates/raw/header.tmpl tests/test-archive.out tests/test-help.out tests/test-notfound tests/test-notfound.out tests/test-ro-message tests/test-ro-message.out |
| diffstat | 4 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Wed Feb 06 11:42:04 2008 +0100 +++ b/hgext/mq.py Wed Feb 06 19:57:52 2008 -0800 @@ -2245,8 +2245,9 @@ "^qdiff": (diff, [('g', 'git', None, _('use git extended diff format')), + ('U', 'unified', 3, _('number of lines of context to show')), ] + commands.walkopts, - _('hg qdiff [-I] [-X] [-g] [FILE]...')), + _('hg qdiff [-I] [-X] [-U NUM] [-g] [FILE]...')), "qdelete|qremove|qrm": (delete, [('k', 'keep', None, _('keep patch file')),
--- a/mercurial/commands.py Wed Feb 06 11:42:04 2008 +0100 +++ b/mercurial/commands.py Wed Feb 06 19:57:52 2008 -0800 @@ -2832,6 +2832,8 @@ _('ignore changes in the amount of white space')), ('B', 'ignore-blank-lines', None, _('ignore changes whose lines are all blank')), + ('U', 'unified', 3, + _('number of lines of context to show')) ] + walkopts, _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), "^export":
--- a/mercurial/patch.py Wed Feb 06 11:42:04 2008 +0100 +++ b/mercurial/patch.py Wed Feb 06 19:57:52 2008 -0800 @@ -1056,7 +1056,8 @@ showfunc=get('show_function', 'showfunc'), ignorews=get('ignore_all_space', 'ignorews'), ignorewsamount=get('ignore_space_change', 'ignorewsamount'), - ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines')) + ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines'), + context=get('unified')) def updatedir(ui, repo, patches): '''Update dirstate after patch application according to metadata'''
--- a/tests/test-help.out Wed Feb 06 11:42:04 2008 +0100 +++ b/tests/test-help.out Wed Feb 06 19:57:52 2008 -0800 @@ -205,6 +205,7 @@ -w --ignore-all-space ignore white space when comparing lines -b --ignore-space-change ignore changes in the amount of white space -B --ignore-blank-lines ignore changes whose lines are all blank + -U --unified number of lines of context to show (default: 3) -I --include include names matching the given patterns -X --exclude exclude names matching the given patterns