Merge lp:~jtaylor/ubuntu/natty/meld/meld-sru into lp:ubuntu/natty/meld

Proposed by Julian Taylor
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~jtaylor/ubuntu/natty/meld/meld-sru
Merge into: lp:ubuntu/natty/meld
Diff against target: 259 lines (+200/-2)
8 files modified
debian/changelog (+13/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/fix-786134.patch (+18/-0)
debian/patches/fix-svn-external-crash.patch (+21/-0)
debian/patches/fix-vcs-cwd.patch (+122/-0)
debian/patches/fix_iteration.patch (+18/-0)
debian/patches/series (+4/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/natty/meld/meld-sru
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Chase Douglas (community) Approve
Ubuntu branches Pending
Review via email: mp+72410@code.launchpad.net

Description of the change

SRU update for meld.
fixes a couple very annoying bugs.
All fixes are applied in oneiric with version 1.5.2

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

The proposed changes look good all around. A small issue is that the changelog should have UNRELEASED as the distro instead of natty-proposed unless it will be uploaded as is. Given the changelog email address, I doubt that's the case :). Whoever uploads the changes will be the one to flip it from UNRELEASED to natty-proposed.

The bug reports need proper SRU modifications. Please see https://wiki.ubuntu.com/StableReleaseUpdates?action=show&redirect=SRU#Procedure. In particular, a discussion of the regression potential of each fix is needed.

review: Needs Fixing
Revision history for this message
Julian Taylor (jtaylor) wrote :

thanks for taking a look.
I added some notes on the regression potentials to the bugs.
I consider it quite low for all issues. I have been using versions with the fixes since natty release as nattys meld is so broken.

Revision history for this message
Chase Douglas (chasedouglas) wrote :

The bugs look ok to me now. It would be nice to have the distro flipped back to UNRELEASED in this branch, but it can also be fixed by whoever is merging the branch. Thus, I'm approving the proposal.

review: Approve
31. By Julian Taylor

change distro target to UNRELEASED

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

I've uploaded the package to natty-proposed, and have subscribed ubuntu-sru to the bugs.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-01-19 14:50:11 +0000
3+++ debian/changelog 2011-08-22 19:07:25 +0000
4@@ -1,3 +1,16 @@
5+meld (1.5.0-0ubuntu1.1) UNRELEASED; urgency=low
6+
7+ * debian/patches/fix_iteration.patch
8+ - Fix hangup when comparing some files (LP: #774265)
9+ * debian/patches/fix-786134.patch
10+ - Fix another hangup when comparing some files (LP: #786134)
11+ * debian/patches/fix-svn-external-crash.patch
12+ - Fix crash when svn wc contains externals (LP: #787831)
13+ * debian/patches/fix-vcs-cwd.patch
14+ - allow opening vcs diff from outside of vcs-dir (LP: #770549)
15+
16+ -- Julian Taylor <jtaylor.debian@googlemail.com> Mon, 22 Aug 2011 13:17:43 +0200
17+
18 meld (1.5.0-0ubuntu1) natty; urgency=low
19
20 * New upstream release
21
22=== modified file 'debian/control'
23--- debian/control 2011-01-19 14:50:11 +0000
24+++ debian/control 2011-08-22 19:07:25 +0000
25@@ -6,7 +6,8 @@
26 Source: meld
27 Section: gnome
28 Priority: optional
29-Maintainer: Ross Burton <ross@debian.org>
30+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
31+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
32 Build-Depends: debhelper (>= 5),
33 cdbs,
34 gnome-pkg-tools
35
36=== modified file 'debian/control.in'
37--- debian/control.in 2011-01-19 14:50:11 +0000
38+++ debian/control.in 2011-08-22 19:07:25 +0000
39@@ -1,7 +1,8 @@
40 Source: meld
41 Section: gnome
42 Priority: optional
43-Maintainer: Ross Burton <ross@debian.org>
44+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
45+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
46 Build-Depends: debhelper (>= 5),
47 cdbs,
48 gnome-pkg-tools
49
50=== added file 'debian/patches/fix-786134.patch'
51--- debian/patches/fix-786134.patch 1970-01-01 00:00:00 +0000
52+++ debian/patches/fix-786134.patch 2011-08-22 19:07:25 +0000
53@@ -0,0 +1,18 @@
54+Description: fix handup when comparing certain files
55+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/786134
56+Origin: http://git.gnome.org/browse/meld/commit/?id=8c5a45f4308d05c74b2d54c4ca936b6f09fad5da
57+Applied-Upstream: 1.5.2
58+
59+Index: meld/meld/filediff.py
60+===================================================================
61+--- meld.orig/meld/filediff.py 2011-08-22 13:18:55.963064767 +0200
62++++ meld/meld/filediff.py 2011-08-22 13:18:56.693064771 +0200
63+@@ -897,7 +897,7 @@
64+ nextbit = "\r" + nextbit
65+ t.was_cr = False
66+ if len(nextbit):
67+- if (nextbit[-1] == "\r"):
68++ if nextbit[-1] == "\r" and len(nextbit) > 1:
69+ t.was_cr = True
70+ nextbit = nextbit[0:-1]
71+ t.buf.insert( t.buf.get_end_iter(), nextbit )
72
73=== added file 'debian/patches/fix-svn-external-crash.patch'
74--- debian/patches/fix-svn-external-crash.patch 1970-01-01 00:00:00 +0000
75+++ debian/patches/fix-svn-external-crash.patch 2011-08-22 19:07:25 +0000
76@@ -0,0 +1,21 @@
77+Description: fix crash when svn externals exist
78+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/787831
79+Origin: http://git.gnome.org/browse/meld/commit/?id=8d7e4aff715a933957a9cec99175fd15fec846a6
80+Applied-Upstream: 1.5.1
81+
82+diff --git a/meld/vc/svn.py b/meld/vc/svn.py
83+index 3652f84..07a4a2c 100644
84+--- a/meld/vc/svn.py
85++++ b/meld/vc/svn.py
86+@@ -91,7 +91,7 @@ class Vc(_vc.Vc):
87+ if item == "":
88+ continue
89+ rev = None
90+- if item != "unversioned":
91++ if "revision" in status.attrib:
92+ rev = status.attrib["revision"]
93+ matches.append((path, item, rev))
94+
95+--
96+1.7.5.4
97+
98
99=== added file 'debian/patches/fix-vcs-cwd.patch'
100--- debian/patches/fix-vcs-cwd.patch 1970-01-01 00:00:00 +0000
101+++ debian/patches/fix-vcs-cwd.patch 2011-08-22 19:07:25 +0000
102@@ -0,0 +1,122 @@
103+Description: allow opening vcs diff from outside of vcs-dir
104+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/770549
105+Origin: http://git.gnome.org/browse/meld/commit/?id=9da095e9c1d330e5e78474633c76c7efcbb4693b
106+Applied-Upstream: 1.5.2
107+
108+diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
109+index 777a74f..e9e8626 100644
110+--- a/meld/vc/bzr.py
111++++ b/meld/vc/bzr.py
112+@@ -67,7 +67,7 @@ class Vc(_vc.CachedVc):
113+ def resolved_command(self):
114+ return [self.CMD] + self.CMDARGS + ["resolve"]
115+ def valid_repo(self):
116+- if _vc.call([self.CMD, "check"]):
117++ if _vc.call([self.CMD, "check"], cwd=self.root):
118+ return False
119+ else:
120+ return True
121+diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
122+index 14071e0..151abe3 100644
123+--- a/meld/vc/cvs.py
124++++ b/meld/vc/cvs.py
125+@@ -50,7 +50,7 @@ class Vc(_vc.Vc):
126+ def revert_command(self):
127+ return [self.CMD,"update","-C"]
128+ def valid_repo(self):
129+- if _vc.call([self.CMD, "version"]):
130++ if _vc.call([self.CMD, "version"], cwd=self.root):
131+ return False
132+ else:
133+ return True
134+diff --git a/meld/vc/darcs.py b/meld/vc/darcs.py
135+index 6c1070c..5224d75 100644
136+--- a/meld/vc/darcs.py
137++++ b/meld/vc/darcs.py
138+@@ -71,7 +71,7 @@ class Vc(_vc.CachedVc):
139+ return [self.CMD, "resolve"]
140+
141+ def valid_repo(self):
142+- if _vc.call([self.CMD, "query", "tags"]):
143++ if _vc.call([self.CMD, "query", "tags"], cwd=self.root):
144+ return False
145+ else:
146+ return True
147+diff --git a/meld/vc/git.py b/meld/vc/git.py
148+index 82c6c23..23cb7a8 100644
149+--- a/meld/vc/git.py
150++++ b/meld/vc/git.py
151+@@ -67,7 +67,7 @@ class Vc(_vc.CachedVc):
152+ def revert_command(self):
153+ return [self.CMD,"checkout"]
154+ def valid_repo(self):
155+- if _vc.call([self.CMD, "branch"]):
156++ if _vc.call([self.CMD, "branch"], cwd=self.root):
157+ return False
158+ else:
159+ return True
160+@@ -82,7 +82,8 @@ class Vc(_vc.CachedVc):
161+ try:
162+ # Update the index before getting status, otherwise we could
163+ # be reading stale status information
164+- _vc.popen(["git", "update-index", "--refresh"])
165++ _vc.popen(["git", "update-index", "--refresh"],
166++ cwd=self.location)
167+
168+ # Get the status of files that are different in the "index" vs
169+ # the HEAD of the git repository
170+diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
171+index 77665cc..49860b6 100644
172+--- a/meld/vc/mercurial.py
173++++ b/meld/vc/mercurial.py
174+@@ -60,7 +60,7 @@ class Vc(_vc.Vc):
175+ def revert_command(self):
176+ return [self.CMD,"revert"]
177+ def valid_repo(self):
178+- if _vc.call([self.CMD, "root"]):
179++ if _vc.call([self.CMD, "root"], cwd=self.root):
180+ return False
181+ else:
182+ return True
183+diff --git a/meld/vc/monotone.py b/meld/vc/monotone.py
184+index 7d504c8..5867bc0 100644
185+--- a/meld/vc/monotone.py
186++++ b/meld/vc/monotone.py
187+@@ -144,7 +144,7 @@ class Vc(_vc.CachedVc):
188+ def resolved_command(self):
189+ return [self.CMD,"resolved"]
190+ def valid_repo(self):
191+- if _vc.call([self.CMD, "list", "tags"]):
192++ if _vc.call([self.CMD, "list", "tags"], cwd=self.root):
193+ return False
194+ else:
195+ return True
196+diff --git a/meld/vc/svn.py b/meld/vc/svn.py
197+index 07a4a2c..3de56ef 100644
198+--- a/meld/vc/svn.py
199++++ b/meld/vc/svn.py
200+@@ -61,7 +61,7 @@ class Vc(_vc.Vc):
201+ def resolved_command(self):
202+ return [self.CMD,"resolved"]
203+ def valid_repo(self):
204+- if _vc.call([self.CMD, "info"]):
205++ if _vc.call([self.CMD, "info"], cwd=self.root):
206+ return False
207+ else:
208+ return True
209+diff --git a/meld/vc/tla.py b/meld/vc/tla.py
210+index 82744a0..d3c01d7 100644
211+--- a/meld/vc/tla.py
212++++ b/meld/vc/tla.py
213+@@ -86,7 +86,7 @@ class Vc(_vc.CachedVc):
214+ return [self.CMD, "undo", "--"]
215+
216+ def valid_repo(self):
217+- if _vc.call([self.CMD, "tree-version"]):
218++ if _vc.call([self.CMD, "tree-version"], cwd=self.root):
219+ return False
220+ else:
221+ return True
222+--
223+1.7.5.4
224+
225
226=== added file 'debian/patches/fix_iteration.patch'
227--- debian/patches/fix_iteration.patch 1970-01-01 00:00:00 +0000
228+++ debian/patches/fix_iteration.patch 2011-08-22 19:07:25 +0000
229@@ -0,0 +1,18 @@
230+Subject: Fix hangup when comparing some files
231+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/774265
232+Origin: http://git.gnome.org/browse/meld/commit/?id=0e7cc5202895acbe5c23ca964e2962ea2d3cec2a
233+Applied-Upstream: 1.5.1
234+
235+Index: meld/meld/filediff.py
236+===================================================================
237+--- meld.orig/meld/filediff.py 2011-05-04 22:57:18.953377056 +0200
238++++ meld/meld/filediff.py 2011-05-04 22:57:22.683377055 +0200
239+@@ -115,6 +115,8 @@
240+ return lines
241+
242+ def __getitem__(self, i):
243++ if i > len(self):
244++ raise IndexError
245+ line_start = get_iter_at_line_or_eof(self.buf, i)
246+ line_end = line_start.copy()
247+ if not line_end.ends_line():
248
249=== modified file 'debian/patches/series'
250--- debian/patches/series 2011-01-19 14:50:11 +0000
251+++ debian/patches/series 2011-08-22 19:07:25 +0000
252@@ -1,3 +1,7 @@
253 sourceview-package.patch
254 python-path.patch
255 diff_tree_store.patch
256+fix_iteration.patch
257+fix-786134.patch
258+fix-svn-external-crash.patch
259+fix-vcs-cwd.patch

Subscribers

People subscribed via source and target branches

to all changes: