[Python-apps-commits] r4946 - in packages/mercurial/trunk/debian/patches (6 files)

vdanjean at users.alioth.debian.org vdanjean at users.alioth.debian.org
Fri Mar 12 14:54:36 UTC 2010 

    Date: Friday, March 12, 2010 @ 14:54:35
  Author: vdanjean
Revision: 4946

Refresh patches

remove "fix tests output" (was due to local install in fact)
remove "don't install i18n" (fixed upstream)

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__mergetools
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/for_upstream__fix_tests_output.patch
  packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n

Modified: packages/mercurial/trunk/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2010-03-12 14:54:21 UTC (rev 4945)
+++ packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2010-03-12 14:54:35 UTC (rev 4946)
@@ -1,43 +1,17 @@
-Remove merge tools irrelevant to a Debian system and RCS merge and add vimdiff
+Add vimdiff to mergetools
 
-diff -r 196d40e7c885 contrib/mergetools.hgrc
 --- a/contrib/mergetools.hgrc
 +++ b/contrib/mergetools.hgrc
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,11 @@
  gvimdiff.regname=path
  gvimdiff.priority=-9
  
--merge.checkconflicts=True
--merge.priority=-10
 +vimdiff.args=$local $other $base
 +vimdiff.priority=-10
++
+ merge.checkconflicts=True
+-merge.priority=-10
++merge.priority=-11
  
  gpyfm.gui=True
  
-@@ -38,26 +38,11 @@
- p4merge.gui=True
- p4merge.priority=-8
- 
--tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
--tortoisemerge.regkey=Software\TortoiseSVN
--tortoisemerge.checkchanged=True
--tortoisemerge.gui=True
--
- ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
- ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
- ecmerge.gui=True
- 
--filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
--filemerge.args=-left $other -right $local -ancestor $base -merge $output
--filemerge.gui=True
--
- beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
- beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
- beyondcompare3.regname=ExePath
- beyondcompare3.gui=True
--
--winmerge.args=/e /u /dl local /dr other /wr $local $other $output
--winmerge.regkey=Software\Thingamahoochie\WinMerge
--winmerge.regname=Executable
--winmerge.checkchanged=True
--winmerge.gui=True

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-03-12 14:54:21 UTC (rev 4945)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-03-12 14:54:35 UTC (rev 4946)
@@ -2,7 +2,7 @@
 
 --- a/hgext/bugzilla.py
 +++ b/hgext/bugzilla.py
-@@ -421,7 +421,8 @@
+@@ -423,7 +423,8 @@
          global MySQLdb
          MySQLdb = mysql
      except ImportError, err:
@@ -14,7 +14,7 @@
          raise util.Abort(_('hook type %s does not pass a changeset id') %
 --- a/hgext/convert/bzr.py
 +++ b/hgext/convert/bzr.py
-@@ -42,7 +42,8 @@
+@@ -43,7 +43,8 @@
              # access bzrlib stuff
              branch
          except NameError:
@@ -26,10 +26,10 @@
          self._checkrepotype(path)
 --- a/hgext/convert/common.py
 +++ b/hgext/convert/common.py
-@@ -26,11 +26,12 @@
+@@ -27,11 +27,12 @@
+ class MissingTool(Exception):
+     pass
  
- class MissingTool(Exception): pass
- 
 -def checktool(exe, name=None, abort=True):
 +def checktool(exe, name=None, abort=True, debname=None):
      name = name or exe
@@ -39,8 +39,8 @@
 +        raise exc(_('cannot find required "%s" tool') % name +
 +                  (debname and _(' (try installing the %s package)') % debname or ''))
  
- class NoRepo(Exception): pass
- 
+ class NoRepo(Exception):
+     pass
 --- a/hgext/convert/cvs.py
 +++ b/hgext/convert/cvs.py
 @@ -21,7 +21,7 @@
@@ -54,7 +54,7 @@
          self.files = {}
 --- a/hgext/convert/darcs.py
 +++ b/hgext/convert/darcs.py
-@@ -35,14 +35,15 @@
+@@ -39,14 +39,15 @@
          if not os.path.exists(os.path.join(path, '_darcs')):
              raise NoRepo("%s does not look like a darcs repo" % path)
  
@@ -97,7 +97,7 @@
  
 --- a/hgext/convert/monotone.py
 +++ b/hgext/convert/monotone.py
-@@ -55,7 +55,7 @@
+@@ -61,7 +61,7 @@
          self.files = None
          self.dirs  = None
  
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -952,6 +956,9 @@
+@@ -961,6 +965,9 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-03-12 14:54:21 UTC (rev 4945)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-03-12 14:54:35 UTC (rev 4946)
@@ -2,7 +2,7 @@
 
 --- a/doc/hgrc.5.txt
 +++ b/doc/hgrc.5.txt
-@@ -745,7 +745,8 @@
+@@ -763,7 +763,8 @@
  ``debug``
      Print debugging information. True or False. Default is False.
  ``editor``
@@ -12,28 +12,6 @@
  ``fallbackencoding``
      Encoding to try if it's not possible to decode the changelog using
      UTF-8. Default is ISO-8859-1.
---- a/doc/ja/hg.1.ja.txt
-+++ b/doc/ja/hg.1.ja.txt
-@@ -813,7 +813,7 @@
- EDITOR::
-     これは hgmerge スクリプト中で使われるエディタの名前です。もし
-     HGEDITOR が設定されていなければ、コミット時のメッセージに使わ
--    れます。デフォルトは 'vi' です。
-+    れます。デフォルトは 'sensible-editor' です。
- 
- PYTHONPATH::
-     これはインポートされるモジュールを見つけるために Python によっ
---- a/doc/ja/hgrc.5.ja.txt
-+++ b/doc/ja/hgrc.5.ja.txt
-@@ -119,7 +119,7 @@
-     では False です。
-   editor;;
-     コミット中に使用するエディタです。デフォルトは $EDITOR か
--    "vi" です。
-+    "sensible-editor" です。
-   interactive;;
-     ユーザに対してプロンプトを出すようにします。True か False を取
-     ります。デフォルトでは True です。
 --- a/hgeditor
 +++ b/hgeditor
 @@ -7,7 +7,7 @@
@@ -47,7 +25,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1019,8 +1019,8 @@
+@@ -1050,8 +1050,8 @@
      editor = ui.geteditor()
      cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
      if not cmdpath:
@@ -60,7 +38,7 @@
              ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -353,7 +353,7 @@
+@@ -384,7 +384,7 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or
                  os.environ.get("VISUAL") or
@@ -69,29 +47,9 @@
  
      def progress(self, topic, pos, item="", unit="", total=None):
          '''show a progress message
---- a/help/environment.txt
-+++ b/help/environment.txt
-@@ -69,7 +69,7 @@
-     editor it uses is determined by looking at the environment
-     variables HGEDITOR, VISUAL and EDITOR, in that order. The first
-     non-empty one is chosen. If all of them are empty, the editor
--    defaults to 'vi'.
-+    defaults to 'sensible-editor'.
- 
- PYTHONPATH
-     This is used by Python to find imported modules and may need to be
 --- a/i18n/da.po
 +++ b/i18n/da.po
-@@ -308,7 +308,7 @@
- "    editor it uses is determined by looking at the environment\n"
- "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
- "    non-empty one is chosen. If all of them are empty, the editor\n"
--"    defaults to 'vi'.\n"
-+"    defaults to 'sensible-editor'.\n"
- "\n"
- "PYTHONPATH\n"
- "    This is used by Python to find imported modules and may need to be\n"
-@@ -6094,7 +6094,7 @@
+@@ -5701,7 +5701,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -100,6 +58,15 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
+@@ -8363,7 +8363,7 @@
+ "    editor it uses is determined by looking at the environment\n"
+ "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+ "    non-empty one is chosen. If all of them are empty, the editor\n"
+-"    defaults to 'vi'.\n"
++"    defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ "    This is used by Python to find imported modules and may need to be\n"
 --- a/i18n/de.po
 +++ b/i18n/de.po
 @@ -314,7 +314,7 @@
@@ -124,7 +91,7 @@
  msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
 --- a/i18n/el.po
 +++ b/i18n/el.po
-@@ -222,7 +222,7 @@
+@@ -225,7 +225,7 @@
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -133,7 +100,7 @@
  "\n"
  "PYTHONPATH\n"
  "    This is used by Python to find imported modules and may need to be\n"
-@@ -5377,7 +5377,7 @@
+@@ -5630,7 +5630,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -186,7 +153,18 @@
  msgstr " (specificare un editore per il commit nel proprio file .hgrc)\n"
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -415,7 +415,7 @@
+@@ -6171,8 +6171,8 @@
+ msgid "Checking commit editor...\n"
+ msgstr "メッセージ入力用エディタの検証中...\n"
+ 
+-msgid " No commit editor set and can't find vi in PATH\n"
+-msgstr " エディタが起動できません(vi にも PATH が通っていません)\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
++msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n"
+ 
+ msgid " (specify a commit editor in your .hgrc file)\n"
+ msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
+@@ -9136,7 +9136,7 @@
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -195,7 +173,7 @@
  "\n"
  "PYTHONPATH\n"
  "    This is used by Python to find imported modules and may need to be\n"
-@@ -497,7 +497,7 @@
+@@ -9228,7 +9228,7 @@
  "    編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n"
@@ -204,20 +182,22 @@
  "\n"
  "PYTHONPATH\n"
  "    Mercurial が当該システムの共有領域にインストールされていない場合、\n"
-@@ -6869,8 +6869,8 @@
+--- a/i18n/pt_BR.po
++++ b/i18n/pt_BR.po
+@@ -7148,10 +7148,10 @@
  msgid "Checking commit editor...\n"
- msgstr "メッセージ入力用エディタの検証中...\n"
+ msgstr "Verificando editor para consolidação...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
--msgstr " エディタが起動できません(vi にも PATH が通っていません)\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n"
+ msgstr ""
+ " Nenhum editor para consolidação configurado, e não foi possível encontrar "
+-"'vi' no PATH\n"
++"'sensible-editor' no PATH\n"
  
  msgid " (specify a commit editor in your .hgrc file)\n"
- msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
---- a/i18n/pt_BR.po
-+++ b/i18n/pt_BR.po
-@@ -357,7 +357,7 @@
+ msgstr " (especifique um editor para consolidação em seu arquivo .hgrc)\n"
+@@ -10198,7 +10198,7 @@
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -226,7 +206,7 @@
  "\n"
  "PYTHONPATH\n"
  "    This is used by Python to find imported modules and may need to be\n"
-@@ -439,7 +439,7 @@
+@@ -10290,7 +10290,7 @@
  "    mensagens de consolidação. O editor usado é determinado pela\n"
  "    consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
  "    nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
@@ -235,22 +215,18 @@
  "\n"
  "PYTHONPATH\n"
  "    Isto é usado pelo Python para localizar módulos importados, e\n"
-@@ -7850,10 +7850,10 @@
+--- a/i18n/sv.po
++++ b/i18n/sv.po
+@@ -5357,7 +5357,7 @@
  msgid "Checking commit editor...\n"
- msgstr "Verificando editor para consolidação...\n"
+ msgstr ""
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
  msgstr ""
- " Nenhum editor para consolidação configurado, e não foi possível encontrar "
--"'vi' no PATH\n"
-+"'sensible-editor' no PATH\n"
  
  msgid " (specify a commit editor in your .hgrc file)\n"
- msgstr " (especifique um editor para consolidação em seu arquivo .hgrc)\n"
---- a/i18n/sv.po
-+++ b/i18n/sv.po
-@@ -229,7 +229,7 @@
+@@ -8262,7 +8262,7 @@
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -259,15 +235,6 @@
  "\n"
  "PYTHONPATH\n"
  "    This is used by Python to find imported modules and may need to be\n"
-@@ -5476,7 +5476,7 @@
- msgid "Checking commit editor...\n"
- msgstr ""
- 
--msgid " No commit editor set and can't find vi in PATH\n"
-+msgid " No commit editor set and can't find sensible-editor in PATH\n"
- msgstr ""
- 
- msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/i18n/zh_CN.po
 +++ b/i18n/zh_CN.po
 @@ -5190,7 +5190,7 @@
@@ -308,3 +275,14 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
+--- a/mercurial/help/environment.txt
++++ b/mercurial/help/environment.txt
+@@ -79,7 +79,7 @@
+     editor it uses is determined by looking at the environment
+     variables HGEDITOR, VISUAL and EDITOR, in that order. The first
+     non-empty one is chosen. If all of them are empty, the editor
+-    defaults to 'vi'.
++    defaults to 'sensible-editor'.
+ 
+ PYTHONPATH
+     This is used by Python to find imported modules and may need to be

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__fix_tests_output.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__fix_tests_output.patch	2010-03-12 14:54:21 UTC (rev 4945)
+++ packages/mercurial/trunk/debian/patches/for_upstream__fix_tests_output.patch	2010-03-12 14:54:35 UTC (rev 4946)
@@ -1,23 +0,0 @@
-Correct test output so that the test suite pass
---- a/tests/test-hgweb-commands.out
-+++ b/tests/test-hgweb-commands.out
-@@ -781,7 +781,7 @@
- var revlink = '<li style="_STYLE"><span class="desc">';
- revlink += '<a class="list" href="/rev/_NODEID?style=gitweb" title="_NODEID"><b>_DESC</b></a>';
- revlink += '</span> _TAGS';
--revlink += '<span class="info">_DATE, by _USER</span></li>';
-+revlink += '<span class="info">_DATE ago, by _USER</span></li>';
- 
- graph.vertex = function(x, y, color, parity, cur) {
- 	
---- a/tests/test-hgweb-empty.out
-+++ b/tests/test-hgweb-empty.out
-@@ -217,7 +217,7 @@
- 
- var revlink = '<li style="_STYLE"><span class="desc">';
- revlink += '<a href="/rev/_NODEID" title="_NODEID">_DESC</a>';
--revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
-+revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
- 
- graph.vertex = function(x, y, color, parity, cur) {
- 	

Deleted: packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n	2010-03-12 14:54:21 UTC (rev 4945)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n	2010-03-12 14:54:35 UTC (rev 4946)
@@ -1,14 +0,0 @@
-Don't install the i18n folder; it's pointless to do so since the compiled
-translations are in the locale folder.
-
---- a/setup.py
-+++ b/setup.py
-@@ -256,7 +256,7 @@
-         packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
- 
- datafiles = []
--for root in ('templates', 'i18n', 'help'):
-+for root in ('templates', 'help'):
-     for dir, dirs, files in os.walk(root):
-         dirs[:] = [x for x in dirs if not x.startswith('.')]
-         files = [x for x in files if not x.startswith('.')]

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2010-03-12 14:54:21 UTC (rev 4945)
+++ packages/mercurial/trunk/debian/patches/series	2010-03-12 14:54:35 UTC (rev 4946)
@@ -1,7 +1,5 @@
-for_upstream__fix_tests_output.patch
 for_upstream__add_doc_url_in_example_files.patch
 deb_specific__mergetools
-proposed_upstream__dont-install-i18n
 deb_specific__install-templates-separately
 deb_specific__install-help-separately
 deb_specific__python-module-not-script.patch

More information about the Python-apps-commits mailing list