Control: tags 825248 + pending Dear maintainer,
I've prepared an NMU for hgview (versioned as 1.9.0-1.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -- WBR, wRAR
diff -u hgview-1.9.0/debian/changelog hgview-1.9.0/debian/changelog --- hgview-1.9.0/debian/changelog +++ hgview-1.9.0/debian/changelog @@ -1,3 +1,11 @@ +hgview (1.9.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix hgview-curses for Mercurial 3.8.2, patch by Zhang Jingqiang (Closes: + #825248) + + -- Andrey Rahmatullin <[email protected]> Sat, 26 Nov 2016 22:58:51 +0500 + hgview (1.9.0-1) unstable; urgency=medium [ Rémi Cardona ] diff -u hgview-1.9.0/debian/control hgview-1.9.0/debian/control --- hgview-1.9.0/debian/control +++ hgview-1.9.0/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: David Douard <[email protected]> Uploaders: Julien Cristau <[email protected]>, Alain Leufroy <[email protected]>, Pierre-Yves David <[email protected]>, Pierre-Yves David <[email protected]>, -Build-Depends: debhelper (>= 9), pyqt4-dev-tools, python (>=2.6.6-3~), xmlto, asciidoc, mercurial +Build-Depends: debhelper (>= 9), quilt, pyqt4-dev-tools, python (>=2.6.6-3~), xmlto, asciidoc, mercurial X-Python-Version: >= 2.5 Standards-Version: 3.9.1 Vcs-Hg: http://hg.logilab.org/master/hgview/ diff -u hgview-1.9.0/debian/rules hgview-1.9.0/debian/rules --- hgview-1.9.0/debian/rules +++ hgview-1.9.0/debian/rules @@ -12,7 +12,7 @@ #export DH_VERBOSE=1 %: - dh $@ --buildsystem=python_distutils --with python2 + dh $@ --buildsystem=python_distutils --with python2,quilt clean: dh clean only in patch2: unchanged: --- hgview-1.9.0.orig/debian/patches/mercurial-3.8.2.patch +++ hgview-1.9.0/debian/patches/mercurial-3.8.2.patch @@ -0,0 +1,31 @@ +--- a/hgviewlib/curses/graphlog.py.orig 2016-05-25 12:52:57.196775537 +0800 ++++ b/hgviewlib/curses/graphlog.py 2016-05-25 13:22:33.085859338 +0800 +@@ -312,6 +312,10 @@ + # some support of obsolete relation display + # assert -2 < coldiff < 2 + assert height > 0 ++ ++ echars = [] ++ echars.extend(('|', ' ') * (ncols + coldiff)) ++ + if coldiff == -1: + _fixlongrightedges(edges) + # add_padding_line says whether to rewrite +@@ -323,7 +327,7 @@ + # nodeline is the line containing the node character (typically o) + nodeline = ["|", " "] * idx + nodeline.extend([('GraphLog.node', char), " "]) +- nodeline.extend(_getnodelineedgestail(idx, state[1], ncols, coldiff, ++ nodeline.extend(_getnodelineedgestail(echars, idx, state[1], ncols, coldiff, + state[0], fix_nodeline_tail)) + # shift_interline is the line containing the non-vertical + # edges between this entry and the next +@@ -340,7 +344,7 @@ + shift_interline.extend(n_spaces * [" "]) + shift_interline.extend([edge_ch, " "] * (ncols - idx - 1)) + # draw edges from the current node to its parents +- _drawedges(edges, nodeline, shift_interline) ++ _drawedges(echars, edges, nodeline, shift_interline) + # lines is the list of all graph lines to print + lines = [nodeline] + if add_padding_line: only in patch2: unchanged: --- hgview-1.9.0.orig/debian/patches/series +++ hgview-1.9.0/debian/patches/series @@ -0,0 +1 @@ +mercurial-3.8.2.patch
signature.asc
Description: PGP signature
