Changing convention for diff files -- don't include the first two lines (containing the URLs).

levkowetz · levkowetz · commit d079e859bfeb · 2007-06-29T18:35:37.000Z
- Legacy-Id: 775
diff --git a/ietf/tests.py b/ietf/tests.py
@@ -345,7 +345,7 @@ def doUrlsTest(self, lst):
                             else:
                                 contextlines = 0
                                 difflist = list(unified_diff(goodtext, testtext, master, url, "", "", contextlines, lineterm=""))
-                                diff = "\n".join(difflist)
+                                diff = "\n".join(difflist[2:])
                                 log("Checking diff: %s" % diff[:96])
                                 keys = module.diffchunks.keys()
                                 keys.sort
diff --git a/test/diff/_ann_nomcom_1230_ b/test/diff/_ann_nomcom_1230_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/show_nomcom_message.cgi?id=1230 
-+++ /ann/nomcom/1230/ 
 @@ -3,2 +3,2 @@
 -IETF Announcement Date: June 3, 2007 Subject: IETF Nomcom Appointment
 -- 2007-2008
diff --git a/test/diff/_drafts_ b/test/diff/_drafts_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/idindex.cgi 
-+++ /drafts/ 
 @@ -16,1 +16,0 @@
 -I-D Exists
 @@ -546,2 +545,2 @@
diff --git a/test/diff/_drafts_rfc_ b/test/diff/_drafts_rfc_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc 
-+++ /drafts/rfc/ 
 @@ -12,1 +12,1 @@
 -Published I-Ds sorted by UNKNOWN
 +Published I-Ds sorted by Filename
diff --git a/test/diff/_drafts_rfc__search_name b/test/diff/_drafts_rfc__search_name
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name 
-+++ /drafts/rfc/?sort=name 
 @@ -1123,0 +1123,1 @@
 +draft-ietf-hubmib-etherif-MIB-06 1998-08-06 RFC 2358 I-D Exists
 @@ -1124,1 +1125,0 @@
diff --git a/test/diff/_idtracker_ b/test/diff/_idtracker_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/pidtracker.cgi 
-+++ /idtracker/ 
 @@ -68,0 +68,1 @@
 +--All Substates
 @@ -73,1 +74,0 @@
diff --git a/test/diff/_idtracker_12689_ b/test/diff/_idtracker_12689_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0 
-+++ /idtracker/12689/ 
 @@ -40,2 +40,3 @@
 -This draft is basically ready for publication, but has nits and more
 -...
diff --git a/test/diff/_idtracker__search_group_acronym__search_job_owner_0_search_rfcnumber__search_status_id__sub_state_id_6_search_cur_state__search_button_SEARCH_search_filename_bgp-m_search_area_acronym_ b/test/diff/_idtracker__search_group_acronym__search_job_owner_0_search_rfcnumber__search_status_id__sub_state_id_6_search_cur_state__search_button_SEARCH_search_filename_bgp-m_search_area_acronym_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/pidtracker.cgi?command=search_list&search_job_owner=0&search_group_acronym=&search_status_id=&search_cur_state=&sub_state_id=6&search_filename=bgp-m&search_rfcnumber=&search_area_acronym=&search_button=SEARCH 
-+++ /idtracker/?search_group_acronym=&search_job_owner=0&search_rfcnumber=&search_status_id=&sub_state_id=6&search_cur_state=&search_button=SEARCH&search_filename=bgp-m&search_area_acronym= 
 @@ -67,0 +67,1 @@
 +--All Substates
 @@ -72,1 +73,0 @@
diff --git a/test/diff/_idtracker_ballot_1760_ b/test/diff/_idtracker_ballot_1760_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/pidtracker.cgi?command=print_ballot&ballot_id=1760&filename=draft-ietf-isis-link-attr 
-+++ /idtracker/ballot/1760/ 
 @@ -7,1 +7,1 @@
 -https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0
 +https://datatracker.ietf.org/idtracker/ballot/1760/
diff --git a/test/diff/_idtracker_comment_65232_ b/test/diff/_idtracker_comment_65232_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/pidtracker.cgi?command=view_comment&id=65232 
-+++ /idtracker/comment/65232/ 
 @@ -5,2 +5,0 @@
 -State before Comment: 0
 -State after Comment: 0
diff --git a/test/diff/_idtracker_draft-ietf-isis-link-attr_ b/test/diff/_idtracker_draft-ietf-isis-link-attr_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0 
-+++ /idtracker/draft-ietf-isis-link-attr/ 
 @@ -40,2 +40,3 @@
 -This draft is basically ready for publication, but has nits and more
 -...
