Re: [Geeqie-devel] Git repository workflow

[Josef Kufner]

> Am Mo den  2. Mai 2016 um 18:53 schrieb Josef Kufner:
>> Git hooks are not the right tool for this task. It is better to run `git
>> describe` during the build process to generate a version file, which
>> will be compiled in and shown by `geeqie --version`.
> 
>> It is easy to automatically generate version.h with few #define
>> statements or something like that and include it wherever neccessary.
> 
> Yes. That is also what I think about that.
> 
> But there is a problem when people use the tarbal to build their
> version.
> 
> So the version has to be in the checked out file. There is some substs
> that could be used eventually. But finally it has to be set with
> checkin, so a hook. Unfortunately for a hook, every developer has to
> have them in all the clones. There is no way to manage them within git.
> 
> Nevertheless, it is easy to have just "master" in version information.

Tarball from Github contains root directory named geeqie-1.2.3. So there
is a reasonable fallback. Not perfect, but good enough.

Simply force generation of version.h during build and it will be fine.
Hooks are much more problematic. I use generated version info in all my
projects and it works very well.

My last Qt project used this in qmake project file:

  GIT_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD \
describe --always --tags)
  DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"

It results in gcc -DGIT_VERSION=\"1.2.3\" ...

--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Re: [Geeqie-devel] Git repository workflow

[Josef Kufner]

Git hooks are not the right tool for this task. It is better to run `git
describe` during the build process to generate a version file, which
will be compiled in and shown by `geeqie --version`.

It is easy to automatically generate version.h with few #define
statements or something like that and include it wherever neccessary.


Colin Clark wrote, on 2.5.2016 19:46:
> 
>> I'll post in the issues if appropriate: the question I have at the
>> moment is that the about box seems woefully out of date, as is "geeqie
>> --version". I am fairly sure I am compiling master HEAD.
>>
> Hi Klaus
> 
> There have been quite a few updates to the repository recently, and 
> maybe a few more to come from me - e.g. copy/move with thumbnail preview 
> and simultaneous rename, additional search functions.
> 
> I think people may try to keep up to date by downloading the master 
> rather than wait for a release, but that gives a problem when they 
> report problems - what have they compiled?.
> 
> Is it a simple thing to use git hooks to run a command to update a file 
> in the repo at each commit, so that the About window can show not just 
> major/minor version, but also e.g. the output of "git describe" at the 
> time the last commit was made?
> 
> If not, no problem.
> 
> 
> Colin...
> 
> 
> --
> Find and fix application performance issues faster with Applications Manager
> Applications Manager provides deep performance insights into multiple tiers of
> your business applications. It resolves application problems quickly and
> reduces your MTTR. Get your free trial!
> https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
> ___
> Geeqie-devel mailing list
> Geeqie-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/geeqie-devel
> 

--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Re: [Geeqie-devel] Git repository workflow

[Colin Clark]

> I'll post in the issues if appropriate: the question I have at the
> moment is that the about box seems woefully out of date, as is "geeqie
> --version". I am fairly sure I am compiling master HEAD.
>
Hi Klaus

There have been quite a few updates to the repository recently, and 
maybe a few more to come from me - e.g. copy/move with thumbnail preview 
and simultaneous rename, additional search functions.

I think people may try to keep up to date by downloading the master 
rather than wait for a release, but that gives a problem when they 
report problems - what have they compiled?.

Is it a simple thing to use git hooks to run a command to update a file 
in the repo at each commit, so that the About window can show not just 
major/minor version, but also e.g. the output of "git describe" at the 
time the last commit was made?

If not, no problem.


Colin...


--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Re: [Geeqie-devel] Git repository workflow

[Russel Winder]

On Mon, 2016-05-02 at 11:18 +0100, Klaus Ethgen wrote:
> 
[…]
> 
> Well, it is the only place, we have currently.

Works for me. :-)

[…]
> 
> Well, that is only in the head. If you checkout current released
> version
> 1.2.3, you have a actual version there.

