Fossil SCM

merge from trunk

wolfgang 2010-11-06 19:08 UTC StvPrivateHook2 merge
Commit e5fe4164f74a7576bfc733929bc933efc6f505d0
Parent 3ea66260b5555d2…
4 files changed +1 -1 +1 -1 +1 -1 +1 -1
~ src/tkt.c ~ src/tkt.c ~ win/Makefile.dmc ~ win/Makefile.dmc
M src/tkt.c
+1 -1
--- src/tkt.c
+++ src/tkt.c
@@ -845,10 +845,11 @@
845845
 ** %fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?options?
846846
 **
847847
 ** options can be:
848848
 ** ?-l|--limit LIMITCHAR?
849849
 ** ?-q|--quote?
850
+** ?-R|--repository FILE?
850851
 **
851852
 ** Run the ticket report, identified by the report format title
852853
 ** used in the gui. The data is written as flat file on stdout,
853854
 ** using "," as separator. The seperator "," can be changed using
854855
 ** the -l or --limit option.
@@ -903,11 +904,10 @@
903904
 */
904905
 void ticket_cmd(void){
905906
 int n;
906907
907908
 /* do some ints, we want to be inside a checkout */
908
- db_must_be_within_tree();
909909
 db_find_and_open_repository(1);
910910
 user_select();
911911
 /*
912912
 ** Check that the user exists.
913913
 */
914914
--- src/tkt.c
+++ src/tkt.c
@@ -845,10 +845,11 @@
845 ** %fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?options?
846 **
847 ** options can be:
848 ** ?-l|--limit LIMITCHAR?
849 ** ?-q|--quote?
 
850 **
851 ** Run the ticket report, identified by the report format title
852 ** used in the gui. The data is written as flat file on stdout,
853 ** using "," as separator. The seperator "," can be changed using
854 ** the -l or --limit option.
@@ -903,11 +904,10 @@
903 */
904 void ticket_cmd(void){
905 int n;
906
907 /* do some ints, we want to be inside a checkout */
908 db_must_be_within_tree();
909 db_find_and_open_repository(1);
910 user_select();
911 /*
912 ** Check that the user exists.
913 */
914
--- src/tkt.c
+++ src/tkt.c
@@ -845,10 +845,11 @@
845 ** %fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?options?
846 **
847 ** options can be:
848 ** ?-l|--limit LIMITCHAR?
849 ** ?-q|--quote?
850 ** ?-R|--repository FILE?
851 **
852 ** Run the ticket report, identified by the report format title
853 ** used in the gui. The data is written as flat file on stdout,
854 ** using "," as separator. The seperator "," can be changed using
855 ** the -l or --limit option.
@@ -903,11 +904,10 @@
904 */
905 void ticket_cmd(void){
906 int n;
907
908 /* do some ints, we want to be inside a checkout */
 
909 db_find_and_open_repository(1);
910 user_select();
911 /*
912 ** Check that the user exists.
913 */
914
M src/tkt.c
+1 -1
--- src/tkt.c
+++ src/tkt.c
@@ -845,10 +845,11 @@
845845
 ** %fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?options?
846846
 **
847847
 ** options can be:
848848
 ** ?-l|--limit LIMITCHAR?
849849
 ** ?-q|--quote?
850
+** ?-R|--repository FILE?
850851
 **
851852
 ** Run the ticket report, identified by the report format title
852853
 ** used in the gui. The data is written as flat file on stdout,
853854
 ** using "," as separator. The seperator "," can be changed using
854855
 ** the -l or --limit option.
@@ -903,11 +904,10 @@
903904
 */
904905
 void ticket_cmd(void){
905906
 int n;
906907
907908
 /* do some ints, we want to be inside a checkout */
908
- db_must_be_within_tree();
909909
 db_find_and_open_repository(1);
910910
 user_select();
911911
 /*
912912
 ** Check that the user exists.
913913
 */
914914
--- src/tkt.c
+++ src/tkt.c
@@ -845,10 +845,11 @@
845 ** %fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?options?
846 **
847 ** options can be:
848 ** ?-l|--limit LIMITCHAR?
849 ** ?-q|--quote?
 
850 **
851 ** Run the ticket report, identified by the report format title
852 ** used in the gui. The data is written as flat file on stdout,
853 ** using "," as separator. The seperator "," can be changed using
854 ** the -l or --limit option.
@@ -903,11 +904,10 @@
903 */
904 void ticket_cmd(void){
905 int n;
906
907 /* do some ints, we want to be inside a checkout */
908 db_must_be_within_tree();
909 db_find_and_open_repository(1);
910 user_select();
911 /*
912 ** Check that the user exists.
913 */
914
--- src/tkt.c
+++ src/tkt.c
@@ -845,10 +845,11 @@
845 ** %fossil ticket show (REPORTTITLE|REPORTNR) ?TICKETFILTER? ?options?
846 **
847 ** options can be:
848 ** ?-l|--limit LIMITCHAR?
849 ** ?-q|--quote?
850 ** ?-R|--repository FILE?
851 **
852 ** Run the ticket report, identified by the report format title
853 ** used in the gui. The data is written as flat file on stdout,
854 ** using "," as separator. The seperator "," can be changed using
855 ** the -l or --limit option.
@@ -903,11 +904,10 @@
904 */
905 void ticket_cmd(void){
906 int n;
907
908 /* do some ints, we want to be inside a checkout */
 
909 db_find_and_open_repository(1);
910 user_select();
911 /*
912 ** Check that the user exists.
913 */
914
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -524,7 +524,7 @@
524524
525525
 zip_.c : $(SRCDIR)\zip.c
526526
 +translate$E $** > $@
527527
528528
 headers: makeheaders$E page_index.h VERSION.h
529
- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
529
+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
530530
 @copy /Y nul: headers
531531
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -524,7 +524,7 @@
524
525 zip_.c : $(SRCDIR)\zip.c
526 +translate$E $** > $@
527
528 headers: makeheaders$E page_index.h VERSION.h
529 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
530 @copy /Y nul: headers
531
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -524,7 +524,7 @@
524
525 zip_.c : $(SRCDIR)\zip.c
526 +translate$E $** > $@
527
528 headers: makeheaders$E page_index.h VERSION.h
529 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
530 @copy /Y nul: headers
531
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -524,7 +524,7 @@
524524
525525
 zip_.c : $(SRCDIR)\zip.c
526526
 +translate$E $** > $@
527527
528528
 headers: makeheaders$E page_index.h VERSION.h
529
- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
529
+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
530530
 @copy /Y nul: headers
531531
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -524,7 +524,7 @@
524
525 zip_.c : $(SRCDIR)\zip.c
526 +translate$E $** > $@
527
528 headers: makeheaders$E page_index.h VERSION.h
529 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
530 @copy /Y nul: headers
531
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -524,7 +524,7 @@
524
525 zip_.c : $(SRCDIR)\zip.c
526 +translate$E $** > $@
527
528 headers: makeheaders$E page_index.h VERSION.h
529 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
530 @copy /Y nul: headers
531

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button