diff --git a/test/diff/_idtracker_draft-ietf-isis-link-attr_comment_65232_ b/test/diff/_idtracker_draft-ietf-isis-link-attr_comment_65232_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/pidtracker.cgi?command=view_comment&id=65232 
-+++ /idtracker/draft-ietf-isis-link-attr/comment/65232/ 
 @@ -5,2 +5,0 @@
 -State before Comment: 0
 -State after Comment: 0
diff --git a/test/diff/_iesg_ann_1563_ b/test/diff/_iesg_ann_1563_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/previous_announcement.cgi?command=show_detail&ballot_id=1563 
-+++ /iesg/ann/1563/ 
 @@ -1,0 +1,7 @@
 +IESG Announcement
 +This page contains an IESG Protocol, Document, or Working Group Action
diff --git a/test/diff/_iesg_ann_2422_ b/test/diff/_iesg_ann_2422_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/recent_announcement.cgi?command=show_detail&ballot_id=2422 
-+++ /iesg/ann/2422/ 
 @@ -1,0 +1,6 @@
 +IESG Announcement
 +This page contains an IESG Protocol, Document, or Working Group Action
diff --git a/test/diff/_iesg_ann_prev_ b/test/diff/_iesg_ann_prev_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/previous_announcement.cgi 
-+++ /iesg/ann/prev/ 
 @@ -314,0 +314,1 @@
 +Date Sent: April 4, 2002
 @@ -468,1 +469,0 @@
diff --git a/test/diff/_ipr_about_ b/test/diff/_ipr_about_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_disclosure.cgi 
-+++ /ipr/about/ 
 @@ -5,2 +5,2 @@
 -Technology" (updated by RFC4879, "Clarification of the Thrid Party
 -Disclosure Procedure in RFC3979".)
diff --git a/test/diff/_ipr_ipr-657_ b/test/diff/_ipr_ipr-657_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=657 
-+++ /ipr/ipr-657/ 
 @@ -43,3 +43,4 @@
 -Licensing information, comments, notes, or URL for further information
 -:
diff --git a/test/diff/_ipr_ipr-795_ b/test/diff/_ipr_ipr-795_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=795 
-+++ /ipr/ipr-795/ 
 @@ -23,4 +23,2 @@
 -Relates
 -Title:
diff --git a/test/diff/_ipr_ipr-834_ b/test/diff/_ipr_ipr-834_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=834 
-+++ /ipr/ipr-834/ 
 @@ -30,4 +30,2 @@
 -Relates
 -Title:
diff --git a/test/diff/_ipr_new-generic_ b/test/diff/_ipr_new-generic_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_generic.cgi 
-+++ /ipr/new-generic/ 
 @@ -9,1 +9,1 @@
 -Note: According to Section 6.4.3 ofRFC3979, "Intellectual Property
 +Note: According to Section 6.4.3 of RFC3979, "Intellectual Property
diff --git a/test/diff/_ipr_new-specific_ b/test/diff/_ipr_new-specific_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr.cgi 
-+++ /ipr/new-specific/ 
 @@ -16,0 +16,1 @@
 +Fields marked with * are required.
 @@ -17,2 +18,2 @@
diff --git a/test/diff/_ipr_new-third-party_ b/test/diff/_ipr_new-third-party_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_notify.cgi 
-+++ /ipr/new-third-party/ 
 @@ -10,1 +10,1 @@
 -it to ietf-ipr@ietf.org.Submissions made by e-mail that do not comply
 +it to ietf-ipr@ietf.org. Submissions made by e-mail that do not comply
diff --git a/test/diff/_ipr_search__option_document_search_id_document_tag_2220 b/test/diff/_ipr_search__option_document_search_id_document_tag_2220
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=document_search&id_document_tag=2220 
-+++ /ipr/search/?option=document_search&id_document_tag=2220 
 @@ -52,0 +52,6 @@
 +Search result on draft-ietf-mobileip-protocol, "IP Mobility Support",
 +that was published as RFC2002, "IP Mobility Support"
diff --git a/test/diff/_ipr_search__option_ipr_title_search_ipr_title_search_nortel b/test/diff/_ipr_search__option_ipr_title_search_ipr_title_search_nortel
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=ipr_title_search&ipr_title_search=nortel 
-+++ /ipr/search/?option=ipr_title_search&ipr_title_search=nortel 
 @@ -211,2 +211,2 @@
 -IPR that has word(s) "nortel" in the title, and is not related to a
 -specific IETF contribution.
