Closed Bug 303683 Opened 19 years ago Closed 13 years ago

[PatchReader] Filenames on patch diffs are corrupted when using PatchReader > v0.9.2

Categories

(Bugzilla :: Attachments & Requests, defect)

2.19.1
defect
Not set
normal

Tracking

()

RESOLVED FIXED

People

(Reporter: wicked, Assigned: wicked)

References

()

Details

This problem can, for example, be seen at https://bugzilla.mozilla.org/attachment.cgi?id=184686&action=diff, notice how second subdirectory is always incorrectly prefixed with "mai". I tracked this down to be a regression caused by a fix in PatchReader v0.9.3. Here's the relevant IRC log regarding this problem: [2005-07-07 15:11:26] <@Zornreich> LpSolit: diff problems are due to DOS line endings in files [2005-07-07 15:12:12] <@LpSolit> this explains why wurblzap' patch is affected. He uses Windows [2005-07-07 15:12:39] <@Zornreich> PatchReader/FixPatchRoot.pm failes to remove trailing ,v because of that (line 81) [2005-07-07 15:13:15] <@LpSolit> Zornreich: is it a regression? [2005-07-07 15:13:17] <@Zornreich> and so next line failes to remove exactly three chars from filename [2005-07-07 15:13:36] <@LpSolit> I never saw this problem before [2005-07-07 15:13:57] <@Zornreich> that file hasn't changed between 0.9.2 and 0.9.5 of PatchReader [2005-07-07 15:14:04] <@LpSolit> strange [2005-07-07 15:14:28] <@Zornreich> hmm.. but regexps extracting the RCS filename might have. hang on. [2005-07-07 15:15:20] <@Zornreich> it was changed from /^RCS file: (\S+)/ to /^RCS file: (.+)/ [2005-07-07 15:15:34] <@Zornreich> and $1 would be taken to be RCS filename [2005-07-07 15:15:56] <timely> that's a bogus change [2005-07-07 15:18:28] <@Zornreich> if I change it back, the bug goes away [2005-07-07 15:18:42] <@Zornreich> so it really is a regression in PatchReader module [2005-07-07 15:19:12] <@Zornreich> actually in PatchReader/Raw.pm module [2005-07-07 15:20:32] <@Zornreich> that change was introduced in v0.9.3 of PatchReader. [2005-07-07 15:20:53] <@Zornreich> Changes state for that version "Fix problem with patches with spaces in them" [2005-07-07 15:21:16] <@Zornreich> justdave: so downgrade to PatchReader 0.9.2 to fix this :) ... [2005-07-07 15:23:06] <@LpSolit> Zornreich: wait. I have 0.9.5 but I don't see this problem [2005-07-07 15:23:54] <@Zornreich> LpSolit: you need to be using PatchReader/FixPatchRoot.pm and to use that you need to have cvsroot param defined in Bugzilla ... [2005-08-06 17:24:46] <@LpSolit> Zornreich: you are right, the problem is still present with 0.9.5
Per comment 0 url, and bug 288038 comment 13, this initial issue is WorksForMe now. But <https://bugzilla.mozilla.org/attachment.cgi?id=226538&action=diff> has a new issue: "(-) mozilla/xpfe/cxpfe/components/shistory/src/nsSHistory.cpp (-3 / +7 lines)": notice the extra "/cxpfe" :-(
Blocks: 288038
This seems to be related to and possibly a duplicate of bug 288038
Not, that's unrelated.
Blocks: bz-patch
No longer blocks: 288038
Summary: Filenames on patch diffs are corrupted when using PatchReader > v0.9.2 → [PatchReader] Filenames on patch diffs are corrupted when using PatchReader > v0.9.2
[Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.9a3pre) Gecko/20070306 SeaMonkey/1.5a] (nightly) (W2Ksp4) (For the record) My comment 1 stands, with current b.m.o BugZilla version, whatever it is.
Assignee: attach-and-request → john
(In reply to comment #0) > [2005-07-07 15:15:20] <@Zornreich> it was changed from /^RCS file: (\S+)/ to > /^RCS file: (.+)/ > [2005-07-07 15:15:34] <@Zornreich> and $1 would be taken to be RCS filename > [2005-07-07 15:15:56] <timely> that's a bogus change > [2005-07-07 15:18:28] <@Zornreich> if I change it back, the bug goes away > [2005-07-07 15:18:42] <@Zornreich> so it really is a regression in PatchReader > module > [2005-07-07 15:19:12] <@Zornreich> actually in PatchReader/Raw.pm module > [2005-07-07 15:20:32] <@Zornreich> that change was introduced in v0.9.3 of > PatchReader. > [2005-07-07 15:20:53] <@Zornreich> Changes state for that version "Fix problem > with patches with spaces in them" > [2005-07-07 15:21:16] <@Zornreich> justdave: so downgrade to PatchReader 0.9.2 > to fix this :) > ... See bug 288038 attachment 190249 [details] [diff] [review] for a possible hint/patch...
[Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.9a5pre) Gecko/20070515 SeaMonkey/1.5a] (nightly) (W2Ksp4) Bug still there, after "2008-03-27 bmo upgrade" (tracked by bug 425607). (That's BugZilla v3.0.3 !?)
Not a blocker. This is a bug in PatchReader itself, not in Bugzilla. And I don't want to implement a workaround in a hurry, especially on a stable branch.
Flags: blocking3.0.4? → blocking3.0.4-
FWIW, I filed n°35362 : PatchReader-0.9.5 bug report: ++/-- line issues <http://rt.cpan.org/Public/Bug/Display.html?id=35362> about this bug too.
(In reply to comment #8) > FWIW, I filed > n°35362 : PatchReader-0.9.5 bug report: ++/-- line issues Good luck! jkeiser is not very responsive these days. :) And there are several other fixes which are required in PatchReader (such as removing the assumption that it's still running Bugzilla 2.x, which forces us to declare some global variables which are only required by PatchReader).
(In reply to comment #9) > Good luck! jkeiser is not very responsive these days. :) And there are several I noticed. But worth a try. :-| > other fixes which are required in PatchReader (such as removing the assumption > that it's still running Bugzilla 2.x, which forces us to declare some global > variables which are only required by PatchReader). What would be the plan in case jkeiser never get back to it ? (fork a new PatchReader "branch", move to another software, ... ?)
Three issues are mixed up in this bug: Comment 0 : Wrong subdirectory name because of RCS line ending, (example 'mai' in attachment 184686 [details] [diff] [review]). This worksforme. Comment 1 : Wrong subdirectory name because 'Attic/' is part of the RCS file name (attachment 226538 [details] [diff] [review]). I don't see this issue mainly in Patch Reader because Index: and RCS file: point to different files. A patch for this is on: http://rt.cpan.org/Ticket/Display.html?id=40467. Comment 8 : The "++/-- line issue" is a duplicate of bug 233695 The plan for taking over Patch Reader is bug 386251 comment 4
Assignee: john → attach-and-request
Fixed in PatchReader 0.9.6.
Assignee: attach-and-request → wicked
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.