Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #9192 > unrolled thread

git-dpm breakage src:faker

Back to article view | Back to linux.debian.maint.python

Contents

  git-dpm breakage src:faker Brian May <bam@debian.org> - 2017-01-28 22:50 +0100
    Re: git-dpm breakage src:faker Brian May <bam@debian.org> - 2017-01-28 23:00 +0100
      Re: git-dpm breakage src:faker Scott Kitterman <debian@kitterman.com> - 2017-01-28 23:20 +0100
        Re: git-dpm breakage src:faker Brian May <bam@debian.org> - 2017-01-28 23:40 +0100
          Re: git-dpm breakage src:faker Scott Kitterman <debian@kitterman.com> - 2017-01-29 00:00 +0100
            Re: git-dpm breakage src:faker Arto Jantunen <viiru@debian.org> - 2017-01-29 08:30 +0100
              Re: git-dpm breakage src:faker Scott Kitterman <debian@kitterman.com> - 2017-01-29 21:00 +0100
                Re: git-dpm breakage src:faker Brian May <bam@debian.org> - 2017-01-30 10:20 +0100
              Re: git-dpm breakage src:faker Thomas Goirand <zigo@debian.org> - 2017-02-13 02:30 +0100
          Re: git-dpm breakage src:faker Raphael Hertzog <hertzog@debian.org> - 2017-01-29 21:00 +0100
            Re: git-dpm breakage src:faker Simon McVittie <smcv@debian.org> - 2017-01-29 21:50 +0100
            Re: git-dpm breakage src:faker Brian May <bam@debian.org> - 2017-01-30 07:40 +0100
          Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-01-31 20:30 +0100
            Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Scott Kitterman <debian@kitterman.com> - 2017-01-31 21:00 +0100
              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-01-31 21:00 +0100
              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-05 06:00 +0100
                Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Scott Kitterman <debian@kitterman.com> - 2017-02-05 08:10 +0100
                  Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-02-06 22:30 +0100
                  Re: Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Ghislain Vaillant <ghisvail@gmail.com> - 2017-02-07 12:10 +0100
                    Re: Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Simon McVittie <smcv@debian.org> - 2017-02-07 15:10 +0100
                    Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-02-07 15:20 +0100
                      Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Nikolaus Rath <Nikolaus@rath.org> - 2017-02-09 20:00 +0100
                        Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Scott Kitterman <debian@kitterman.com> - 2017-02-10 03:30 +0100
                          Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Nikolaus Rath <Nikolaus@rath.org> - 2017-02-10 05:30 +0100
                            Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Scott Kitterman <debian@kitterman.com> - 2017-02-10 07:00 +0100
                              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-10 11:20 +0100
                                Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) kuLa <kula@kulisz.net> - 2017-02-10 11:40 +0100
                                  Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-11 03:10 +0100
                              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Nikolaus Rath <Nikolaus@rath.org> - 2017-02-11 22:10 +0100
                                Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Scott Kitterman <debian@kitterman.com> - 2017-02-14 02:50 +0100
                                  Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-14 08:30 +0100
                                    Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Scott Kitterman <debian@kitterman.com> - 2017-02-14 20:00 +0100
                                  Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Nikolaus Rath <Nikolaus@rath.org> - 2017-02-16 06:20 +0100
                                    Re: Moving off of git-dpm Piotr Ożarowski <piotr@debian.org> - 2017-02-16 12:40 +0100
                                      Re: Moving off of git-dpm Dimitri John Ledkov <xnox@debian.org> - 2017-02-16 13:50 +0100
                                        Re: Moving off of git-dpm Scott Kitterman <debian@kitterman.com> - 2017-02-16 14:00 +0100
                                          Re: Moving off of git-dpm Barry Warsaw <barry@debian.org> - 2017-02-16 16:00 +0100
                            Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-10 11:10 +0100
                              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-11 02:30 +0100
                    Re: Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Dmitry Shachnev <mitya57@debian.org> - 2017-02-07 21:20 +0100
            Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-05 06:10 +0100
              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-02-06 22:30 +0100
                Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-08 09:10 +0100
                  Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-13 07:00 +0100
                    Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-02-13 17:20 +0100
                      Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-14 08:00 +0100
                        Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-02-14 08:20 +0100
                        Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-02-14 17:30 +0100
                          Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Arto Jantunen <viiru@debian.org> - 2017-02-14 17:40 +0100
                            Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Barry Warsaw <barry@debian.org> - 2017-02-14 17:50 +0100
                              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Simon McVittie <smcv@debian.org> - 2017-02-14 18:00 +0100
                              Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Arto Jantunen <viiru@debian.org> - 2017-02-14 18:00 +0100
                        Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Brian May <bam@debian.org> - 2017-03-09 11:20 +0100
                          Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Vincent Bernat <bernat@debian.org> - 2017-03-09 11:30 +0100
                          Re: Moving off of git-dpm (Re: git-dpm breakage src:faker) Ghislain Vaillant <ghisvail@gmail.com> - 2017-03-09 12:10 +0100

Page 3 of 3 — ← Prev page 1 2 [3]

#9216 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Barry Warsaw <barry@debian.org> writes:

> What I'd really like to see is a page like
> https://wiki.debian.org/Python/GitPackaging for a non-git-dpm workflow.  (The
> page itself could probably use a bit of gardening anyway.)  Specifically, I'd
> like to see guidance on any tasks which are different for git-pq (or
> non-git-dpm as the case may be).
>
> I'd suggest cloning that page instead of modify that page to cover both
> cases.  Edit the clone as if it were the opinionated view of just using gbp
> tools and gbp-pq.  The page should also have instructions on opportunistically
> switching away from git-dpm.

What should we call the clone page?

PqGitPackaging???
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#9222 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

On Feb 05, 2017, at 04:01 PM, Brian May wrote:

>What should we call the clone page?
>
>PqGitPackaging???

GitPackagingPq ?

Cheers,
-Barry

[toc] | [prev] | [next] | [standalone]

#9233 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Barry Warsaw <barry@debian.org> writes:

> On Feb 05, 2017, at 04:01 PM, Brian May wrote:
>
>>What should we call the clone page?
>>
>>PqGitPackaging???
>
> GitPackagingPq ?

https://wiki.debian.org/Python/GitPackagingPQ

So far it is just a clone, I haven't tried making any changes.
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#9256 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Brian May <bam@debian.org> writes:

> https://wiki.debian.org/Python/GitPackagingPQ
>
> So far it is just a clone, I haven't tried making any changes.

I have gone through and made numerous updates.

There might be errors, as I was going from memory for some of this
stuff.

I didn't specify anything for dgit. The only sections that would require
changing would be the building and uploading sections, everything else
documented here would be unchanged.
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#9257 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

On Feb 13, 2017, at 04:56 PM, Brian May wrote:

>There might be errors, as I was going from memory for some of this
>stuff.

Thanks Brian.  I did a quick review (without testing) and it looks pretty
good.

One section I think we should add at some point is instructions on how to
manually convert to gbp-pq, at least until we do a mass conversion.

I don't personally expect to do much package maintenance until after Stretch,
but when I do, I'll pick a package to test this workflow on.

Cheers,
-Barry

[toc] | [prev] | [next] | [standalone]

#9259 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Barry Warsaw <barry@debian.org> writes:

> One section I think we should add at some point is instructions on how to
> manually convert to gbp-pq, at least until we do a mass conversion.

Yes agreed.

Not sure how to unapply all patches. "quilt pop -a" won't work, quilt
doesn't realize the patches are applied.

"git checkout upstream -- ." would work, but won't delete any files that
were created by the patch.

Maybe something like the following?

git read-tree --reset -u upstream
git reset -- debian
git checkout debian
git rm debian/.git-dpm

The first line sets the tree as per the latest upstream (assuming this
is uptodate) and then restores the debian directory that got
deleted. Then we just have to delete the debian/.git-dpm file and are
finished.
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#9260 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Brian May <bam@debian.org> writes:

> git read-tree --reset -u upstream
> git reset -- debian
> git checkout debian
> git rm debian/.git-dpm
git commit

Of course...
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#9262 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

On Feb 14, 2017, at 05:54 PM, Brian May wrote:

>Not sure how to unapply all patches. "quilt pop -a" won't work, quilt
>doesn't realize the patches are applied.

Yep, that does seem to be the problem.

>Maybe something like the following?
>
>git read-tree --reset -u upstream
>git reset -- debian
>git checkout debian
>git rm debian/.git-dpm
>git commit

This gets closer, but there still seems to be problems.

gbp pq import
gbp pq export --drop

That seems to round trip okay, and it just removes a few crufty lines from the
patches.  The problem comes when you try to rebase your patches on top of
upstream.

gbp pq import
git rebase -i upstream
(way way more commits to pick from than expected)

Hmm.
-Barry

[toc] | [prev] | [next] | [standalone]

#9263 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Barry Warsaw <barry@debian.org> writes:
> On Feb 14, 2017, at 05:54 PM, Brian May wrote:
>>Maybe something like the following?
>>
>>git read-tree --reset -u upstream
>>git reset -- debian
>>git checkout debian
>>git rm debian/.git-dpm
>>git commit
>
> This gets closer, but there still seems to be problems.
>
> gbp pq import
> gbp pq export --drop
>
> That seems to round trip okay, and it just removes a few crufty lines from the
> patches.  The problem comes when you try to rebase your patches on top of
> upstream.
>
> gbp pq import
> git rebase -i upstream
> (way way more commits to pick from than expected)

The patch-queue branch is based on the Debian branch, not upstream. Try
merging the new upstream version to your Debian branch, and then running
gbp pq rebase.

-- 
Arto Jantunen

[toc] | [prev] | [next] | [standalone]

#9264 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

On Feb 14, 2017, at 06:30 PM, Arto Jantunen wrote:

>The patch-queue branch is based on the Debian branch, not upstream. Try
>merging the new upstream version to your Debian branch, and then running
>gbp pq rebase.