diff --git a/test/diff/_ipr_search__option_ipr_title_search_ipr_title_search_nortelxz b/test/diff/_ipr_search__option_ipr_title_search_ipr_title_search_nortelxz
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=ipr_title_search&ipr_title_search=nortelxz 
-+++ /ipr/search/?option=ipr_title_search&ipr_title_search=nortelxz 
 @@ -2,3 +2,4 @@
 -Search result on "nortelxz"
 -No IPR disclosures with the word(s)"nortelxz" in the title have been
diff --git a/test/diff/_ipr_search__option_rfc_search_rfc_search_1034 b/test/diff/_ipr_search__option_rfc_search_rfc_search_1034
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=1034 
-+++ /ipr/search/?option=rfc_search&rfc_search=1034 
 @@ -148,1 +148,1 @@
 -Search result on RFC1035, "Domain names - implementation and specification", that was updated by RFC3658, "Delegation Signer Resource Record"
 +Search result on RFC1035, "Domain names - implementation and specification", that was updated by RFC4033, "DNS Security Introduction and Requirements"
diff --git a/test/diff/_ipr_search__option_title_search_title_search_AAAxz b/test/diff/_ipr_search__option_title_search_title_search_AAAxz
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=title_search&title_search=AAAxz 
-+++ /ipr/search/?option=title_search&title_search=AAAxz 
 @@ -1,0 +1,1 @@
 +IPR Disclosure Page
 @@ -2,0 +3,1 @@
diff --git a/test/diff/_ipr_search__patent_info_search_12_option_patent_info_search b/test/diff/_ipr_search__patent_info_search_12_option_patent_info_search
@@ -1,4 +1,2 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=12 
-+++ /ipr/search/?patent_info_search=12&option=patent_info_search 
 @@ -4,1 +4,1 @@
 -Please send problem reports to ietf-action@ietf.org.
diff --git a/test/diff/_ipr_search__patent_info_search_31415_option_patent_info_search b/test/diff/_ipr_search__patent_info_search_31415_option_patent_info_search
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=31415 
-+++ /ipr/search/?patent_info_search=31415&option=patent_info_search 
 @@ -1,0 +1,1 @@
 +IPR Disclosure Page
 @@ -2,0 +3,1 @@
diff --git a/test/diff/_ipr_search__patent_info_search_abc_option_patent_info_search b/test/diff/_ipr_search__patent_info_search_abc_option_patent_info_search
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_info_search&patent_info_search=abc 
-+++ /ipr/search/?patent_info_search=abc&option=patent_info_search 
 @@ -3,1 +3,1 @@
 -The search string must contain at lease one digit
 +The search string must contain at least one digit
diff --git a/test/diff/_ipr_search__patent_search_nortelxz_option_patent_search b/test/diff/_ipr_search__patent_search_nortelxz_option_patent_search
@@ -1,4 +1,2 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=patent_search&patent_search=nortelxz 
-+++ /ipr/search/?patent_search=nortelxz&option=patent_search 
 @@ -4,0 +4,1 @@
 +IPR Search Main Page IPR Disclosure Page
diff --git a/test/diff/_ipr_search__rfc_search_1034_option_rfc_search b/test/diff/_ipr_search__rfc_search_1034_option_rfc_search
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_search.cgi?option=rfc_search&rfc_search=1034 
-+++ /ipr/search/?rfc_search=1034&option=rfc_search 
 @@ -149,1 +149,1 @@
 -Search result on RFC1035, "Domain names - implementation and specification", that was updated by RFC3658, "Delegation Signer Resource Record"
 +Search result on RFC1035, "Domain names - implementation and specification", that was updated by RFC4033, "DNS Security Introduction and Requirements"
diff --git a/test/diff/_ipr_update_ b/test/diff/_ipr_update_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_update_list.cgi 
-+++ /ipr/update/ 
 @@ -55,0 +55,1 @@
 +2000-09-15 170 i-DNS.net International general License statement
 @@ -58,1 +59,0 @@
diff --git a/test/diff/_ipr_update_657_ b/test/diff/_ipr_update_657_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/ipr_generic.cgi?command=update_ipr&ipr_id=657 
-+++ /ipr/update/657/ 
 @@ -1,3 +1,1 @@
 -Updating Generic IPR Disclosures France Telecom SA's general license
 -statement (2)
diff --git a/test/diff/_liaison_ b/test/diff/_liaison_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/liaisons.cgi 
-+++ /liaison/ 
 @@ -7,1 +7,1 @@
 -&#8220;VCAT/LCAS Work in CCAMP&#8221;
 +�&euro;&oelig;VCAT/LCAS Work in CCAMP�&euro;?