OK. I got confused because the master about was not clearly a
development one.

Debian Sid and Fedora Rawhide both have 1.2.2 which doesn't do dark
theme properly. Given I am compiling locally, I might as well compile
head rather than the release, then at least I can report problems I
see.

-- 
Russel.
=
Dr Russel Winder  t: +44 20 7585 2200   voip: sip:russel.win...@ekiga.net
41 Buckmaster Roadm: +44 7770 465 077   xmpp: rus...@winder.org.uk
London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder

signature.asc
Description: This is a digitally signed message part
--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Re: [Geeqie-devel] Git repository workflow

[Klaus Ethgen]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Hi,

Am Mo den  2. Mai 2016 um 11:04 schrieb Russel Winder:
> > I do manually sync them one between the other currently. So if you
> > have
> > a pull request on Github, it will work too currently.
> 
> So I guess the Issues on this repository are the official p[lace to
> post issues on the code?

Well, it is the only place, we have currently.

> > But with git it doesn't really matter which is main and which is
> > mirror.
> > Both have the same content. (Most of the time)
> 
> The "most of the time" is actually the crucial bit in ,any cases, hence
> my question about which is the mainline.

Th "most of the time" just mean that there might be one or two commits
more on geeqie.org that will end in Github later.

> > Colin and myself currently are working primary on geeqie.org. It is
> > most
> > likely that this repository is the most current one.
> > 
> I'll post in the issues if appropriate: the question I have at the
> moment is that the about box seems woefully out of date, as is "geeqie
> --version". I am fairly sure I am compiling master HEAD.

Well, that is only in the head. If you checkout current released version
1.2.3, you have a actual version there.

Regards
   Klaus
- -- 
Klaus Ethgen  http://www.ethgen.ch/
pub  4096R/4E20AF1C 2011-05-16   Klaus Ethgen 
Fingerprint: 85D4 CA42 952C 949B 1753  62B3 79D0 B06F 4E20 AF1C
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
Comment: Charset: ISO-8859-1

iQGbBAEBCgAGBQJXJyl3AAoJEKZ8CrGAGfasicQL91+zIU5UhP/f3dy6MzW3AyHw
YPprirOqaGRTLTuZR2gc8965xCFdODD6gETcDXFcfZUTCugM3nEMKXQW1aY7yLqy
B0UtLMc3EUo6i+8WkF2UjELQPLjXszKtGQPafGG8Vr1RO9WGb6pQrYbXcqiJ3sC5
bB0dA6TWx1GqWt15BldSsFk/SIltbBiskkYTGE9mJ/8z9HzZ+s9Gy/VtU99Pgkhv
cE0J5Cy6i7bP/o6nUG0lvPWcyfTZ+n6eAu8iMrKOlDgKTjjV8gp3/RAh7URjLPIP
ZyZ/Cc4yabUwStlm8NC6i9c60rZWRkzFCFnLOeI+WdmIeeUirKtCgOFKe11EUhC1
DwM2FCEGeoA18/rat4gnwEAWPA0pqBm2zuqhF6izqx3em6XuDuNPX7yOE20ibHG4
nAhcMjVFOo0SvQL0jIV91pc/Mu/EOR/tuy6KlOxpSExVhAhuCESGFZX52O93ltL9
ldlMqEFD8F/OuquZ6aZatKUNTBvkdhKQODA6loFa
=ukOj
-END PGP SIGNATURE-

--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Re: [Geeqie-devel] Git repository workflow

[Russel Winder]

Klaus,

Thanks for getting back to me quickly, much appreciated.

On Mon, 2016-05-02 at 10:47 +0100, Klaus Ethgen wrote:
> Hi Russel,
> 
[…]
> 
> The one on www.geeqie.org is the main one.

This is the one I currently have a clone of so I will stick with that,
at least for now.
 
> I do manually sync them one between the other currently. So if you
> have
> a pull request on Github, it will work too currently.

So I guess the Issues on this repository are the official p[lace to
post issues on the code?

> But with git it doesn't really matter which is main and which is
> mirror.
> Both have the same content. (Most of the time)

The "most of the time" is actually the crucial bit in ,any cases, hence
my question about which is the mainline.

> Colin and myself currently are working primary on geeqie.org. It is
> most
> likely that this repository is the most current one.
> 
I'll post in the issues if appropriate: the question I have at the
moment is that the about box seems woefully out of date, as is "geeqie
--version". I am fairly sure I am compiling master HEAD.

-- 
Russel.
=
Dr Russel Winder  t: +44 20 7585 2200   voip: sip:russel.win...@ekiga.net
41 Buckmaster Roadm: +44 7770 465 077   xmpp: rus...@winder.org.uk
London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder

signature.asc
Description: This is a digitally signed message part
--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Re: [Geeqie-devel] Git repository workflow

[Klaus Ethgen]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Hi Russel,

Am Mo den  2. Mai 2016 um  8:56 schrieb Russel Winder:
> Is the Git repository on www.geeqie.org the mainline and the one on
> GitHub (https://github.com/BestImageViewer/geeqie) a mirror or is the
> one on GitHub the mainline and the one on www.geeqie.org a mirror? 

The one on www.geeqie.org is the main one.

I do manually sync them one between the other currently. So if you have
a pull request on Github, it will work too currently.

But with git it doesn't really matter which is main and which is mirror.
Both have the same content. (Most of the time)

Colin and myself currently are working primary on geeqie.org. It is most
likely that this repository is the most current one.

Gruß
   Klaus
- -- 
Klaus Ethgen  http://www.ethgen.ch/
pub  4096R/4E20AF1C 2011-05-16   Klaus Ethgen 
Fingerprint: 85D4 CA42 952C 949B 1753  62B3 79D0 B06F 4E20 AF1C
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
Comment: Charset: ISO-8859-1

iQGcBAEBCgAGBQJXJyIoAAoJEKZ8CrGAGfasMS4MAKxSVKLyRkv5hN9OvSDajKji
QNZzbKqsyT5XsBil7s96+bHZ274BFAThOQCqmyGM7lOmrg3d+fTSEKHRItrPYRu9
UdJtoAHqaUDJgyuIO1tvUZ7sEer2vCnnR1TisjcHyID2QtEAxBxuIVU4oMygwYsF
dzMjFMENY9NUuTKecxhrONvZzNaUIRkmi4FFp/mXu4Xo4gjIw+c2Z/InhHhWPtjn
HPBSKm5cGbAeCKy8Z7Np1oW4oXJLEh80vxNfmp0yhPr1Rucx+fMtK/cGwM1HgUvF
U70/0veqzOGG1XPAE5D0v71NRmK20vCLF3IsNz1dUHBxxJFw5hHBL/s/TxcHMpmV
J9qSUzxjpB3dyEEw95SOJBcNDzQl1j0mpVPdD/2lHU6CNlxtxfGu1Jw3noVSKo+I
MD8Hu1qvDNFs9v3PRhWg0ElbqgSf2QVnn9yO4FOu4LoykhJMeKadPxq+bBX3LN3a
IlJ/o/udfk26jj6BL4JT5xTGz0KJiVAWnhVRjyINoA==
=Nmfz
-END PGP SIGNATURE-

--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

[Geeqie-devel] Git repository workflow

[Russel Winder]

Hi,

I have probably failed to correctly search the archive, but…

Is the Git repository on www.geeqie.org the mainline and the one on
GitHub (https://github.com/BestImageViewer/geeqie) a mirror or is the
one on GitHub the mainline and the one on www.geeqie.org a mirror? 

-- 
Russel.
=
Dr Russel Winder  t: +44 20 7585 2200   voip: sip:russel.win...@ekiga.net
41 Buckmaster Roadm: +44 7770 465 077   xmpp: rus...@winder.org.uk
London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder

signature.asc
Description: This is a digitally signed message part
--
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z___
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel