Switching to git - Page 2

sengian · 03-01-2014, 07:53 AM

Quote:

Originally Posted by kovidgoyal

Yeah searches have always been broken in Launchpad translations, for as long as I can remember. Other than that, most things work well.

Certainly if more people complain, I will consider moving to something else.

Fair enough.
It was mostly a timeout problem frequency, but it doesn't seem to bother others and there is always the question of finding a replacement...

Jellby · 03-09-2014, 10:08 AM

I wouldn't say it's unusable, but I agree it is sometimes quite annoying. Every action you take (not only searching) has a significant probability of resulting in a timeout, so you have to go back and try again, often several times.

Other features I miss are checking what the changes since the last update (or earlier), or what did a certain contributor change.

kovidgoyal · 03-09-2014, 12:10 PM

The .po files are tracked in bazaar, so if you want to see what has changed, you can always do that. http://bazaar.launchpad.net/~kovid/c.../translations/

Jellby · 03-09-2014, 04:08 PM

Quote:

Originally Posted by kovidgoyal

The .po files are tracked in bazaar, so if you want to see what has changed, you can always do that. http://bazaar.launchpad.net/~kovid/c.../translations/

That's better than nothing, but it's only updated weekly, while in launchpad you can see if someone made a change a few hours ago... but you can't see which change that was. The whole diff is also rather inconvenient to see, because it includes all changes in the source lines, not only in the strings (and it gets messy when the order of the strings changes).

sengian · 03-15-2014, 05:21 PM

Quote:

Originally Posted by Jellby

I wouldn't say it's unusable, but I agree it is sometimes quite annoying. Every action you take (not only searching) has a significant probability of resulting in a timeout, so you have to go back and try again, often several times.

Yes exactly my point! As to unusability, some people may say I can get a little short of patience

auspex · 08-23-2014, 08:30 AM

I forked a copy of calibre in my github account, and seeing that 2.0.0 has gone live figured I should get the upstream copy, but I had thought

Code:

git pull upstream

was a little simplistic when I first saw it. When I tried that on my local copy, I got:

Code:

$ git pull upstream
fatal: 'upstream' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

I know I've set an upstream repository in an existing git before, so I'm sure I can fix this, but I'd appreciate it if anybody else could tell me off the top of their head what I need to do.

kovidgoyal · 08-23-2014, 09:32 AM

Just do git pull

it should pull from whatever branch is set as the default pull remote.

auspex · 08-23-2014, 09:51 PM

Well, the default is going to be MY forked repository, which I'm sure I could also sync in GitHub. Your instructions say to use "git pull upstream", but 'upstream' isn't set.

auspex · 08-23-2014, 09:56 PM

So what I need is:

Code:

git remote add upstream https://github.com/kovidgoyal/calibre.git

and then

Code:

git merge upstream/master

kovidgoyal · 08-23-2014, 11:24 PM

Ah, well I was referring to "simple" a git checkout like this

git clone git://github.com/kovidgoyal/calibre.git

I see I forgot to add a line on creating the upstream alais to the github workflow section, I will fix that.

08-23-2014, 08:30 AM	#21
auspex Groupie Posts: 199 Karma: 1071756 Join Date: Sep 2012 Location: Nova Scotia Device: Kobo Aura, Nexus 5x	I forked a copy of calibre in my github account, and seeing that 2.0.0 has gone live figured I should get the upstream copy, but I had thought Code: git pull upstream was a little simplistic when I first saw it. When I tried that on my local copy, I got: Code: $ git pull upstream fatal: 'upstream' does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. I know I've set an upstream repository in an existing git before, so I'm sure I can fix this, but I'd appreciate it if anybody else could tell me off the top of their head what I need to do.

08-23-2014, 09:56 PM	#24
auspex Groupie Posts: 199 Karma: 1071756 Join Date: Sep 2012 Location: Nova Scotia Device: Kobo Aura, Nexus 5x	So what I need is: Code: git remote add upstream https://github.com/kovidgoyal/calibre.git and then Code: git merge upstream/master Last edited by auspex; 08-23-2014 at 10:10 PM.

Thread Tools	Search this Thread
Show Printable Version Email this Page	Search this Thread: Advanced Search

Similar Threads
Thread	Thread Starter	Forum	Replies	Last Post
Compiling from git, Ubuntu 12.04	varlog	Sigil	16	01-24-2013 04:27 AM
[O'Reilly] 50% off ebook/video about GIT (till 9.10.2012)	Cyberman tM	Deals and Resources (No Self-Promotion or Affiliate Links)	0	10-02-2012 01:52 PM
EPUB for GIT User manual	miwie	Conversion	2	07-20-2011 01:19 AM
HowTo: Use git under Windows to track calibre development	siebert	Development	0	02-26-2011 05:27 PM
Switching To Android	kjk	Android Devices	12	07-16-2010 03:55 AM

03-09-2014, 10:08 AM	#17
Jellby frumious Bandersnatch Posts: 7,515 Karma: 18512745 Join Date: Jan 2008 Location: Spaniard in Sweden Device: Cybook Orizon, Kobo Aura	I wouldn't say it's unusable, but I agree it is sometimes quite annoying. Every action you take (not only searching) has a significant probability of resulting in a timeout, so you have to go back and try again, often several times. Other features I miss are checking what the changes since the last update (or earlier), or what did a certain contributor change.

03-09-2014, 12:10 PM	#18
kovidgoyal creator of calibre Posts: 43,838 Karma: 22666666 Join Date: Oct 2006 Location: Mumbai, India Device: Various	The .po files are tracked in bazaar, so if you want to see what has changed, you can always do that. http://bazaar.launchpad.net/~kovid/c.../translations/

08-23-2014, 09:32 AM	#22
kovidgoyal creator of calibre Posts: 43,838 Karma: 22666666 Join Date: Oct 2006 Location: Mumbai, India Device: Various	Just do git pull it should pull from whatever branch is set as the default pull remote.

08-23-2014, 09:51 PM	#23
auspex Groupie Posts: 199 Karma: 1071756 Join Date: Sep 2012 Location: Nova Scotia Device: Kobo Aura, Nexus 5x	Well, the default is going to be MY forked repository, which I'm sure I could also sync in GitHub. Your instructions say to use "git pull upstream", but 'upstream' isn't set.

08-23-2014, 11:24 PM	#25
kovidgoyal creator of calibre Posts: 43,838 Karma: 22666666 Join Date: Oct 2006 Location: Mumbai, India Device: Various	Ah, well I was referring to "simple" a git checkout like this git clone git://github.com/kovidgoyal/calibre.git I see I forgot to add a line on creating the upstream alais to the github workflow section, I will fix that.