Re: [PATCH 6/9] vcs_info quilt: fix unapplied detection on sub-directory

[Frank Terbeck <ft@bewatermyfriend.org>]

Hi Marc,

Disclaimer: I don't use quilt much anymore, so I'm rusty about its
            behaviours in many cases.

One thing off the bat, although it probably doesn't make much of a
difference: Are you using "quilt" in "standalone mode" or is the
directory controlled by a real VCS as well?

I am unsure about what's going on precisely. Could you do this:

    functions -t vcs_info

And retry your test cases? That will produce long traces of what's going
on, and might give ideas as to what's amiss.

Marc Finet wrote:
[...]
> Hum, in fact this commit was intented to 'fix' such the debian/ behavior
> but miserably failed. I tested different settings and here are my results;
> for debian patches, the working tree is as follows:
>   work/
>   ├── debian/
>   │    ├── patches/
>   │    │     ├── series         (list of patches to apply)
>   │    │     ├── patch1.diff    (one particular patch)
>   │    │     ├── patch2.diff
>   │    │     └── ...
>   │    └── ...
>   ├── .pc/
>   │    ├── .quilt_patches (content of QUILT_PATCHES)
>   │    ├── .quilt_series  (content of QUILT_SERIES)
>   │    ├── patch1.diff/   (copy of patched files)
>   │    │    └── ...
>   │    ├── patch2.diff/
>   │    │    └── ...
>   │    └── ...
>   └── ...
> But:
>   - 1) without setting QUILT_PATCHES nor quilt-patch-dir:
>      - quilt is not detected in work/
>      - quilt is detected in work/anything/ but reports all patches
>        as both applied and unapplied (%a/%p gives x/2x)
>      - `quilt` does not work if no .pc/ exists

No idea why this happens. The default if everything is unset is
"patches", which shouldn't be found in any case.

>   - 2) with QUILT_PATCHES set to "debian":
>      - quilt is detected everywhere and reports correct patches
>        numbers
>      - but `quilt` stops to work (e.g. `quilt series` shows only
>        latest patch, `quilt pop` fails)

See below.

>   - 3) with QUILT_PATCHES set to "debian/patches":
>      - quilt is detected in work/
>      - quilt is detected in work/anything/ but reports all patches
>        as both applied and unapplied (%a/%p gives x/2x)
>      - `quilt` works when no .pc/ exists

I don't know why the patches are reported applied and unapplied.

>   - 4) with quilt-patch-dir set to "debian"
>      - quilt is correctly detected everywhere
>      - but unapplied patches are not detected (due to missing /patches when
>        setting QUILT_PATCHES on quilt unapplied invocation)
>      - but `quilt` does not work if no .pc/ exists
>   - 5) with quilt-patch-dir set to "debian/patches":
>      - quilt is detected in work/
>      - quilt is detect in work/anything/ but reports all patches
>        as both applied and unapplied (%a/%p gives x/2x)

I think $QUILT_PATCHES needs to be set to the correct directory
including "patches/". Without, it only works, because the directory is
searched recursively.

I don't know why the patches are reported as applied and unapplied off
hand. :-/

The applied patches are read from .pc/applied-patches, the list of
unapplied patches is retrieved by calling "quilt unapplied".

> So I do not understand the role of quilt-patch-dir as for me it takes
> the role of QUILT_PATCHES except the missing '/patches'. Moreover changing
> to sub-directory in cases 1, 3 and 5 makes applied patch detection failing
> because:

The ‘quilt-patch-dir’ style *sets* QUILT_PATCHES if set. The system
also sets QUILT_PATCHES to an absolute path-name, which should make it
work in subdirectories as well.

But like I said, I don't use quilt much anymore.

>  - applied is patch1.diff patch2.diff ...
>  - unapplied is /path/to/work/debian/patches/patch1.diff ...
>
> For me $patches should have the QUILT_PATCHES semantic, i.e. include the
> /patches at end (as said in man page). If you agree with this analysis, i
> might find a patch to make cases 3 and 5 working (even if it breaks the
> quite-working case 4). And re-reading the man page gives me a hint for the
> quilt-patch-dir usage: configure QUILT_PATCHES (with hook) per repository
> with zstyle ?

As I said above, $patches get assigned to $QUILT_PATCHES. So it should
behave exactly the same.


Regards, Frank