diff --git a/test/diff/_liaison_321_ b/test/diff/_liaison_321_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/liaison_detail.cgi?detail_id=321 
-+++ /liaison/321/ 
 @@ -8,1 +8,1 @@
 -IETF CCAMP WG (adrian@olddog.co.uk,dbrungard@att.com)
 +IETF CCAMP WG (adrian@olddog.co.uk, dbrungard@att.com)
diff --git a/test/diff/_list_approve_20A0p492qbq04067_ b/test/diff/_list_approve_20A0p492qbq04067_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/request_area_confirm.cgi?mailing_list_id=20A0p492qbq04067 
-+++ /list/approve/20A0p492qbq04067/ 
 @@ -1,1 +1,1 @@
 -Request to move a WG email list to ietf.org
 +Request to move the WG email list for ietf-acap+ to ietf.org
diff --git a/test/diff/_list_area_ b/test/diff/_list_area_
@@ -1,4 +1,2 @@
---- https://datatracker.ietf.org/public/area_mailing_list.cgi 
-+++ /list/area/ 
 @@ -1,0 +1,1 @@
 +
diff --git a/test/diff/_list_nonwg_ b/test/diff/_list_nonwg_
@@ -1,5 +1,3 @@
---- https://datatracker.ietf.org/public/nwg_list.cgi 
-+++ /list/nonwg/ 
 @@ -23,2 +23,2 @@
 -with a WebDAV-based protocol, and to progress it ... app
 -http://lists.osafoundation.org/mailman/listinfo/ietf-caldav
diff --git a/test/diff/_list_request_ b/test/diff/_list_request_
@@ -1,4 +1,2 @@
---- https://datatracker.ietf.org/public/request_list.cgi 
-+++ /list/request/ 
 @@ -1,0 +1,1 @@
 +Step 1:

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---- https://datatracker.ietf.org/public/show_nomcom_message.cgi?id=1230`
`2`		`-+++ /ann/nomcom/1230/`
`3`	`1`	`@@ -3,2 +3,2 @@`
`4`	`2`	`-IETF Announcement Date: June 3, 2007 Subject: IETF Nomcom Appointment`
`5`	`3`	`-- 2007-2008`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---- https://datatracker.ietf.org/public/idindex.cgi`
`2`		`-+++ /drafts/`
`3`	`1`	`@@ -16,1 +16,0 @@`
`4`	`2`	`-I-D Exists`
`5`	`3`	`@@ -546,2 +545,2 @@`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---- https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name`
`2`		`-+++ /drafts/rfc/?sort=name`
`3`	`1`	`@@ -1123,0 +1123,1 @@`
`4`	`2`	`+draft-ietf-hubmib-etherif-MIB-06 1998-08-06 RFC 2358 I-D Exists`
`5`	`3`	`@@ -1124,1 +1125,0 @@`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---- https://datatracker.ietf.org/public/pidtracker.cgi`
`2`		`-+++ /idtracker/`
`3`	`1`	`@@ -68,0 +68,1 @@`
`4`	`2`	`+--All Substates`
`5`	`3`	`@@ -73,1 +74,0 @@`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---- https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0`
`2`		`-+++ /idtracker/12689/`
`3`	`1`	`@@ -40,2 +40,3 @@`
`4`	`2`	`-This draft is basically ready for publication, but has nits and more`
`5`	`3`	`-...`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---- https://datatracker.ietf.org/public/pidtracker.cgi?command=search_list&search_job_owner=0&search_group_acronym=&search_status_id=&search_cur_state=&sub_state_id=6&search_filename=bgp-m&search_rfcnumber=&search_area_acronym=&search_button=SEARCH`
`2`		`-+++ /idtracker/?search_group_acronym=&search_job_owner=0&search_rfcnumber=&search_status_id=&sub_state_id=6&search_cur_state=&search_button=SEARCH&search_filename=bgp-m&search_area_acronym=`
`3`	`1`	`@@ -67,0 +67,1 @@`
`4`	`2`	`+--All Substates`
`5`	`3`	`@@ -72,1 +73,0 @@`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---- https://datatracker.ietf.org/public/pidtracker.cgi?command=print_ballot&ballot_id=1760&filename=draft-ietf-isis-link-attr`
`2`		`-+++ /idtracker/ballot/1760/`
`3`	`1`	`@@ -7,1 +7,1 @@`
`4`	`2`	`-https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0`
`5`	`3`	`+https://datatracker.ietf.org/idtracker/ballot/1760/`