workflow

workflow

[Catonano]

[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]

I am trying to use git worktree, as suggested

I'm tying to update python-magic from 0.4.3 to 0.4.15 in a worktree based
branch

The new version builds fine

But in preparing the commit, I find a lot of files that I didn't touch to
be changed

$ git status
Sul branch update-tryton
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   gnu/packages/python.scm
    modified:   po/guix/cs.po
    modified:   po/guix/da.po
    modified:   po/guix/de.po
    modified:   po/guix/eo.po
    modified:   po/guix/fr.po
    modified:   po/guix/hu.po
    modified:   po/guix/pl.po
    modified:   po/guix/pt_BR.po
    modified:   po/guix/sr.po
    modified:   po/guix/vi.po
    modified:   po/guix/zh_CN.po
    modified:   po/packages/da.po
    modified:   po/packages/de.po
    modified:   po/packages/eo.po
    modified:   po/packages/fr.po
    modified:   po/packages/hu.po
    modified:   po/packages/pl.po
    modified:   po/packages/pt_BR.po
    modified:   po/packages/sr.po
    modified:   po/packages/vi.po

I only edited the first one, gnu/packages/python.scm

I didn't remember this to happen before testing git worktree
Right ?

What are these po/* files ?

[-- Attachment #2: Type: text/html, Size: 1666 bytes --]

Re: workflow

[Catonano]

[-- Attachment #1: Type: text/plain, Size: 1700 bytes --]

2018-01-04 10:37 GMT+01:00 Catonano <catonano@gmail.com>:

> I am trying to use git worktree, as suggested
>
> I'm tying to update python-magic from 0.4.3 to 0.4.15 in a worktree based
> branch
>
> The new version builds fine
>
> But in preparing the commit, I find a lot of files that I didn't touch to
> be changed
>
> $ git status
> Sul branch update-tryton
> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
>
>     modified:   gnu/packages/python.scm
>     modified:   po/guix/cs.po
>     modified:   po/guix/da.po
>     modified:   po/guix/de.po
>     modified:   po/guix/eo.po
>     modified:   po/guix/fr.po
>     modified:   po/guix/hu.po
>     modified:   po/guix/pl.po
>     modified:   po/guix/pt_BR.po
>     modified:   po/guix/sr.po
>     modified:   po/guix/vi.po
>     modified:   po/guix/zh_CN.po
>     modified:   po/packages/da.po
>     modified:   po/packages/de.po
>     modified:   po/packages/eo.po
>     modified:   po/packages/fr.po
>     modified:   po/packages/hu.po
>     modified:   po/packages/pl.po
>     modified:   po/packages/pt_BR.po
>     modified:   po/packages/sr.po
>     modified:   po/packages/vi.po
>
> I only edited the first one, gnu/packages/python.scm
>
> I didn't remember this to happen before testing git worktree
> Right ?
>
> What are these po/* files ?
>


This is a little bit annoying, as I can't rebase my branch on master in
order to edit the commit message without dealing with those too (stashing
or checking them out back to where they were)

Nothing unsurmountable, I was just curious if there's a best practice here

[-- Attachment #2: Type: text/html, Size: 2367 bytes --]

Re: workflow

[ng0]

[-- Attachment #1: Type: text/plain, Size: 2684 bytes --]

Catonano transcribed 4.7K bytes:
> 2018-01-04 10:37 GMT+01:00 Catonano <catonano@gmail.com>:
> 
> > I am trying to use git worktree, as suggested
> >
> > I'm tying to update python-magic from 0.4.3 to 0.4.15 in a worktree based
> > branch
> >
> > The new version builds fine
> >
> > But in preparing the commit, I find a lot of files that I didn't touch to
> > be changed
> >
> > $ git status
> > Sul branch update-tryton
> > Changes not staged for commit:
> >   (use "git add <file>..." to update what will be committed)
> >   (use "git checkout -- <file>..." to discard changes in working directory)
> >
> >     modified:   gnu/packages/python.scm
> >     modified:   po/guix/cs.po
> >     modified:   po/guix/da.po
> >     modified:   po/guix/de.po
> >     modified:   po/guix/eo.po
> >     modified:   po/guix/fr.po
> >     modified:   po/guix/hu.po
> >     modified:   po/guix/pl.po
> >     modified:   po/guix/pt_BR.po
> >     modified:   po/guix/sr.po
> >     modified:   po/guix/vi.po
> >     modified:   po/guix/zh_CN.po
> >     modified:   po/packages/da.po
> >     modified:   po/packages/de.po
> >     modified:   po/packages/eo.po
> >     modified:   po/packages/fr.po
> >     modified:   po/packages/hu.po
> >     modified:   po/packages/pl.po
> >     modified:   po/packages/pt_BR.po
> >     modified:   po/packages/sr.po
> >     modified:   po/packages/vi.po
> >
> > I only edited the first one, gnu/packages/python.scm
> >
> > I didn't remember this to happen before testing git worktree
> > Right ?
> >
> > What are these po/* files ?
> >
> 
> 
> This is a little bit annoying, as I can't rebase my branch on master in
> order to edit the commit message without dealing with those too (stashing
> or checking them out back to where they were)
> 
> Nothing unsurmountable, I was just curious if there's a best practice here

Yeah, it can be confusing at first when someone is not used to .po files.

You can stash those po/* files, it's the first thing I do if I ever
happen to work on a complete new checkout.
They are the translation files, pulled in by the bootstrap/configure process of
Guix.
I would commit your changes to gnu/packages/python.scm and then simply run
git stash

If you'd ever want to get those files back (you don't really need to), you
can take a look at the options of git stash or the general stash workflow.
git stash apply would reapply those changes on top of you current HEAD.
You could also drop the stashed changes, etc.
-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is/a/  ::  https://ea.n0.is

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: workflow

[Chris Marusich]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

ng0 <ng0@n0.is> writes:

> You can stash those po/* files, it's the first thing I do if I ever
> happen to work on a complete new checkout.

Do you stash JUST the po files?  I have often found these po files very
annoying while trying to make changes to Guix and test locally.  I think
that if I do "git stash" and later "git stash pop", it updates the
timestamps of many files, so "make" rebuilds many, many things that it
really doesn't have to.

Beyond doing "git checkout po" are there any other ways to deal with
these po files that won't negate make's incremental build feature?

-- 
Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: workflow

[ng0]

[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]

Chris Marusich transcribed 1.6K bytes:
> ng0 <ng0@n0.is> writes:
> 
> > You can stash those po/* files, it's the first thing I do if I ever
> > happen to work on a complete new checkout.
> 
> Do you stash JUST the po files?

Yep. And I never stash apply them back. There's a stash of the po that I have
for about almost as long as I contribute to Guix.

> I have often found these po files very
> annoying while trying to make changes to Guix and test locally.  I think
> that if I do "git stash" and later "git stash pop", it updates the
> timestamps of many files, so "make" rebuilds many, many things that it
> really doesn't have to.
> 
> Beyond doing "git checkout po" are there any other ways to deal with
> these po files that won't negate make's incremental build feature?
> 
> -- 
> Chris

Maybe we could add them to .gitignore, but I haven looked into the
buildsystem for some time, if that would affect for example make dist.
But as long as you don't run make dist you could have them in a .gitignore.

-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is/a/  ::  https://ea.n0.is

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: workflow

[Hartmut Goebel]

Am 04.01.2018 um 10:46 schrieb Catonano:
> This is a little bit annoying, as I can't rebase my branch on master
> in order to edit the commit message without dealing with those too
> (stashing or checking them out back to where they were)

Try this:

git checkout po

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: workflow

[Catonano]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

2018-01-04 11:13 GMT+01:00 Hartmut Goebel <h.goebel@crazy-compilers.com>:

> Am 04.01.2018 um 10:46 schrieb Catonano:
> > This is a little bit annoying, as I can't rebase my branch on master
> > in order to edit the commit message without dealing with those too
> > (stashing or checking them out back to where they were)
>
> Try this:
>
> git checkout po
>

So the best practice is to deal with them ;-)

Ok, at least this happens only the first time and thhen no more

Thanks !

[-- Attachment #2: Type: text/html, Size: 946 bytes --]

Re: workflow

[Danny Milosavljevic]

> What are these po/* files ?

Translations of human-readable text.

Re: workflow

[Catonano]

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

2018-01-04 11:15 GMT+01:00 Danny Milosavljevic <dannym@scratchpost.org>:

> > What are these po/* files ?
>
> Translations of human-readable text.
>

Some day I will have to learn this translation machinery

For now I'm learning magit amd git worktree

Thanks !

[-- Attachment #2: Type: text/html, Size: 709 bytes --]