=== r0bby is now known as robbyoconnor
=== r0bby is now known as robbyoconnor
=== speakman_ is now known as speakman
=== BasicPRO is now known as BasicOSX
=== Ursinha is now known as Ursinha-afk
=== vila_ is now known as vila
vilahi all !07:44
=== vila changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: vila | 2.3.0 is officially out ! (RM: vila)
=== soren_ is now known as soren
=== abhinav_ is now known as abhinav-
geekosopherimmediately after I branch any lp repo to one of my hd partitions (outside /home), 'bzr st' shows all files of the repo in 'modified' category, and 'bzr diff' shows all file names with '(properties changed: -x to +x)' appended to them11:51
PengIs this some fun file system?11:52
geekosopherthe hd partition in question is set to automount by adding a line in fstab file11:52
geekosopherits vfat11:52
vilageekosopher: OS/version/file system involved ? This sounds like the underlying fs doesn't handle the exe bits properly11:53
geekosophervila: kubuntu/10.10/vfat11:53
geekosopherPeng: that sounds like 'no'11:53
geekosopher*no solution11:53
geekosopheri tried changing the file system permissions, but either nothing or umask=0*** gives above error11:55
maxbI seem to recall seeing a bug about this? Yes, it's more or less expected behaviour for bzr on vfat on linux11:55
geekosopherand anything other than 0** causes inaccessibility11:56
geekosopheryes, this is typical of bzr only, git is working fine11:56
maxbObviously it would be nicer if bzr ignored the modifications, but it's not behaving that unsurprisingly, given the underlying FS *has* modified the perms from what was in the repository11:56
geekosopherexplicitly doing chmod is not working either11:57
geekosopherlike 'chmod -x <repo directory>11:57
maxbWell, no, it wouldn't. The vfat fs is incapable of storing permission information.12:00
* geekosopher wondering how bzr works on windows12:02
geekosopheroh yes, windows wouldn't even have permissions stuff12:08
PengWindows has the execute bit, which is all Bazaar tracks.12:10
vilageekosopher: not to mention symlinks...12:24
Mezis there anywhere a good into ro using bzrlib?  I want to create a quick script that emails people about uncommitted changes in their branches.  But would prefer to do it using bzrlib rather than system calls.12:27
jamhey vila, I haven't gotten a chance to /wave at you in your timezone yet :)12:35
vilajam: hey !!!12:36
jelmer'morning jam, vila12:38
jelmervila: welcome back, I hope you had a nice vacation :)12:38
vilajelmer: wonderful !12:38
jamwell, afternoon here, I hope :)12:39
jameither that, or I'm *really* confused12:40
jelmerjam: You're not :)12:41
jelmerMez: I don't think there's anything like that, but this should get you started:12:41
jelmerMez: from bzrlib.workingtree import WorkingTree; wt = WorkingTree.open("."); changes = wt.changes_from(wt.basis_tree())12:42
Mezjelmer: yeah - had just found that in the documentation.12:43
MezThough for some reason, taht doesn't show files that have been created, but not added.12:43
jelmerMez: wt.unknowns() will list those files12:44
jamgeekosopher: on Windows, we know that we can't trust the fs, so we use the executable bit from the basis inventory. We don't have a good way to know that the FS is vfat, AFAIK.12:44
jelmerjam: We could add a check to see if we can set the executable bit correctly, like we do with case sensitivity12:45
vilajelmer: +112:45
jamjelmer: case sensitivity only has to stat an existing file with a different path12:45
jamnot actually do a mutation operation12:46
jamlike chmod12:46
jamconsider readonly systems12:46
jamIt might be reasonable to check that during update, though12:46
Mezjelmer: what are delta.unchanged and delta.uncommitted for /12:46
jamI don't really want to do it on every 'bzr status'12:46
jelmerjam: fair enough12:46
Mezsorry, delta.unversioned12:46
jamMez: unchanged == files that are versioned that have not changed12:46
jamonly available if you pass include_unchanged12:46
jelmerjam: Perhaps just a setting in .bzr/checkout/checkout.conf that gets autoset upon checkout creation?12:47
vilajam: you can't have a wt on a readonly fs and run into the problem geekosopher is mentioning (IIUC)12:47
jamunversioned are files that exist, but have been marked for removale (such as with 'bzr rm')12:47
jamvila: I can do the checkout onto vfat, and you can run bzr st12:47
jamand you'll very likely have the problem12:47
jambecause vfat only has 1 global user and group12:47
jamfor the whole mount12:47
jambecause linux fakes it12:47
vilajam: but that's not readonly then12:47
jamvila: it *is* readonly for you12:48
jelmerjam: We could rely on the fact that vfat always sets +x, and we never normally set it on e.g. .bzr/format, but that is.. dubious12:48
jamjelmer: right, a setting that gets set during a write operation would be ok for me12:48
jamjelmer: it doesn't, it sets the files to whatever you set in /etc/fstab12:48
jamI think the default includes +x12:48
jambut I often reset it to 064412:48
jambecause I don't want everything to be +x12:48
jelmerah, I didn't realize you could override it12:48
jamuser, group, mode bits are all mount-time flags12:49
vilajam: right, but that's not what geekosopher is encountering12:49
jamjelmer: https://code.launchpad.net/~dmitrij.ledkov/bzr-keywords/more-keywords/+merge/23626 are you just proxying for him?12:49
vilajelmer: the problem with a setting in a conf file is that it won't be updated if the whole tree is copied on a different fs (well, until the next update...)12:50
jamvila: my point is that there are a lot of remaining edge cases12:50
jamdoing it 1 time during "initialize()" would handle a lot ofthem12:50
jamdoing it during mutating operations would handle most of the rest12:50
jamso "bzr revert" could detect it.12:50
jelmerjam: I don't think I follow, I was just commenting on the MP.12:50
jamjelmer: I got an email "You have been requested to review the proposed merge of ..." with your name on it12:51
jamI was trying to figure out wether you were proposing it for him, or what12:51
jelmerjam: ah12:51
jelmerI added bzr-core as reviewer, as Ian was previously the owner of lp:bzr-keywords12:51
jamjelmer: https://code.launchpad.net/~jelmer/bzr/blackbox-upgrade-formats/+merge/5129712:53
jamfor that one, I approved, but didn't look too closely12:53
jamI assume it is the same tests, just switching to knits, and adding one that upgrades from a fake format12:53
jelmerjam: Yeah, though changing the existing one that tested upgrading from a non-metadir format to a metadir format rather than adding a new one.12:54
vilajam, jelmer: Except for my huge mail backlog, are there events/decisions I should be aware of ?12:55
jelmerjam: There were already tests for e.g. just repository format upgrades12:55
jelmervila: not that I recall12:55
jamvila: poolie was gone 2 weeks ago, and is gone again this week, so not a lot of big policy decisions going on12:57
jamWe have a couple "Critical" bugs now, poolie was kind enough to set one and then leave :)12:58
jamI'll probably work on the repack inventories one soon.12:58
jamJust trying to finish getting my launchpad+loggerhead stuff flushed out of the pipe, first12:58
vilaok, thanks for the summary !12:58
=== Ursinha-afk is now known as Ursinha
jamjelmer: I'm getting OOPS trying to send email to launchpad. I'll try to submit to you directly.13:20
jelmerjam: ok13:23
jamjelmer: I think that is everything except for the repository_vf check_reconcile tests14:01
jamI'm a bit concerned that while the existing tests may not apply, we *should* still support some sort of reconciliation and checking on those repos.14:01
jamso it sounds more like some missing abstractions.14:01
jelmerjam: Thanks!14:07
* maxb grimaces at python-central deprecation notice14:08
maxbthat's going to make PPA builds fun14:08
jelmerjam: All of our current reconciliation seems specific to VersionedFiles, so while I think reconcilation would apply to e.g. Subversion repositories it would be for completely different issues.14:08
jelmermaxb: Yeah - for everything except Natty (and Maverick?)14:08
maxbI wonder if we drop Hardy support once Natty is out. It'll be at partial-EOL state then (server only014:10
maxbStill, someone probably still wants bzr core for it14:10
jammaxb: so is that python-central vs python-support?14:10
maxbpython-central vs. dh_python214:11
jamwhich itself was from python-support way back when14:11
maxbthe latter being something new that I have not learnt about yet14:11
jamsomething like dapper14:11
jamwhich did, indeed, cause some large headache in its time14:11
jamlovely we get to revisit them14:12
jelmerat least we now have a single python module support mechanism rather than 214:13
kyleNHello. I seem to have a lock file on LP that prevents me from pushing a branch. Can anyone assist me?14:28
kyleNI have tried bzr break-lock locally before pushing and running it with a bzr+ssh:// url to the server branch. still cannot push.14:28
PengIt's always possible someone really is using the branch, of course.14:29
PengIf not, "bzr break-lock bzr+ssh://..." should take care of it.14:29
kyleNit has been locked since Saturday and I think I am the only one working on the branch right now14:29
vilajam: why is bug #716777 against bzr ? Did you mean loggerhead or history-db instead ?14:29
ubot5Launchpad bug 716777 in Bazaar "history-db should handle OperationalError: database is locked" [Critical,Confirmed] https://launchpad.net/bugs/71677714:29
jamvila: it should be against loggerhead, yes14:41
jelmerjam: did you have any thoughts on the per_repository_vf MP?15:38
jelmer(the one that is a prerequisite for the check_reconcile MP)15:38
jam(3:00:52 PM) jam: jelmer: I think that is everything except for the repository_vf check_reconcile tests15:38
jam(3:01:11 PM) jam: I'm a bit concerned that while the existing tests may not apply, we *should* still support some sort of reconciliation and checking on those repos.15:38
jam(3:01:19 PM) jam: so it sounds more like some missing abstractions.15:38
jammaybe I missed a patch in there, though15:39
jelmerjam: I mean https://code.launchpad.net/~jelmer/bzr/per-repository-vf/+merge/51150 rather than https://code.launchpad.net/~jelmer/bzr/per-repository-vf-reconcile/+merge/5228315:39
jamjelmer: locally, the diff is empty15:39
jambut seems to be populated in the web ui15:40
jelmerPeng: Hi :) Or whatever the proper response to that is :)15:40
PengThe peroper response is "Peng, learn how to type your aliases properly!"15:41
PengHi, but I was just checkin' IRC before giving the laptop -- and maybe myself -- some sleep. Bye. <315:42
jamjelmer: It seems ok, but since you aren't removing any tests, I'm not really sure what it is getting you. Just the precursor to moving stuff over?15:44
jamthe config is all correct15:44
jelmerjam: It's moving a couple of tests to per_repository_vf, so those will no longer run against bzr-svn/bzr-git/bzr-hg15:44
jamjelmer: there are no '-' lines that would indicate that15:45
jamat least, that I can see15:45
jamcertainly it does add some tests15:45
jambut none are removed from elsewhere to be "moved"15:45
jamanyway, time to pick up my wife. I *think* things are ok, but I think I also need to think about implications in the long term.15:46
jamI'm a bit worried about us expecting new functionality is working, only to have the tests not testing against all implementations they should be, etc.15:46
jelmerjam: Those tests need to be moved rather than copied, I'll update the MP.15:47
jelmerjam: That's one of the reasons I've added the format attribute tests and made the format attributes default to None, so format implementations explicitly have to indicate whether they support something.15:47
jelmerI'm not sure what to do about code that relies on functionality that is a part of the VersionedFileRepository API but not of the smaller Repository API, it would be nice to somehow check that sort of thing.15:48
jelmers/it would be/I agree it would be/15:49
=== seiflotfy__ is now known as seiflotfy
tgall_foousers of bzr-git  :  what's the syntax to pull from a branch of a remote repo (IE from other than master)16:38
jelmertgall_foo: That's not possible at the moment, as there's no UI in Bazaar for addressing colocated branches16:39
jelmerIt's high on my todo list to finish that work. In the mean time, you can import all branches in a repository using "bzr git-import"16:39
tgall_foothanks jelmer16:40
tgall_foojelmer, followup,  I guess I was expected bzr git-import then to do an effective bzr branch for all the remote git branches..   after the bzr git-import least down the new refs directory it's empty16:46
jelmertgall_foo, it creates workingtree-less branches16:46
jelmertgall_foo, try running "bzr log" in one of them16:46
jelmertgall_foo, you can pull from them, or create a working tree by running "bzr checkout ."16:46
tgall_foothanks jelmer16:48
teamgbchey all17:09
jelmerhi teamgbc17:09
teamgbci'm new to bzr17:09
teamgbcand i want to do something simple, but for i'm having trouble17:10
teamgbci got bzr installed on 2 machines.... and one is supposed to be server17:10
teamgbcbut i can't connect ( get a project source) from the server17:10
teamgbci'm reading through some documentation, but i'm getting lost in the links17:10
teamgbci've gone through the setup tutorial17:12
teamgbcwhen i do bzr push --create-prefix sftp://localhost/teamgbc/17:12
teamgbci get bzr ERROR not a branch '/home/teamgbc/"17:13
teamgbcjust wondering if there is some tutorial somewhere17:13
teamgbcthat exists for almost complete newbies17:13
jelmerteamgbc, have you seen http://doc.bazaar.canonical.com/bzr.dev/en/?17:14
teamgbci guess i was thinking that i placed the trunk inside var/www17:15
teamgbcif i, i should be able to access the files via http...17:15
teamgbcJelmer, yup i've gone through it a little, and ended up starting it all with bzr explorer17:16
teamgbcand followed the tutorial for that17:16
teamgbci guess i should just start over eh?17:17
jelmersorry, distracted there for a bit17:25
jelmerteamgbc: pushing to sftp://localhost/teamgbc/ will push to /teamgbc on your local machine17:25
teamgbcso how am I supposed to reach my server then?17:25
teamgbci'm going to go back through the initial tutorial and do everything via the command line17:26
teamgbcthen i'll come back if i have issues, better than waste anyone's time17:26
jelmerteamgbc: well, localhost is your local machine :)17:26
teamgbccheers jelmer, much appreciated17:26
teamgbci mean i was trying /
teamgbcwhich is the server in the local network17:27
jelmerteamgbc: it'll push to the /teamgbc directory on that machine, are you sure that's where you want to push?17:27
teamgbcinteresting, no, that doesn't make much sense17:28
teamgbcok, i'm going to run through the command line tutorial.  I though the GUI would be easy enough to just create the trunk in a specified directory17:29
teamgbcand then type in that director location in the remote machine17:29
teamgbcto access the source or  open the remote location17:29
teamgbcthanks jelmer17:30
dpmhey jelmer, around?17:45
jelmerdpm: Hi David17:45
dpmjelmer, thanks a lot for merging my branch17:46
dpmI was wondering if you've got a few minutes if we could set up translations in the LP project17:46
jelmernp, thanks for adding i18n support in the first place17:46
jelmerdpm: Sure17:46
=== deryck is now known as deryck[lunch]
dpmok, cool, so it's basically here -> https://translations.launchpad.net/bzr-gtk/+configure-translations . The first thing is to set permissions, focus, and a couple of other things. My recommendations:17:48
dpm* Launchpad17:48
dpm* trunk17:48
dpm* launchpad-translators17:48
dpm* Restricted17:48
jelmerwhat's the difference between Launchpad and Ubuntu translators?17:49
dpmThe reason I suggest to assign it to the Launchpad Translators group is simply because bzr-gtk is not an Ubuntu-specific project, so Launchpad Translators makes more sense17:50
dpmthey are simply two translation groups17:50
dpma translation group contains translation teams, one per language17:50
dpmand they take care of translating particular projects17:50
dpmLaunchpad Translators is an umbrella for translating any project hosted in Launchpad for translation17:51
jelmerah, ok17:51
dpmUbuntu Translators, the same, but for any project specific to Ubuntu, or for the distro itself17:51
jelmerThanks - I've configured that page with the settings you suggested17:51
dpmcool, let me see what the next step is, probably translation imports17:52
dpmah, yeah, imports for the trunk branch17:53
dpmSo here: https://translations.launchpad.net/bzr-gtk/trunk/+translations-settings I'd suggest simply choosing "Import template files"17:54
dpmThat will import the bzr-gtk.pot template in the branch and expose it in the UI every time you update it and commit it17:55
dpmI'd also recommend updating it and committing it at least a few days before a release, so that translators see the latest strings and have time to translate it17:56
dpm(but that's got nothing to do with the settings, just a suggestion)17:56
jelmerdpm: done17:58
dpmcool thanks, so now for the final step: automatic exports, to get translations committed automatically to a branch of your choice17:58
dpmYou simply have to choose the branch where you want them committed here: https://translations.launchpad.net/bzr-gtk/trunk/+link-translations-branch - you can have a separate branch (if you want to keep it separate and merge it back to trunk regularly) or the main branch (if you just want to let LP do the right thing and forget about committing translations, and if you don't mind having automatic commits in the tree)18:01
dpm* A caveat: you might hit bug 407260 when trying to choose the branch, but it's got an easy workaround: "At the moment, team-owned branches don't work as expected. To work around this, make yourself the owner of the branch, set it as the translations branch, and then make the team the owner of the branch again."18:02
ubot5Launchpad bug 407260 in Launchpad itself "Translations export branch can't be team-owned" [High,Triaged] https://launchpad.net/bugs/40726018:02
jelmerfor the moment I'm more comfortable with a separate branch18:04
dpmsure, just laying out the options. You should choose the workflow that best suit your needs18:05
jelmerdpm: Cool - set18:05
dpmthen I think we're all done \o/18:05
dpmI'll be testing it in the next few days, thanks!18:05
jelmeryou - thanks for adding i18n support to bzr-gtk :)18:06
jelmers/you/you too/18:06
dpmno worries, my pleasure :)18:06
jelmerdpm: I guess it's still an issue that bzr itself doesn't support i18n? I.e. errors and warnings may come directly from bzr18:07
dpmoh, yeah, I hadn't thought of that. I'd be happy to help on that as well, but I'm not sure there are any plans to i18n'ize bzr?18:08
dpmHas this ever been discussed at all?18:09
jelmerI'm not aware of any. There's an open bug somewhere..18:09
dpmAt least SVN is internationalized, we could aim to beat that as well :)18:09
jelmerwith a comment from myself from 2007 :)18:10
jelmerit's been discussed offline a couple of times. From what I recall the main concern is that adding i18n support should not have a performance impact18:11
jelmerblindly gettexting all strings that might be user visible will add a significant overhead, as some of those get raised pretty often but are then not shown to the user18:13
jelmerit's not impossible but needs some thought18:13
dpmyeah, that's what I thought that'd be the main concern. AFAIK, gettext is really fast, so I don't think it should incur a performance drop, but only tests can tell18:13
dpmwell, I'll be happy to have a go at it and submit a MP for i18n'izing bzr itself, and then you guys can have a look.18:15
jelmerthat'd be awesome18:15
dpmI don't know when though, but I'll definitely look into it18:15
vanguardis there some way to save push/merge locations with a name like "origin" like one can in git?18:38
jelmerI think the bzr-bookmarks plugin is intended to work like that18:39
vanguardjelmer: k, I'll check it out18:50
=== deryck[lunch] is now known as deryck
vanguardcan I check out some revision without loosing everything after that revison?19:42
LeoNerdThe version that a checkout is at doesn't have to be the head revision in a branch...19:49
vanguardLeoNerd: So I do it the same way as in git, with a checkout command?19:51
LeoNerdbzr co -r12319:52
* LeoNerd dosen't know git19:52
LeoNerdI find it odd... people in here asking abuot git, people in #vim asking about emacs...19:52
LeoNerdYou can't just presume that people in #{$TOOL} would understand references to $OTHERTOOL  :)19:53
vanguardLeoNerd: People asked about some distro in #kubuntu ... that is the way it works. And where should I go if I want to get optinions from people who have experience with bzr and git?20:01
LeoNerdAh, well one -and- the other, is a different problem again20:02
=== mwhudson_ is now known as mwhudson
jasonlifeHow can I update my module to a old revision ?  "bzr update -r xxx" doesn't work..20:49
maxbjasonlife: doesn't work?20:50
jasonlifeafter I do this, I just checked revno, but it is still same..20:50
jasonlife"bzr  revno" show the same as before20:51
jasonlifeand bzr log shows all the logs too..20:51
maxbplease pastebin a transcript of the commands and responses20:51
jasonlifemaxb: so, "bzr update -r xxx" should work.. right?20:52
maxbyrs, it should20:52
maxbyes, even20:52
jasonlifeI will try this again and I will paste them again..20:52
jasonlifeok.. thanks..20:52
maxbthough it's a relatively new feature20:52
maxbwhat is your bzr version?20:53
mtaylorgiven two branch urls, is there an _easy_ way to determine if one is contained within another?20:54
jasonlife"bzr --version" shows 2.1.020:55
jasonlifeit happens on both 2.1.0 and 2.1.120:58
jasonlifewhen I run "bzr update -r xxx" , it actually revert the files to old revision, but "bzr revno" and "bzr log" shows the current revno and logs..20:59
knighthawkhelp I'm trying to prevent having to go back to svn. My team has been adapting pretty well to bzr however we have 3 party programmers who aren't used to bazaar and are running into major problems. at the heart of my problems is that they are using eclipse and the eclipse plugin doesn't seem to work all that well.21:38
knighthawkI guess I'm looking for idea's on the best way to handle this. (I don't want to go backwards) but I may have to set something up so that the 3rd party can use subversion. I keep hearing about a svn-bzr bridge will this help me any?21:39
knighthawkhow hard is it to move a bzr repo over to hg?22:03
beuno_knighthawk, pretty easy22:04
beuno_there's a bzr-hs plugin22:04
beuno_and there's fastimport, which is probablt best for a one-time import22:04
knighthawkthanks. I don't really know hg but it looks like if I switch now. I might be able to keep all the things I like about bzr and use their eclipse plugin.22:06
jelmerbzr-hg isn't really useful for bzr->hg, only for hg->bzr22:06
fullermdjasonlife: 'bzr revno' shows the revno of the _branch_; 'update' affects the _working tree_.  Try 'bzr revno --tree'.22:34
jasonlifefullermd: thank you very much22:46
jelmerlifeless: hi23:25
jelmerlifeless: I've been meaning to move get_{branch,workingtree,repository}_transport from ControlDir to BzrDir, as they don't really make sense for foreign formats.23:26
jelmerlifeless: Do you think that would that make sense? John mentioned you might have had another goal with them other than using them for metadir component initialization / opening.23:27
lifelessI have no idea23:27
lifelesscheck plugins all work as part of your pre-proposal-qa, and I'm sure you'll find any issues23:28
jelmerlifeless: of course23:29

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!