=== Verterok is now known as Verterok_ [01:48] how can I recover an old file which has been bzr removed from the repository at some point? [02:00] nevermind, found it with diff -r [03:18] Has anyone gotten bzr-gtk to run on OS X Leopard? I'm trying with both the built in python and also from macports but I haven't gotten it to work yet [03:36] lifeless: hi [04:48] sabdfl: hola [05:42] hey lifeless [05:42] thanks for the answers === YGingras_ is now known as YGingras [18:22] morning y'akk === keir__ is now known as keir === Verterok_ is now known as Verterok [18:43] jelmer: ping [18:47] Hi, I cannot push anything to the repos on my server [18:47] using bzr locally works [18:48] is there a tutorial who to set up bzr on a server? [18:49] http://doc.bazaar-vcs.org/latest/en/user-guide/index.html [18:53] you don't need bzr on the server if you are using sftp or ftp [18:54] if you are using bzr:// e.g. bzr+ssh:// then you need a bzr on the server, we try to be network compatible release to release. [18:55] lifeless: thanks I think that it works now somehow [20:07] I'm having some problems with the bzr-gtk (0.92.1) on a netbsd-4 (python2.4) machine. Python dumps core because it gets sent SIGSEGV: http://pastebin.com/d48960808 [20:08] base bzr runs flawlessly however [20:23] woei: interesting; I would guess its a python-gtk bug [20:32] lifeless: ok, I'll try updating pygtk to 2.12 (it's at 2.10.6 now) [22:42] i'm about to write a little script to get version information from bazaar in the form that perl modules expect (ie. versions of the form "X.Y.Z", where "X", "Y", and "Z" are all integers), and would like some input from anyone with more experience with bazaar on whether i'm going about this the right way... [22:44] bazaar seems to number its revisions with a single number... which is fine... my idea is to just tag a revision i'm about to release with something like "myproject-X.Y.Z" [22:44] unfortunately "bzr version-info" does not specify which tag a version has [22:45] so i'm thinking of grabbing "revno" from "bzr version-info" and then searching for it in the output of "bzr log" [22:46] if it finds a tag matching the regex: "\w-\d\.\d\.\d" (ie. "word-digit.digit.digit") it'll use the "digit.digit.digit" part for the version number [22:47] otherwise it'll keep looking down the list of revisions until it finds such a tag and use that [22:47] i know this is kind of ugly and hackish, but i don't know what else to do [22:52] bzr revision-info will give you the unique revision id of your tree [22:52] isn't that the same as the "revno:" line in "bzr version-info" ? [22:53] no, its a guid [22:53] 'bzr tags' will list the tags you have [22:53] yes, but that doesn't tell me which tag the currently checked out working tree has [22:54] i suppose i could just use the top-listed tag [22:54] and assume i'm working with the newest revision [22:54] but that might not always be the case [22:56] uhm [22:56] morning [22:56] I thought tags listed the tag [22:56] revno/revisionid [22:57] hi igc [22:57] hi lifeless [22:58] as i understand it, "bzr tags" lists all the tags for the branch [22:58] but i'm interested in just the tag for the revision of the branch that i have checked out [22:59] so i think i'm going to have to search through the output of "bzr log" for that [22:59] pattern: there may be no such tag [22:59] yes [22:59] in which case i guess i'll have to use the newest tag for any older revision [23:00] as i need to set my $VERSION to something [23:00] and I'm saying that looking for bzr revision-info in the output of bzr tags is the fast way to do that if you don't want to use python [23:00] pattern: but if you just want to specify 'the current tree', the guid from bzr revision-info is all you need [23:00] perhaps I'm not understanding what you are trying to do [23:01] well, "bzr revision-info" just gives me a single digit... i need to get a version in the form of "X.Y.Z" (where each of "X", "Y", and "Z" are digits) [23:01] pattern: I don't know why you need that, and revision-info doesn't give a digit, it gives a revno and revid; the revid is the unique part [23:02] e.g. [23:02] bzr revision-info [23:02] so i think the way to get that is to manually set a tag for the version i want (ie. "myproject-1.0.2") [23:02] 2939 pqm@pqm.ubuntu.com-20071024231045-lquhgsz9513gn2l4 [23:02] the reason i need that is because perl modules are usually numbered in that way [23:02] the 'pqm@pqm.ubuntu.com-20071024231045-lquhgsz9513gn2l4' is the right thing to use to refer to this commit in a guaranteed manner [23:03] pattern: perhaps if you start from the top; I'm really confused [23:03] ok... [23:03] i'm writing a perl module... perl modules usually have a $VERSION (version string) [23:03] $VERSION is used internally by the standard makefiles that compile and package up the module, and for module naming [23:04] and they're usually in the form "X.Y.Z" (where each of "X", "Y", and "Z" are digits) [23:04] usually that $VERSION lives in the code itself [23:05] ok [23:05] but i don't want to mess with the code manually.. because i might make a mistake and get $VERSION out of sync with the actual revision in bazaar [23:05] so why not just append .0.0 to what bzr supplies ? [23:06] well, releasing new major numbers (the first digit) is usually frowned upon unless you've made massive changes (ie. that require a reconfig, and/or API/format-changes, etc) [23:06] or do [23:07] 0.bzrrevno.0 ? [23:07] or 1.0.bzrrevno ? [23:07] and then how do i increment the first and last digits? [23:07] or whatever digits bzrrevno doesn't account for? [23:07] it just makes much more sense to tag the release manually [23:07] well, increment them whenever you want to [23:07] but have it in sync with the revision in bazaar [23:08] so i can check out the branch based on that tag [23:08] but if you do want to use bzr tags, sure, using log and looking back for a tag will work, though you will get the same VERSION for different commits until you tag a new version [23:08] yeah, that is a problem [23:09] i'm going to have to give it more thought [23:10] or maybe i could just tag every revision [23:10] as X.Y.bzrrevno [23:11] and when i do releases just use X.Y.0 [23:11] which is the same as not tagging [23:12] and using x.y.bzrrevno all the time except for releases [23:13] well, then if there's no tag on a version i'd need to search through earlier log entries for tags to know what X.Y is [23:13] ssure [23:13] why not just tag every revision? [23:13] i could probably write a script to do it, using the previous value of X.Y, and allowing an override [23:13] seems redundant and needs more work [23:13] I'd just tag once, and look that up [23:14] it's too bad "bzr version-info" doesn't tell me the tag of the current revision [23:14] then i wouldn't need to search "bzr log" for it [23:15] but as discussed there may be no tag [23:15] unless you've tagged every time [23:15] right [23:15] which is what i think i'm going to do [23:15] certainly, please do file a bug about it not providing the tag [23:16] well, then maybe there should be a "bzr tag-info" :) [23:16] lifeless: http://confluence.ts.wikimedia.org/display/main/Home [23:16] though, i think that while "bzr version-info" is providing all sorts of other info on that revision (such as the date and branch), it might as well provide the tag as well [23:17] pattern: sure; file a bug :) [23:17] will do :) [23:20] i386: :) [23:20] lifeless: :) [23:25] actually, "bzr log -r `bzr revno`" will accomplish pretty much the same as what having "bzr version-info" report the tag would do [23:26] and "bzr log -r `bzr revno` | grep tag" to get the tag itself [23:27] it's still a bit hackish... but seems to work [23:28] you can use 'bzr log -r -1' [23:29] ah [23:29] nice :) [23:29] "bzr log -r -1 | grep tags | sed 's/^tags: //'" [23:33] now to write a little script that does that before running a commit, and then automatically tagging the newly committed revision with X.Y.revno (where X.Y comes from the previous tag, and revno is the current revision) [23:33] and when i want to increment X.Y i'd do so manually instead of running that script [23:34] or maybe give the script an override option [23:34] its this complexity I don't like about tagging every commit [23:34] you wouldn't have to wrap commit if you only tagged releases [23:35] well, it's either that or having to search through multiple log entries for the last tagged revision before the revision i'm working on now [23:36] both ways entail additional complexity [23:36] at least if i tag every revision, then i'd instantly know the X.Y version number of every revision by simply looking at the log for that revision [23:38] so one is prone to failing if you forget to use your wrapper [23:38] the other isn't prone to failing at all [23:38] shrug, its up to you :) [23:39] there's no "bzr alias", eh? :) [23:39] you can alias commit to give you options and so on, but not to run a shell script - your shell's alias can do that [23:40] but shell aliases only alias the first word on the command line [23:40] a precommit hook could do what you need too, though noone has actually wired up the glue for precommit hooks just yet - we've been waiting for a use ase [23:40] so i'd need to create a "bzrcommit" alias [23:40] which, as you point out, i might forget to type [23:42] but, if i do forget to type "bzrcommit" and type "bzr commit" instead, the next time i type "bzrcommit" or the next time i run make my "bzrcommit" script or the scripts in the makefile could warn me about not seeing a tag for the current revision [23:42] and i could also have a script that goes back and adds any missing tags [23:42] that would be trivial [23:43] of course, doing that would involve searching through the output of "bzr log" [23:43] so maybe instead of creating a wrapper for "bzr commit" i should create a wrapper for "bzr log" instead [23:46] well, one other advantage of tagging every revision is that i could always check out a given revision via its tag, which would include the X.Y version number... and that would make more sense than just using the revno alone [23:49] I worry that you will run into scaling problems with tags [23:50] they're not geared for thousands of them [23:50] hmm [23:50] and you're really just duplicating our existing infrastructure [23:50] which is why x.y.REVNO is IMO superior, for non-releases [23:50] you can 'bzr branch -r REVNO' as well [23:51] or "bzr branch -r tag:X.Y.REVNO", right? :) [23:51] yes, but thats redundant [23:51] so there is no gain; thats my point [23:52] the gain is in a more intuitive user experience when looking for a given X.Y.REVNO version [23:52] still; if you feel you need to, it will work, it will just incrementally slow down your push/pull operations [23:53] couldn't you just add a VERSION_ID to the perl script [23:53] which is the GUID ? [23:53] well, it needs to be in the X.Y.Z format, which is the standard [23:53] thats even easier in terms of getting the code for that version, and more robust against things like uncommit [23:53] no, you miss my poin [23:53] use VERSION for the build stuff [23:53] use VERSION_ID for the bzr GUID, as ancilliary data [23:54] i don't understand [23:54] you seem to have several use cases [23:54] could you explain what VERSION_ID and GUID are? [23:54] case 1) provide a machine generated version number for each build; which will be semi-human-readable [23:54] case 2) provide a way for users to obtain the source code [23:55] VERSION_ID would just be a perl variable [23:55] and that would be different from VERSION ? [23:55] the GUID is what is returned by 'bzr revision-info', e.g. pqm@pqm.ubuntu.com-20071024231045-lquhgsz9513gn2l4 [23:56] how is using GUID better than the output of "bzr revno" ? [23:56] it does the correct thing when people uncommit [23:56] and, more importantly, how do i get a proper X.Y.Z formatted version number for the perl VERSION variable? [23:56] it works in any branch of the project regardless of merge history [23:56] ah [23:57] the guid is the underlying database id [23:57] well, that makes things more complicated [23:57] for the Z component, I'd use the bzr revno, as you don't plan on uncommitting in your mainline, or even just lookup your last actual build you released, or use a timestamp (e.g. Z is seconds-since-epoch) [23:58] maybe i could just append an md5sum of GUID :) [23:58] md5's have a-f in them [23:58] yeah, i was joking [23:58] if thats permitted, just using the guid directly :). [23:59] i think perl users would flip if they saw a 30 digit number in their version string [23:59] and it's not permitted [23:59] i don't think