[Python-apps-commits] r13246 - in packages/hg-git/trunk/debian (4 files)

[vicho at users.alioth.debian.org]

    Date: Friday, May 27, 2016 @ 13:24:50
  Author: vicho
Revision: 13246

Fix "FTBFS: AttributeError: 'overlaychangelog' object has no attribute 'changelogrevision'" by adding patches from_upstream__overlay_add_changelogrevision.patch and from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch (Closes: #823484)

Added:
  packages/hg-git/trunk/debian/patches/from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch
  packages/hg-git/trunk/debian/patches/from_upstream__overlay_add_changelogrevision.patch
  packages/hg-git/trunk/debian/patches/series
Modified:
  packages/hg-git/trunk/debian/changelog

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2016-05-27 09:25:11 UTC (rev 13245)
+++ packages/hg-git/trunk/debian/changelog	2016-05-27 13:24:50 UTC (rev 13246)
@@ -1,3 +1,13 @@
+hg-git (0.8.5-3) UNRELEASED; urgency=medium
+
+  * Fix "FTBFS: AttributeError: 'overlaychangelog' object has no attribute
+    'changelogrevision'" by adding patches
+    from_upstream__overlay_add_changelogrevision.patch and
+    from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch
+    (Closes: #823484)
+
+ -- Javi Merino <vicho at debian.org>  Fri, 27 May 2016 15:01:21 +0200
+
 hg-git (0.8.5-2) unstable; urgency=medium
 
   * Blacklist test-encoding.t during build also

Added: packages/hg-git/trunk/debian/patches/from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch
===================================================================
--- packages/hg-git/trunk/debian/patches/from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch	2016-05-27 13:24:50 UTC (rev 13246)
@@ -0,0 +1,19 @@
+Author: Martijn Pieters <mjpieters at fb.com>
+Origin: https://bitbucket.org/durin42/hg-git/commits/3f5c822b93b1
+Description: Update test to keep graph output stable across versions.
+ Mercurial 3.8 graph output has changed; set the 'missing parent' style back to
+ a pipe to keep the test output stable across versions.
+
+diff --git a/tests/test-extra.t b/tests/test-extra.t
+--- a/tests/test-extra.t
++++ b/tests/test-extra.t
+@@ -68,7 +68,7 @@ Test some nutty filenames
+   $ hg mv 'c2 => c3' 'c3 => c4'
+   warning: filename contains '>', which is reserved on Windows: 'c3 => c4'
+   $ fn_hg_commit -m 'test filename with arrow 2'
+-  $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3
++  $ hg log --graph --template "{rev} {node} {desc|firstline}\n{join(extras, ' ')}\n\n" -l 3 --config "experimental.graphstyle.missing=|"
+   @  6 bca4ba69a6844c133b069e227dfa043d41e3c197 test filename with arrow 2
+   |  branch=default
+   |
+

Added: packages/hg-git/trunk/debian/patches/from_upstream__overlay_add_changelogrevision.patch
===================================================================
--- packages/hg-git/trunk/debian/patches/from_upstream__overlay_add_changelogrevision.patch	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/from_upstream__overlay_add_changelogrevision.patch	2016-05-27 13:24:50 UTC (rev 13246)
@@ -0,0 +1,28 @@
+Author: Mateusz Kwapich <mitrandir at fb.com>
+Origin: https://bitbucket.org/durin42/hg-git/commits/49e363aebdd0
+Description: overlay: add changelogrevision
+ test-incoming.t was failing with latest mercurial head (345f4f) because we
+ didn't implement this method in the git overlay.
+
+diff --git a/hggit/overlay.py b/hggit/overlay.py
+--- a/hggit/overlay.py
++++ b/hggit/overlay.py
+@@ -6,6 +6,7 @@
+ 
+ from mercurial import (
+     ancestor,
++    changelog,
+     manifest,
+     context,
+ )
+@@ -324,6 +325,9 @@ class overlaychangelog(overlayrevlog):
+         except LookupError:
+             return overlaychangectx(self.repo, sha).totuple()
+ 
++    def changelogrevision(self, noderev):
++        return changelog._changelogrevision(*self.read(noderev))
++
+ class overlayrepo(object):
+     def __init__(self, handler, commits, refs):
+         self.handler = handler
+

Added: packages/hg-git/trunk/debian/patches/series
===================================================================
--- packages/hg-git/trunk/debian/patches/series	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/series	2016-05-27 13:24:50 UTC (rev 13246)
@@ -0,0 +1,2 @@
+from_upstream__overlay_add_changelogrevision.patch
+from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch