http://blog.gmane.org/gmane.comp.version-control.mercurial.general hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10842 Hi, I have come across an hgweb usecase where I needed a filtering extension: Use case -------- - a mercurial repository is being used with trac for issue tracking. The repository has hooks to check that changelog messages contain valid bug ID's (similar to bugzilla extension) - the bug ID's that show up in changelog messages should be hyperlinks to the bug tracking system when using the hgweb interface Implementation -------------- To implement the above scenario a new filter extension has been created. This extension is configurable via hgrc ([urllnk] section). I am attaching the extension itself and an example patch of the gitweb style to show its use. Would this extension be of any interest to mercurial community, is it possible to post it on the selenic.com wiki? Thanks, Jan Index: git-web-with-logo/summary.tmpl =================================================================== --- git-web-with-logo.orig/summary.tmpl2008-11-27 13:20:32.000000000 +0100 +++ git-web-with-logo/summary.tmpl2008-11-27 16:28:39.000000000 +0100 < at >< at > -29,7 +29,7 < at >< at > <div class="title">&nbsp;</div> <table cellspacing="0"> -<tr><td>description</td><td>#desc#</td></tr> +<tr><td>description</td><td>#desc|urllnk#</td></tr> <tr><td>owner</td><td>#owner|obfuscate#</td></tr> <tr><td>last change</td><td>#lastchange|rfc822date#</td></tr> </table> Index: git-web-with-logo/changeset.tmpl =================================================================== --- git-web-with-logo.orig/changeset.tmpl2008-11-27 13:20:32.000000000 +0100 +++ git-web-with-logo/changeset.tmpl2008-11-27 16:28:39.000000000 +0100 < at >< at > -29,7 +29,7 < at >< at > </table></div> <div class="page_body"> -#desc|strip|escape|addbreaks# +#desc|strip|escape|addbreaks|urllnk# </div> <div class="list_head"></div> <div class="title_text"> Index: git-web-with-logo/changelogentry.tmpl =================================================================== --- git-web-with-logo.orig/changelogentry.tmpl2008-11-27 13:20:32.000000000 +0100 +++ git-web-with-logo/changelogentry.tmpl2008-11-27 16:28:39.000000000 +0100 < at >< at > -8,7 +8,7 < at >< at > <i>#author|obfuscate# [#date|rfc822date#] rev #rev#</i><br/> </div> <div class="log_body"> -#desc|strip|escape|addbreaks# +#desc|strip|escape|addbreaks|urllnk# <br/> <br/> </div> Index: git-web-with-logo/fileannotate.tmpl =================================================================== --- git-web-with-logo.orig/fileannotate.tmpl2008-11-27 13:20:32.000000000 +0100 +++ git-web-with-logo/fileannotate.tmpl2008-11-27 16:28:39.000000000 +0100 < at >< at > -48,7 +48,7 < at >< at > </div> <div class="page_path"> -{desc|strip|escape|addbreaks} +{desc|strip|escape|addbreaks|urllnk} </div> <div class="page_body"> <table> from mercurial import templatefilters import re class UrlLnkFilter(object): """This Filter allows replacing user tags with URL references User may define the 'base URL' and the 'regular expression' to match a user tag and the 'replacement expression'. None of these need to be defined as there are defaults values The filter can be used for the hgweb templates to generate links into a bug tracking system. The basic idea is to modify the templates like this: #desc|strip|escape|addbreaks# #desc|strip|escape|addbreaks|urllnk# By default the filter detects any text referencing tags prefixed with #,ticket,issue or bug followed by a number. This is replaced by <a href = "base_url/number">original text</a>. Example: Input text: ----------- Changelog entry references #3 Output text ----------- Changelog entry references <a href="http://some_base_url/ticket/3">#3</a> < at >var base_url - denotes the base URL to be prepended to generated link. Defaults to empty string. < at >var utag_regexp - regular expression to match the user tag. < at >var utag_replace - replacement expression """ def __init__(self, ui, repo): """Initializes regular expressions to match user tags The defaults can be overiden by the mercurial configuration < at >param self < at >param ui - user interface of the mercurial < at >param repo - current mercurial repository """ conf_section = 'urllnkfilter' # base url used for anchor self.base_url = ui.config(conf_section, 'base_url', '') # for better efficiency, precompile the regular expression txt_regexp = ui.config(conf_section, 'ticket_regexp', '(\s+)((?:#|(?:ticket|issue|bug)[: ]?)([0-9]+))') self.utag_regexp = re.compile(txt_regexp) # replacement string self.utag_replace = ui.config(conf_section, 'ticket_replace', '\g<1><a href="%s/\g<3>">\g<2></a>' % self.base_url) def __call__(self, text): """The object implements a callable interface to perform filtering. < at >param self """ return re.sub(self.utag_regexp, self.utag_replace, text) def reposetup(ui, repo): templatefilters.filters["urllnk"] = UrlLnkFilter(ui, repo) Jan Capek 2008-12-01T21:14:17 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10841 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, fyi, we've just unleashed Mercurial Eclipse 1.2.941. You can find the details at http://groups.google.com/group/mercurialeclipse/browse_thread/thread/afeb72d7be325848# Cheers, Bastian -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) iEYEARECAAYFAkk0YB4ACgkQBqJW4lDO0YJi3gCeJKTZpWvuyckbkMn7bochHDAz il0AnjcopvbhYn2BK4l4QpiyajAiYErW =lVWU -----END PGP SIGNATURE----- Bastian Doetsch 2008-12-01T22:07:26 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10840 It is possible to add my own keys to the map? I'm trying to add some common header stuff in a "headerend" template like this: in my map file I have: headerend = headerend.tmpl in summary.tmpl I have: #header# <title>#repo|escape#: Summary</title> #headerend# in headerend.tmpl: </head> <body> <h1>Welcome</h1> But the "#headerend#" string is just replaced with an empty string. -- Trygve _______________________________________________ Mercurial mailing list Mercurial< at >selenic.com http://selenic.com/mailman/listinfo/mercurial Trygve Laugstøl 2008-12-01T20:22:18 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10839 Someone who is a bit less experienced than a VCS hacker who can extend the same VCS privately if they find missing functionality. I should have been more clear when I wrote "average ${VCS} user". Thanks, that's more or less what I was looking for :-) Heh, that's ok. I think I'm covered for now. I asked because it is nice to know what features are useful in Bazaar too. _______________________________________________ Mercurial mailing list Mercurial< at >selenic.com http://selenic.com/mailman/listinfo/mercurial Giorgos Keramidas 2008-12-01T19:47:52 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10838 Already exists: internal:merge. Matt Mackall 2008-12-01T19:45:43 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10837 Giorgos Keramidas пишет: I don't know what it means: "for the average ${VCS} user". Can you explain, please? I can explain only what I'm using everyday. You can use bzr branches as standalone branches (this is typical scenario for hg, yes?). You can use bzr branch on the some sort of server (smart or dumb) as master branch and then do checkout on local machine. Your checkout could be almost the same as regular branch, but when you do commit or pull all new revisions should go to master branch first (otherwise you need use --local command-line option). Also bzr supports lightweight checkouts -- it's roughly the same like checkouts in CVS, when you have only working copy on your local disk without history, all branch history is accessible via master branch (it could be on the server or local). Also bzr supports work with many dumb servers (http is readonly, ftp, sftp is writable). This is much slower than using smart server like bzr+ssh, but sometimes it's very useful. As you understand I did not mention the same features both hg and bzr has. This does not mean of course that all users will use everything, but I'm using all mentioned above and it helps me in my work. But I'm probably not typical "average ${VCS} user", because I was bzr windows maintainer during several years. _______________________________________________ Mercurial mailing list Mercurial< at >selenic.com http://selenic.com/mailman/listinfo/mercurial Alexander Belchenko 2008-12-01T19:31:55 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10836 Can you elaborate a bit on the `more workflows' part? I've been seeing that mentioned here and there, that but I am not sure I understand what it means for the average ${VCS} user. Giorgos Keramidas 2008-12-01T19:03:40 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10835 Gabor Grothendieck пишет: More than half of Bazaar codebase is actually tests and benchmarks. You need to exclude bzrlib/tests and bzrlib/benchmarks to get info about actual code. Also Bazaar supports more concepts, more features/workflows and tows support for numerous old repo formats. I think this explains its codebase size. _______________________________________________ Mercurial mailing list Mercurial< at >selenic.com http://selenic.com/mailman/listinfo/mercurial Alexander Belchenko 2008-12-01T19:00:56 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10834 Hi Christian, Thanks for all the help! Setting ui.fallbackencoding works fine :-) Giorgos Keramidas 2008-12-01T16:32:07 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10833 Marijn Vriens 2008-12-01T15:47:05 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10832 Hi again, in one of my repositories I have checked in some changeset X for feature A which I could never made to work. Later, I have restarted from X's parent and some dozens of revisions later I finished the same feature A in another way. Now I have this extra head with the unfinished changes which I don't need anymore. This extra head gets in my way when using "hgview" (it always appears at the very top, although it is very old). AFAICS, I have three options: 1) Use a dummy merge to make the unnamed branch inactive. That would look like I actually used code from my first try, which I did not. 2) Use strip/mq/convert etc. to remove this head from my repo. I have no intention to do this. 3) Leave it as it is, and try to fix hgview for example. I would like to have option 4) - mark the branch as inactive without merging it. Apparently, this is not yet possible with hg, right? What do you people think? (I bet most people are content with opion 1, but what do you think about 4?) Have a nice day, Hans Hans Meine 2008-12-01T14:52:56 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10831 Mercurial Distributed SCM (version 4fd92687f331) Running this on an XScale box (Thecus N2100, Debian stable, Python 2.4.4, 2.6.24-etchnhalf.1-iop32x, ext3). $ make local No warnings or errors. $ make tests Skipped test-casefolding: missing feature: case insensitive file system Skipped test-convert-baz: missing feature: GNU Arch baz client Skipped test-convert-bzr: missing feature: Canonical's Bazaar client Skipped test-convert-bzr-directories: missing feature: Canonical's Bazaar client Skipped test-convert-bzr-ghosts: missing feature: Canonical's Bazaar client Skipped test-convert-bzr-merges: missing feature: Canonical's Bazaar client Skipped test-convert-bzr-treeroot: missing feature: Canonical's Bazaar client Skipped test-convert-cvs: missing feature: cvsps utility Skipped test-convert-darcs: not executable Skipped test-convert-git: missing feature: git command line client Skipped test-convert-hg-svn: missing feature: subversion python bindings Skipped test-convert-mtn: missing feature: monotone client (> 0.31) Skipped test-convert-svn-branches: missing feature: subversion python bindings Skipped test-convert-svn-move: missing feature: subversion python bindings Skipped test-convert-svn-sink: missing feature: subversion python bindings Skipped test-convert-svn-source: missing feature: subversion python bindings Skipped test-convert-svn-startrev: missing feature: subversion python bindings Skipped test-convert-svn-tags: missing feature: subversion python bindings Skipped test-convert-tla: missing feature: GNU Arch tla client Skipped test-highlight: missing feature: Pygments source highlighting library Skipped test-imerge: not executable Skipped test-inotify: missing feature: inotify extension support Skipped test-inotify-issue1208: missing feature: inotify extension support Skipped test-inotify-issue1371: missing feature: inotify extension support Skipped test-inotify-lookup: missing feature: inotify extension support Skipped test-no-symlinks: system supports symbolic links Failed test-archive: output changed Failed test-convert-cvs-branch: output changed Failed test-import: output changed and returned error code 15 Failed test-mq: output changed and returned error code 15 Failed test-mv-cp-st-diff: output changed and returned error code 15 Failed test-pull-pull-corruption2: output changed Failed test-rebase-parameters: output changed and returned error code 15 Failed test-rebase-scenario-global: output changed and returned error code 15 Failed test-rename-merge2: output changed and returned error code 15 # Ran 309 tests, 26 skipped, 9 failed. ERROR: test-convert-cvs-branch output changed --- Expected output +++ Test output < at >< at > -1,7 +1,7 < at >< at > % create cvs repository % Create a new project +N src/b N src/a -N src/b this is a non-issue caused by cvs import listing files in the order that they are returned by the OS instead of alphabetically. I also note that the script does echo "1" > a > b which of course does not put anything in b. I have a submitted a patch for both. Frank Frank A. Kingswood 2008-12-01T14:46:17 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10830 # HG changeset patch # User Frank Kingswood <frank< at >kingswood-consulting.co.uk> # Date 1228138924 0 # Node ID b1c1b4f98b74bfa32991d33bdb4a47215cdeb842 # Parent 79d1bb737c16b343e33be7cd7e22dcc4e7bfab0b tests: allow cvs import to reorder its filename list also fix script to generate non-zero length test file b. diff -r 79d1bb737c16 -r b1c1b4f98b74 tests/test-convert-cvs-branch --- a/tests/test-convert-cvs-branchMon Dec 01 14:20:20 2008 +0100 +++ b/tests/test-convert-cvs-branchMon Dec 01 13:42:04 2008 +0000 < at >< at > -28,8 +28,9 < at >< at > mkdir src cd src -echo "1" > a > b -cvscall import -m "init" src v0 r0 +echo "1" > a +echo "1" > b +cvscall import -m "init" src v0 r0 | sort cd .. cvscall co src cd src diff -r 79d1bb737c16 -r b1c1b4f98b74 tests/test-convert-cvs-branch.out --- a/tests/test-convert-cvs-branch.outMon Dec 01 14:20:20 2008 +0100 +++ b/tests/test-convert-cvs-branch.outMon Dec 01 13:42:04 2008 +0000 < at >< at > -1,10 +1,10 < at >< at > % create cvs repository % Create a new project + + N src/a N src/b - No conflicts created by this import - cvs checkout: Updating src U src/a U src/b Frank Kingswood 2008-12-01T14:24:18 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10829 On Mon, Dec 1, 2008 at 09:45, Marcin Kasperski <Marcin.Kasperski< at >softax.com.pl> wrote: [CUT] +1 I "suffer" from the same issues described by Marcin... :) []s Roger Roger Demetrescu 2008-12-01T12:07:26 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10828 It would be nice if hg pull could be configured to suppress output when there are no changes transferred. Rationale: I frequently use different "pull many repositories at once" scripts, from for dir in * do hg --cwd $dir pull done to more complicated "syncthemall" scripts. The output of such a command is difficult to read as truly useful information is lost among numerous pulling from (...) searching for changes no changes found messages. I'd prefer to see only info about directories where "something" happened. (at the same time hg -q pull supressess everything, also the useful info) Syntax suggestion: hg pull --silent Alternative syntax suggestion: It could be even better idea to introduce some global option of similar meaning (report "interesting" information but suppress notifications that nothing happened, nothing was found, no files were updated, nothing was added etc etc). This would establish a convention for different commands. It could be introduced as hg --quiet=partial command or sth similar. Again: it would be intended for use in scripts, cron jobs (like http://blog.mekk.waw.pl/archives/8-Mercurial-as-a-backup-tool-on-MoinMoin-example.html) etc etc Marcin Kasperski 2008-12-01T11:45:30 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10827 Hi Giorgos, * Giorgos Keramidas on Monday, December 01, 2008 at 12:16:22 +0200 Actually 2) _does_ work, except for notify.test = true. Which is why I got even more confused when testing ;-) Seems [ui] fallbackencoding = iso-8859-7 is what you want. Probably doesn't have an effect for notify, only for web. hehe Could you try with ui.fallbackencoding = iso-8859-7 in <repo>/.hg/hgrc ? I get notifications in iso-8859-7 of your repo with that setting -- no need to set email.charsets even, because ui.fallbackencoding changes util._fallbackencoding and is automatically in email.charsets. It seems that I only muddled up only the docs, and ui.fallbackencoding is what you need exactly what it is meant for. Additionally notify should behave similar to patchbomb for its test mode, where no conversion takes place. c Christian Ebert 2008-12-01T11:43:00 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10826 Something related to this is probably the main problem, but the hgwebdir.cgi is already running in "iso-8859-7" mode. I'll try setting ui.encoding too :) No problem. We have just switched to notify.changegroup emails for now. They seem less `spammy' when I push a bunch of changesets into the integration tree :) Giorgos Keramidas 2008-12-01T10:16:22 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10825 Hi Giorgos, * Giorgos Keramidas on Sunday, November 30, 2008 at 01:03:57 +0200 [...] I believe this is because your server runs in utf-8 locale. So, there are the following bugs: 1) documentation (hgrc 5): an ui.encoding setting doesn't exist 2) ui.fallbackencoding is not consulted (but probably should be over util._fallbackencoding) atm, only $HGENCODING (util._encoding derived from locale) and util._fallbackencoding tried for _input_. I will try to fix this and find a better way of chosing an input charset -- hopefully without breaking other stuff (is it save eg. to select web.encoding? etc.) For the moment you could fix this eg. by setting os.environ["HGENCODING"] = "iso-8859-7" in hgweb(dir).cgi -- that is, if you can, and you don't have other repos there that need a different setting. There might be other ways too, but this should definitely be fixed in a clean way. Sorry about this, but the use case of notifications from a repo "run" in a charset that differs from locale did not come to my mind. c Christian Ebert 2008-12-01T10:11:12 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10824 2008/12/1 Dirkjan Ochtman <dirkjan< at >ochtman.nl>: hg export does not accept -p -U8 options for prety-print diff with a lot of context. AFAICS it is equivalent to using the mq patch itself. Regards, Igor Igor Bukanov 2008-12-01T07:32:14 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10823 hg export? (Only works if the patch is applied, obviously.) Cheers, Dirkjan Dirkjan Ochtman 2008-12-01T06:28:32 http://permalink.gmane.org/gmane.comp.version-control.mercurial.general/10821 Hi, is there any way to include to hg qdiff output the commit message and the user name recorded during qrefresh? Alternatively can I force to include -p option to mq patches as stored under .hgrc/patches ? Regards, Igor Igor Bukanov 2008-11-30T21:37:44 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.version-control.mercurial.general