Skip to content

Non-stacky pop/push #430

@bonki

Description

@bonki

Maybe this is somewhat the purpose of hide and I just don't understand how hide works or what its purpose is/how to use it (why does it leave the hidden patch's modifications in the work tree?) but would it be possible to have a non-stacky apply/unapply which doesn't affect the order of the patch(es) on/off the stack (to an extent where it's possible)?

I find myself re-ordering the stack using rebase -i way too often only for the sake of restoring an earlier, carefully crafted order (which can be really cumbersome).

When getting patches out of the way temporarily I would like to be able to de- and reactivate them at the "same" position (meaning on top of the patch which was parent at the time it was unapplied, if the commit still exists).

E.g. instead of

A
|
B
|
C
|
D
|
E
|
F <

$ stg pop B..C E
+ 0 A
+ 1 D
> 2 F
- 3 B
- 4 C
- 5 E

[...]

$ stg push B..E
+ 0 A
+ 1 D
+ 2 F
+ 3 B
+ 4 C
> 5 E

A
|
D
|
F
|
B
|
C
|
E <

I would like to be able to do

$ stg unapply B..C E
+ 0 A
- 1 B
- 2 C
+ 3 D
- 4 E
> 5 F

A
| \
|  B
|  |
|  C
| /
D
| \
|  E
| /
F <

$ stg apply B..C E
+ 0 A
+ 1 B
+ 2 C
+ 3 D
+ 4 E
> 5 F

A
|
B
|
C
|
D
|
E
|
F <

Is this a silly request?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions