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

[vicho-guest at users.alioth.debian.org]

    Date: Sunday, March 6, 2011 @ 16:29:23
  Author: vicho-guest
Revision: 6736

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
  packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
  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__add_backquote_fname.patch
  packages/mercurial/trunk/debian/patches/from_upstream__fix_611420.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2011-03-06 16:29:23 UTC (rev 6736)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -340,8 +340,7 @@
+@@ -344,8 +344,7 @@
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2011-03-06 16:29:23 UTC (rev 6736)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -340,7 +340,7 @@
+@@ -344,7 +344,7 @@
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2011-03-06 16:29:23 UTC (rev 6736)
@@ -2,10 +2,10 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -9,7 +9,7 @@
- import sys, os
- import util, config, templatefilters
+@@ -194,7 +194,7 @@
  
+ # template engine
+ 
 -path = ['templates', '../templates']
 +path = ['templates', '../templates', '/usr/share/mercurial/templates']
  stringify = templatefilters.stringify
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -346,14 +346,6 @@
+@@ -350,14 +350,6 @@
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2011-03-06 16:29:23 UTC (rev 6736)
@@ -116,12 +116,12 @@
  
  try:
      from svn.core import SubversionException, Pool
-@@ -213,16 +214,19 @@
-         try:
-             SubversionException
-         except NameError:
--            raise MissingTool(_('Subversion python bindings could not be loaded'))
-+            raise MissingTool(_('Subversion python bindings could not be loaded') +
+@@ -210,16 +211,19 @@
+             raise NoRepo(_("%s does not look like a Subversion repository")
+                          % url)
+         if svn is None:
+-            raise MissingTool(_('Could not load Subversion python bindings'))
++            raise MissingTool(_('Could not load Subversion python bindings') +
 +                              _(' (try installing the %s package)') % 'python-subversion')
  
          try:
@@ -139,16 +139,15 @@
  
          self.lastrevs = {}
  
-@@ -960,6 +964,9 @@
+@@ -961,6 +965,8 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
 +        checktool('svn', debname='subversion')
 +        checktool('svnadmin', debname='subversion')
-+
-         converter_sink.__init__(self, ui, path)
-         commandline.__init__(self, ui, 'svn')
-         self.delete = []
+ 
+         if svn is None:
+             raise MissingTool(_('Could not load Subversion python bindings'))
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
 @@ -184,7 +184,8 @@

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-03-06 16:29:23 UTC (rev 6736)
@@ -2,7 +2,7 @@
 
 --- a/doc/hgrc.5.txt
 +++ b/doc/hgrc.5.txt
-@@ -879,7 +879,8 @@
+@@ -886,7 +886,8 @@
  ``debug``
      Print debugging information. True or False. Default is False.
  ``editor``
@@ -25,7 +25,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1405,8 +1405,8 @@
+@@ -1501,8 +1501,8 @@
      editor = ui.geteditor()
      cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
      if not cmdpath:
@@ -38,7 +38,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -570,7 +570,7 @@
+@@ -580,7 +580,7 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or
                  os.environ.get("VISUAL") or
@@ -49,7 +49,7 @@
          '''show a progress message
 --- a/i18n/da.po
 +++ b/i18n/da.po
-@@ -7372,7 +7372,7 @@
+@@ -7408,7 +7408,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -58,7 +58,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -10587,7 +10587,7 @@
+@@ -10714,7 +10714,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"
@@ -69,7 +69,7 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -8344,8 +8344,8 @@
+@@ -8447,8 +8447,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
@@ -80,7 +80,7 @@
  
  #, fuzzy
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13046,7 +13046,7 @@
+@@ -13289,7 +13289,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"
@@ -89,7 +89,7 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -13054,7 +13054,7 @@
+@@ -13297,7 +13297,7 @@
  "    Nachricht geschrieben wird. Der verwendete Editor wird aus den drei\n"
  "    Umgebungsvariablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge)\n"
  "    ermittelt. Der erste nicht-leere wird verwendet. Wenn alle Angaben\n"
@@ -162,7 +162,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -7608,8 +7608,8 @@
+@@ -7698,8 +7698,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -173,7 +173,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -11136,7 +11136,7 @@
+@@ -11339,7 +11339,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"
@@ -181,19 +181,19 @@
 +"    defaults to 'sensible-editor'."
  msgstr ""
  "EDITOR\n"
- "    コミット時のメッセージのように、 エディタでファイルを開き、 ユーザによ"
-@@ -11145,7 +11145,7 @@
- "VISUAL\n"
+ "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
+@@ -11347,7 +11347,7 @@
+ "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
- "    最初の空で無い値に設定された環境変数の値を使用します。 いずれも未設定\n"
--"    (あるいは空)ã®å ´åˆã¯ã€ 'vi' が使用されます。"
-+"    (あるいは空)ã®å ´åˆã¯ã€ 'sensible-editor' が使用されます。"
+ "    最初の空で無い値に設定された環境変数の値を使用します。\n"
+-"    いずれも未設定 (あるいは空) ã®å ´åˆã¯ã€ 'vi' が使用されます。"
++"    いずれも未設定 (あるいは空) ã®å ´åˆã¯ã€ 'sensible-editor' が使用されます。"
  
  msgid ""
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -8472,8 +8472,8 @@
+@@ -8484,8 +8484,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidação...\n"
  
@@ -204,7 +204,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (especifique um editor para consolidação em seu arquivo de configuração)\n"
-@@ -12067,7 +12067,7 @@
+@@ -12155,7 +12155,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"
@@ -213,7 +213,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -12075,7 +12075,7 @@
+@@ -12163,7 +12163,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"
@@ -224,7 +224,7 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -7097,7 +7097,7 @@
+@@ -7188,7 +7188,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -233,7 +233,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -10510,7 +10510,7 @@
+@@ -10683,7 +10683,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"

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__add_backquote_fname.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__add_backquote_fname.patch	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/for_upstream__add_backquote_fname.patch	2011-03-06 16:29:23 UTC (rev 6736)
@@ -1,35 +0,0 @@
-# HG changeset patch
-# Parent 259760fb51f780817bc76d0a27036428abd49da4
-doc: Add back quotes around filenames
-
-Filenames starting with a dot (.hg and .hgignore) confuse man when
-creating the ps documentation with "man -t hg >hg.ps" if they are not
-enclosed in back quotes.
-
-diff --git a/mercurial/commands.py b/mercurial/commands.py
---- a/mercurial/commands.py
-+++ b/mercurial/commands.py
-@@ -58,7 +58,7 @@ def addremove(ui, repo, *pats, **opts):
-     repository.
- 
-     New files are ignored if they match any of the patterns in
--    .hgignore. As with add, these changes take effect at the next
-+    ``.hgignore``. As with add, these changes take effect at the next
-     commit.
- 
-     Use the -s/--similarity option to detect renamed files. With a
-@@ -670,12 +670,12 @@ def clone(ui, source, dest=None, **opts)
-     basename of the source.
- 
-     The location of the source is added to the new repository's
--    .hg/hgrc file, as the default to be used for future pulls.
-+    ``.hg/hgrc`` file, as the default to be used for future pulls.
- 
-     See :hg:`help urls` for valid source format details.
- 
-     It is possible to specify an ``ssh://`` URL as the destination, but no
--    .hg/hgrc and working directory will be created on the remote side.
-+    ``.hg/hgrc`` and working directory will be created on the remote side.
-     Please see :hg:`help urls` for important details about ``ssh://`` URLs.
- 
-     A set of changesets (tags, or branch names) to pull may be specified

Deleted: packages/mercurial/trunk/debian/patches/from_upstream__fix_611420.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__fix_611420.patch	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/from_upstream__fix_611420.patch	2011-03-06 16:29:23 UTC (rev 6736)
@@ -1,70 +0,0 @@
-# HG changeset patch
-# User Jonathan Nieder <jrnieder at gmail.com>
-# Date 1296714464 21600
-# Node ID 02aa06a021a066cb360dc71097dedfa3ef123bb2
-# Parent  22167be007ed88baa00b2eeac62f84aac642190f
-backout: make help more explicit about what backout does
-
-The help for backout explains:
-
-   The backout command merges the reverse effect of the reverted
-   changeset into the working directory.
-
-Unfortunately, that does not make it obvious to a newcomer what the
-backout command does.  Since it performs a 3-way merge, what is the
-common ancestor?  Will the result be automatically committed?  What is
-this reverted changeset --- is it the rev passed with -r on the
-command line or its inverse?
-
-So try to clarify the description, avoiding jargon and being
-explicit about what happens from the user's perspective.
-
-Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for
-help.
-
-diff --git a/mercurial/commands.py b/mercurial/commands.py
---- a/mercurial/commands.py
-+++ b/mercurial/commands.py
-@@ -204,26 +204,22 @@
- def backout(ui, repo, node=None, rev=None, **opts):
-     '''reverse effect of earlier changeset
- 
--    The backout command merges the reverse effect of the reverted
--    changeset into the working directory.
--
--    With the --merge option, it first commits the reverted changes
--    as a new changeset. This new changeset is a child of the reverted
--    changeset.
--    The --merge option remembers the parent of the working directory
--    before starting the backout, then merges the new head with that
--    changeset afterwards.
--    This will result in an explicit merge in the history.
--
--    If you backout a changeset other than the original parent of the
--    working directory, the result of this merge is not committed,
--    as with a normal merge. Otherwise, no merge is needed and the
--    commit is automatic.
--
--    Note that the default behavior (without --merge) has changed in
--    version 1.7. To restore the previous default behavior, use
--    :hg:`backout --merge` and then :hg:`update --clean .` to get rid of
--    the ongoing merge.
-+    Prepare a new changeset with the effect of REV undone in the
-+    current working directory.
-+
-+    If REV is the parent of the working directory, then this changeset
-+    is committed automatically. Otherwise, hg needs to merge the
-+    changes and the merged result is left uncommitted.
-+
-+    By default, the pending changeset will have one parent,
-+    maintaining a linear history. With --merge, the pending changeset
-+    will instead have two parents: the old parent of the working
-+    directory and a child of REV that simply undoes REV.
-+
-+    Before version 1.7, the default behavior was equivalent to
-+    specifying --merge followed by :hg:`update --clean .` to cancel
-+    the merge and leave the child of REV as a head to be merged
-+    separately.
- 
-     See :hg:`help dates` for a list of formats valid for -d/--date.
- 

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2011-03-06 16:29:06 UTC (rev 6735)
+++ packages/mercurial/trunk/debian/patches/series	2011-03-06 16:29:23 UTC (rev 6736)
@@ -5,5 +5,3 @@
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
-for_upstream__add_backquote_fname.patch
-from_upstream__fix_611420.patch