This confuses me, or I'm doing something wrong.  With git-dpm the way to drop
patches was to rebase interactively against upstream.  That doesn't seem to
work with gbp pq rebase, or with gbp pq import & git rebase -i master (or
upstream).

So how do I drop a patch with gbp-pq?

Cheers,
-Barry

[toc] | [prev] | [next] | [standalone]

#9265 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

On Tue, 14 Feb 2017 at 11:44:33 -0500, Barry Warsaw wrote:
> So how do I drop a patch with gbp-pq?

rm debian/patches/this-got-fixed-upstream.patch, vi debian/patches/series,
commit? :-)

Or more generally, to do it the git way, if the rest of the patch series
might need non-trivial adjustment:

git checkout debian/master              # old version, patches-unapplied
gbp pq import                           # moves to patch-queue/debian/master
git checkout debian/master              # or gbp pq switch
gbp import-orig ../whatever.tar.gz
dch
git commit -m "New upstream version"
git checkout patch-queue/debian/master  # or gbp pq switch
git rebase -i debian/master
gbp pq export                           # back to debian/master
git add debian/patches
git commit -m "Refresh patches or whatever"

(Substitute master for debian/master if DPMT doesn't use DEP-14,
but moving to gbp pq might be a good flag day to do that too. Then
you'll never have to get your local version of Debian's master branch
mixed up with your local version of upstream's master branch.)

    S

[toc] | [prev] | [next] | [standalone]

#9266 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Barry Warsaw <barry@debian.org> writes:
> On Feb 14, 2017, at 06:30 PM, Arto Jantunen wrote:
>>The patch-queue branch is based on the Debian branch, not upstream. Try
>>merging the new upstream version to your Debian branch, and then running
>>gbp pq rebase.
>
> This confuses me, or I'm doing something wrong.  With git-dpm the way to drop
> patches was to rebase interactively against upstream.  That doesn't seem to
> work with gbp pq rebase, or with gbp pq import & git rebase -i master (or
> upstream).
>
> So how do I drop a patch with gbp-pq?

The later works for me. Since there is no gbp pq rebase -i (perhaps
there should be one?), this is what I do:

gbp pq import
git rebase -i master
<remove a patch>
gbp pq export

And git status shows the patch as deleted, and removed from the series
file.

-- 
Arto Jantunen

[toc] | [prev] | [next] | [standalone]

#9356 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

Brian May <bam@debian.org> writes:

> git read-tree --reset -u upstream
> git reset -- debian
> git checkout debian
> git rm debian/.git-dpm

I have tried these steps on python-mkdocs in the debian/experimental
branch, and then upgraded to the latest upstream (using instructions on
wiki). Works perfectly[1].

The only unexpected problem I had is that "gbp import-orig --uscan", by
default, switches to the master branch and attempts to merge the new
upstream there. Which wasn't going to work, because master still is the
patches-applied git-dpm version. I had assumed that it would work on the
current branch; it doesn't.

The wiki should be ammended with instructions on how to edit
debian/gbp.conf at the appropriate steps. Writing a new default to
debian/gbp.conf does fix this.

The above also assumes that upstream==origin/upstream==latest
upstream. Which means you need to have done a git pull recently on the
upstream branch. Depending on the circumstances, using origin/upstream
might be a better choice rather then upstream.


Notes:

[1] Well apart from a new "source-is-missing" lintian warning, probably
from the new upstream. So probably not ready for upload just yet.
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#9358 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

[Multipart message — attachments visible in raw view] — view raw

 ❦  9 mars 2017 21:13 +1100, Brian May <bam@debian.org> :

> The above also assumes that upstream==origin/upstream==latest
> upstream. Which means you need to have done a git pull recently on the
> upstream branch. Depending on the circumstances, using origin/upstream
> might be a better choice rather then upstream.

Only if everyone names the origin branch origin. The alternative is to
use "gbp pull" instead of "git pull".
-- 
Make sure every module hides something.
            - The Elements of Programming Style (Kernighan & Plauger)

[toc] | [prev] | [next] | [standalone]

#9359 — Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)

On Thu, 2017-03-09 at 21:13 +1100, Brian May wrote:
> Brian May <bam@debian.org> writes:
> 
> > git read-tree --reset -u upstream
> > git reset -- debian
> > git checkout debian
> > git rm debian/.git-dpm
> 
> I have tried these steps on python-mkdocs in the debian/experimental
> branch, and then upgraded to the latest upstream (using instructions on
> wiki). Works perfectly[1].
> 
> The only unexpected problem I had is that "gbp import-orig --uscan", by
> default, switches to the master branch and attempts to merge the new
> upstream there. Which wasn't going to work, because master still is the
> patches-applied git-dpm version. I had assumed that it would work on the
> current branch; it doesn't.

You can override the target debian / upstream branches with `gbp
import-orig --debian-branch=debian/experimental --upstream-
branch=upstream/latest`.

Long-term you'd want to write your DEP-14 compliant configuration in
debian/gbp.conf indeed.

Ghis

[toc] | [prev] | [standalone]

Page 3 of 3 — ← Prev page 1 2 [3]

Back to top | Article view | linux.debian.maint.python

csiph-web