[Python-apps-commits] r9478 - in packages/mercurial/branches/squeeze-backports/debian (5 files)

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Sat Mar 16 19:06:02 UTC 2013 

    Date: Saturday, March 16, 2013 @ 19:05:59
  Author: vicho
Revision: 9478

Merge revs 9378:9450 from wheezy into squeeze-backports

Added:
  packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch
    (from rev 9450, packages/mercurial/branches/wheezy/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch)
  packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch
    (from rev 9450, packages/mercurial/branches/wheezy/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch)
  packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch
    (from rev 9450, packages/mercurial/branches/wheezy/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch)
Modified:
  packages/mercurial/branches/squeeze-backports/debian/changelog
  packages/mercurial/branches/squeeze-backports/debian/patches/series

Modified: packages/mercurial/branches/squeeze-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/changelog	2013-03-16 15:04:27 UTC (rev 9477)
+++ packages/mercurial/branches/squeeze-backports/debian/changelog	2013-03-16 19:05:59 UTC (rev 9478)
@@ -1,3 +1,13 @@
+mercurial (2.2.2-3) unstable; urgency=low
+
+  * Fix "Backport improvement to vimdiff configuration" by adding
+    from_upstream__set_vimdiff_to_check_changed.patch,
+    from_upstream__mergetools_vimdiff_issue_warning.patch and
+    from_upstream__mergetools_refine_vimdiff_warning_message.patch
+    backported from upstream (Closes: #701168)
+
+ -- Javi Merino <vicho at debian.org>  Sat, 23 Feb 2013 19:52:22 +0000
+
 mercurial (2.2.2-2~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch (from rev 9450, packages/mercurial/branches/wheezy/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch	2013-03-16 19:05:59 UTC (rev 9478)
@@ -0,0 +1,21 @@
+Origin: http://hg.intevation.org/mercurial/crew/rev/7d66a44e87ed
+Description: mergetools: refine vimdiff warning message
+ We explicitly redraw before echoing the message so that it simply
+ displays at the bottom of the window. Also simplifies the message
+ printing by using 'echomsg' (which uses 'echohl' internally) and adds
+ the names of the software involved for improved Googleability.
+Bug: http://bugs.debian.org/701168
+
+diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
+--- a/contrib/mergetools.hgrc
++++ b/contrib/mergetools.hgrc
+@@ -15,7 +15,7 @@ gvimdiff.regkeyalt=Software\Wow6432Node\
+ gvimdiff.regname=path
+ gvimdiff.priority=-9
+ 
+-vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl'
++vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
+ vimdiff.check=changed
+ vimdiff.priority=-10
+ 
+

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch (from rev 9450, packages/mercurial/branches/wheezy/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch	2013-03-16 19:05:59 UTC (rev 9478)
@@ -0,0 +1,27 @@
+Origin: http://hg.intevation.org/mercurial/crew/rev/f2b1f78cf202
+Bug: http://bugs.debian.org/701168
+Subject: mergetools: vimdiff issue a warning explaining how to abort
+
+Adds a message displayed at each vimdiff invocation:
+
+  merge conflict detected, type ":cq" to abort
+
+Vimdiff is very confusing for non-vim user (not to speak about vim
+user confused anyway. However it is very likely that vimdiff is picked
+as the mergetool of choice when using the default config:
+- vim is available on all UNIX system.
+- Its one of the rare non graphical merge tools.
+
+diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
+--- a/contrib/mergetools.hgrc
++++ b/contrib/mergetools.hgrc
+@@ -15,7 +15,7 @@ gvimdiff.regkeyalt=Software\Wow6432Node\
+ gvimdiff.regname=path
+ gvimdiff.priority=-9
+ 
+-vimdiff.args=$local $other $base
++vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl'
+ vimdiff.check=changed
+ vimdiff.priority=-10
+ 
+

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch (from rev 9450, packages/mercurial/branches/wheezy/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch	2013-03-16 19:05:59 UTC (rev 9478)
@@ -0,0 +1,17 @@
+Origin: http://selenic.com/hg/rev/93bc65e970c0
+Description: mergetools.hgrc: set vimdiff to check=changed
+Bug: http://bugs.debian.org/701168
+Applied-Upstream: 2.3.2
+
+diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
+--- a/contrib/mergetools.hgrc
++++ b/contrib/mergetools.hgrc
+@@ -16,6 +16,7 @@ gvimdiff.regname=path
+ gvimdiff.priority=-9
+ 
+ vimdiff.args=$local $other $base
++vimdiff.check=changed
+ vimdiff.priority=-10
+ 
+ merge.checkconflicts=True
+

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/series	2013-03-16 15:04:27 UTC (rev 9477)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/series	2013-03-16 19:05:59 UTC (rev 9478)
@@ -8,3 +8,6 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
 from_upstream__reinclude_root_directory_in_directory_rename_detection.patch
+from_upstream__set_vimdiff_to_check_changed.patch
+from_upstream__mergetools_vimdiff_issue_warning.patch
+from_upstream__mergetools_refine_vimdiff_warning_message.patch

More information about the Python-apps-commits mailing list