[Python-apps-commits] r3241 - in packages/mercurial/trunk/debian (5 files)

Tue Jul 7 16:58:25 UTC 2009

Date: Tuesday, July 7, 2009 @ 16:58:22
  Author: vt-guest
Revision: 3241

mercurial 1.3 (closes: #498711, #536009)

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
  packages/mercurial/trunk/debian/patches/deb_specific__mergetools
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc

Modified: packages/mercurial/trunk/debian/changelog
===================================================================

--- packages/mercurial/trunk/debian/changelog	2009-07-07 13:02:57 UTC (rev 3240)
+++ packages/mercurial/trunk/debian/changelog	2009-07-07 16:58:22 UTC (rev 3241)
@@ -1,4 +1,4 @@
-mercurial (1.2.1-4) UNRELEASED; urgency=low
+mercurial (1.3-1) UNRELEASED; urgency=low
 
   [ Vincent Danjean ]
   * [debian/control] add version to the quilt dependency. "dh --with quilt"
@@ -10,8 +10,15 @@
     - Pass --install-layout=deb option to setup.py install call.
     - Bump python-all-dev dependency to >= 2.5.4-1~.
 
- -- Vincent Danjean <vdanjean at debian.org>  Fri, 26 Jun 2009 14:49:15 +0000
+  [ Vernon Tang ]
+  * New upstream release. (closes: #536009)
+    - Experimental support for sub-repositories
+    - Fixed support for HTTPS through proxies (closes: #498711)
+    - Experimental share extension
+    - Updated translations and numerous small changes and bug fixes
 
+ -- Vernon Tang <vt at foilhead.net>  Wed, 08 Jul 2009 00:30:37 +0800
+
 mercurial (1.2.1-3) unstable; urgency=low
 
   * Only install (or remove) files in packages we are building

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2009-07-07 13:02:57 UTC (rev 3240)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2009-07-07 16:58:22 UTC (rev 3241)
@@ -1,22 +1,22 @@
 Support installation of templates handled by mercurial-common.install.
 
-diff -r 10dbbca89519 mercurial/templater.py
+diff -r b042642c1393 mercurial/templater.py
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
 @@ -9,7 +9,7 @@
  import re, sys, os
- from mercurial import util
+ import util, config, templatefilters
  
 -path = ['templates', '../templates']
 +path = ['templates', '../templates', '/usr/share/mercurial/templates']
+ stringify = templatefilters.stringify
  
  def parsestring(s, quoted=True):
-     '''parse a string using simple c-like syntax.
-diff -r 10dbbca89519 setup.py
+diff -r b042642c1393 setup.py
 --- a/setup.py
 +++ b/setup.py
-@@ -222,7 +222,7 @@
-     pass
+@@ -246,7 +246,7 @@
+         packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  
  datafiles = []
 -for root in ('templates',):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2009-07-07 13:02:57 UTC (rev 3240)
+++ packages/mercurial/trunk/debian/patches/deb_specific__mergetools	2009-07-07 16:58:22 UTC (rev 3241)
@@ -1,6 +1,6 @@
 Remove merge tools irrelevant to a Debian system and RCS merge and add vimdiff
 
-diff -r 11efa41037e2 contrib/mergetools.hgrc
+diff -r 196d40e7c885 contrib/mergetools.hgrc
 --- a/contrib/mergetools.hgrc
 +++ b/contrib/mergetools.hgrc
 @@ -12,8 +12,8 @@
@@ -31,7 +31,7 @@
 -filemerge.args=-left $other -right $local -ancestor $base -merge $output
 -filemerge.gui=True
 -
- beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo
+ 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

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2009-07-07 13:02:57 UTC (rev 3240)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2009-07-07 16:58:22 UTC (rev 3241)
@@ -1,22 +1,21 @@
 Use sensible-editor as default instead of vi.
 
-Index: mercurial-1.1.2/doc/hgrc.5.txt
-===================================================================
---- mercurial-1.1.2.orig/doc/hgrc.5.txt
-+++ mercurial-1.1.2/doc/hgrc.5.txt
-@@ -584,7 +584,7 @@
+diff -r 84488c99c405 doc/hgrc.5.txt
+--- a/doc/hgrc.5.txt
++++ b/doc/hgrc.5.txt
+@@ -715,7 +715,8 @@
    debug;;
      Print debugging information. True or False. Default is False.
    editor;;
--    The editor to use during a commit. Default is $EDITOR or "vi".
-+    The editor to use during a commit. Default is $EDITOR or "sensible-editor".
+-    The editor to use during a commit. Default is `$EDITOR` or "vi".
++    The editor to use during a commit. Default is `$EDITOR` or
++    "sensible-editor".
    fallbackencoding;;
      Encoding to try if it's not possible to decode the changelog using
      UTF-8. Default is ISO-8859-1.
-Index: mercurial-1.1.2/doc/ja/hg.1.ja.txt
-===================================================================
---- mercurial-1.1.2.orig/doc/ja/hg.1.ja.txt
-+++ mercurial-1.1.2/doc/ja/hg.1.ja.txt
+diff -r 84488c99c405 doc/ja/hg.1.ja.txt
+--- a/doc/ja/hg.1.ja.txt
++++ b/doc/ja/hg.1.ja.txt
 @@ -813,7 +813,7 @@
  EDITOR::
      ã“ã‚Œã¯ hgmerge ã‚¹ã‚¯ãƒªãƒ—ãƒˆä¸ã§ä½¿ã‚ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã®åå‰ã§ã™ã€‚ã‚‚ã—
@@ -26,10 +25,9 @@
  
  PYTHONPATH::
      ã“ã‚Œã¯ã‚¤ãƒ³ãƒãƒ¼ãƒˆã•ã‚Œã‚‹ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’è¦‹ã¤ã‘ã‚‹ãŸã‚ã« Python ã«ã‚ˆã£
-Index: mercurial-1.1.2/doc/ja/hgrc.5.ja.txt
-===================================================================
---- mercurial-1.1.2.orig/doc/ja/hgrc.5.ja.txt
-+++ mercurial-1.1.2/doc/ja/hgrc.5.ja.txt
+diff -r 84488c99c405 doc/ja/hgrc.5.ja.txt
+--- a/doc/ja/hgrc.5.ja.txt
++++ b/doc/ja/hgrc.5.ja.txt
 @@ -119,7 +119,7 @@
      ã§ã¯ False ã§ã™ã€‚
    editor;;
@@ -39,10 +37,9 @@
    interactive;;
      ãƒ¦ãƒ¼ã‚¶ã«å¯¾ã—ã¦ãƒ—ãƒãƒ³ãƒ—ãƒˆã‚’å‡ºã™ã‚ˆã†ã«ã—ã¾ã™ã€‚True ã‹ False ã‚’å–
      ã‚Šã¾ã™ã€‚ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ True ã§ã™ã€‚
-Index: mercurial-1.1.2/hgeditor
-===================================================================
---- mercurial-1.1.2.orig/hgeditor
-+++ mercurial-1.1.2/hgeditor
+diff -r 84488c99c405 hgeditor
+--- a/hgeditor
++++ b/hgeditor
 @@ -7,7 +7,7 @@
  # only for Mercurial, modify this:
  case "${EDITOR}" in
@@ -52,11 +49,10 @@
          ;;
      emacs)
          EDITOR="$EDITOR -nw"
-Index: mercurial-1.1.2/mercurial/commands.py
-===================================================================
---- mercurial-1.1.2.orig/mercurial/commands.py
-+++ mercurial-1.1.2/mercurial/commands.py
-@@ -928,8 +928,8 @@
+diff -r 84488c99c405 mercurial/commands.py
+--- a/mercurial/commands.py
++++ b/mercurial/commands.py
+@@ -1005,8 +1005,8 @@
      editor = ui.geteditor()
      cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
      if not cmdpath:
@@ -67,26 +63,24 @@
              ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
          else:
              ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
-Index: mercurial-1.1.2/mercurial/ui.py
-===================================================================
---- mercurial-1.1.2.orig/mercurial/ui.py
-+++ mercurial-1.1.2/mercurial/ui.py
-@@ -484,4 +484,4 @@
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
--                os.environ.get("EDITOR", "vi"))
-+             	os.environ.get("EDITOR", "sensible-editor"))
-Index: mercurial-1.1.2/mercurial/help.py
-===================================================================
---- mercurial-1.1.2.orig/mercurial/help.py
-+++ mercurial-1.1.2/mercurial/help.py
-@@ -157,7 +157,7 @@
-     The editor it uses is determined by looking at the environment
+diff -r 84488c99c405 mercurial/help.py
+--- a/mercurial/help.py
++++ b/mercurial/help.py
+@@ -252,7 +252,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 set
+     This is used by Python to find imported modules and may need to be
+diff -r 84488c99c405 mercurial/ui.py
+--- a/mercurial/ui.py
++++ b/mercurial/ui.py
+@@ -343,4 +343,4 @@
+         return (os.environ.get("HGEDITOR") or
+                 self.config("ui", "editor") or
+                 os.environ.get("VISUAL") or
+-                os.environ.get("EDITOR", "vi"))
++                os.environ.get("EDITOR", "sensible-editor"))

Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc	2009-07-07 13:02:57 UTC (rev 3240)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc	2009-07-07 16:58:22 UTC (rev 3241)
@@ -1,25 +1,22 @@
 Correct the documentation for the zeroconf extension.
 
-diff -r 15e292032969 hgext/zeroconf/__init__.py
+diff -r 151f1e65ad7b hgext/zeroconf/__init__.py
 --- a/hgext/zeroconf/__init__.py
 +++ b/hgext/zeroconf/__init__.py
-@@ -6,11 +6,11 @@
- # the GNU General Public License (version 2), incorporated herein by
- # reference.
+@@ -7,9 +7,9 @@
  
--'''zeroconf support for mercurial repositories
-+'''Zeroconf support for Mercurial repositories
+ '''discover and advertise repositories on the local network
  
--Zeroconf enabled repositories will be announced in a network without the need
--to configure a server or a service. They can be discovered without knowing
--their actual IP address.
-+The zeroconf extension will advertise "hg serve" instances over DNS-SD such
-+that they can be discovered without knowing the server's hostname, and give
-+the "hg paths" command the ability to discover such advertised repositories.
+-Zeroconf enabled repositories will be announced in a network without
+-the need to configure a server or a service. They can be discovered
+-without knowing their actual IP address.
++The zeroconf extension will advertise "hg serve" instances over DNS-SD so
++that they can be discovered using the "hg paths" command without knowing
++the server's address.
  
- To use the zeroconf extension add the following entry to your hgrc file:
- 
-@@ -23,7 +23,7 @@
+ To allow other people to discover your repository using run "hg serve"
+ in your repository.
+@@ -17,7 +17,7 @@
   $ cd test
   $ hg serve
  


