# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1202356672 28800
# Node ID 2da5b19a6460ef6b31c24eeb813a37d461a44444
# Parent  dd714452c26e974fe650487bf1f7cc510eb63f6e# Parent  dd3267698d84458686b3c5682ce027438900ffbd
Merge with crew

diff -r dd3267698d84 -r 2da5b19a6460 hgext/mq.py
--- 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')),
diff -r dd3267698d84 -r 2da5b19a6460 mercurial/commands.py
--- 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":
diff -r dd3267698d84 -r 2da5b19a6460 mercurial/patch.py
--- 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'''
diff -r dd3267698d84 -r 2da5b19a6460 tests/test-archive.out
diff -r dd3267698d84 -r 2da5b19a6460 tests/test-help.out
--- 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