hannotify/will-git-be-around-forever - Change B7LX4UQGKIMNDG6GIRQ2NXYBGRCFJ3KRYMRPS3S6GK2BY5V2HK4AC

Update for Pijul v1.0-beta

Created by Hanno Embregts on June 19, 2022

B7LX4UQGKIMNDG6GIRQ2NXYBGRCFJ3KRYMRPS3S6GK2BY5V2HK4AC

Dependencies

In channels

main

Change contents

Replacement in docker/Dockerfile at line 9 [6.21]
B:BD[5.21] → [5.21:44]
```
RUN mkdir /development
```
[5.21]
[6.258]
```
# install vim
RUN apt-get install -y vim
```

Replacement in docker/Dockerfile at line 12 [6.21]

B:BD[6.259] → [5.45:118]


# TODO:
# * [ ] test drive the pijul demo in the `development` directory

[6.259]

RUN mkdir /development

Replacement in index.html at line 111 [9.29501907]

B:BD[7.487] → [8.65:128]

                        <strong>Time Elapsed: 54 min.</strong>

[7.487]

[7.550]

                        <strong>Time Elapsed: 45 min.</strong>

Replacement in sections/2-git.md at line 190 [11.11907]
B:BD[10.46679] → [10.46679:46718]
```
            <td align="right">43%</td>
```
[10.46679]
[10.46718]
```
            <td align="right">44%</td>
```
Replacement in sections/2-git.md at line 194 [11.11907]
B:BD[10.46784] → [10.46784:46823]
```
            <td align="right">19%</td>
```
[10.46784]
[10.46823]
```
            <td align="right">25%</td>
```
Replacement in sections/2-git.md at line 198 [11.11907]
B:BD[10.46895] → [10.46895:46934]
```
            <td align="right">16%</td>
```
[10.46895]
[10.46934]
```
            <td align="right">19%</td>
```
Replacement in sections/2-git.md at line 202 [11.11907]
∅:D[12.54885] → [10.47002:47040]
B:BD[10.47002] → [10.47002:47040]
```
            <td align="right">6%</td>
```
[12.54885]
[10.47040]
```
            <td align="right">7%</td>
```
Replacement in sections/2-git.md at line 232 [11.11907]
B:BD[10.47649] → [10.47649:47688]
```
            <td align="right">43%</td>
```
[10.47649]
[10.47688]
```
            <td align="right">44%</td>
```
Replacement in sections/2-git.md at line 237 [11.11907]
B:BD[10.47792] → [10.47792:47831]
```
            <td align="right">19%</td>
```
[10.47792]
[10.47831]
```
            <td align="right">25%</td>
```
Replacement in sections/2-git.md at line 242 [11.11907]
B:BD[10.47942] → [10.47942:47981]
```
            <td align="right">16%</td>
```
[10.47942]
[10.47981]
```
            <td align="right">19%</td>
```
Replacement in sections/2-git.md at line 247 [11.11907]
∅:D[12.54979] → [10.48088:48126]
B:BD[10.48088] → [10.48088:48126]
```
            <td align="right">6%</td>
```
[12.54979]
[10.48126]
```
            <td align="right">7%</td>
```
Replacement in sections/2-git.md at line 280 [11.11907]
B:BD[13.4228917] → [10.48645:48684]
```
            <td align="right">43%</td>
```
[13.4228917]
[10.48684]
```
            <td align="right">44%</td>
```
Replacement in sections/2-git.md at line 286 [11.11907]
B:BD[13.4229180] → [10.48761:48800]
```
            <td align="right">19%</td>
```
[13.4229180]
[10.48800]
```
            <td align="right">25%</td>
```
Replacement in sections/2-git.md at line 292 [11.11907]
B:BD[13.4229451] → [10.48879:48918]
```
            <td align="right">16%</td>
```
[13.4229451]
[10.48918]
```
            <td align="right">19%</td>
```
Replacement in sections/2-git.md at line 298 [11.11907]
∅:D[12.55099] → [10.48996:49034]
B:BD[13.4229717] → [10.48996:49034]
```
            <td align="right">6%</td>
```
[12.55099]
[10.49034]
```
            <td align="right">7%</td>
```

Deletion in sections/6-pijul.md at line 89 [11.12149]

B:BD[14.1568] → [2.2:166]


!! put the ThreadLocalRandom implementation in the clipboard before starting the demo !!
`return java.util.concurrent.ThreadLocalRandom.current().nextInt(1, 7);`

Deletion in sections/6-pijul.md at line 93 [11.12149]
B:BD[15.435] → [15.435:452]
```
    pijul status
```

Insertion in sections/6-pijul.md at line 95 [11.12149]

[3.355]

[16.1823]


    vi README.md
    > This repo contains beers and movies that are important to me.
    pijul add Readme.md
    pijul record -m "Initial patch"

Replacement in sections/6-pijul.md at line 101 [11.12149]
B:BD[16.1824] → [3.356:375]
∅:D[3.375] → [17.8619:8646]
B:BD[16.1824] → [17.8619:8646]
∅:D[17.8646] → [16.1851:1953]
B:BD[16.1851] → [16.1851:1953]
B:BD[16.1954] → [16.1954:1992]
B:BD[16.1992] → [3.376:459]
∅:D[3.459] → [16.2080:2090]
B:BD[16.2080] → [16.2080:2090]
∅:D[12.57106] → [16.2307:2313]
B:BD[16.2307] → [16.2307:2313]
B:BD[18.88] → [19.318:344]
```
    vi Sample.java
    public class Sample { 
        public static void main(String... args) {
            System.out.println(random());
        }
        private static int random() {
            return java.util.concurrent.ThreadLocalRandom.current().nextInt(1, 7);
        }
    }
    pijul add Sample.java
```
[16.1824]
[3.460]
```
    #Identities
    pijul key generate hanno
```
Deletion in sections/6-pijul.md at line 106 [11.12149]
B:BD[3.504] → [3.504:521]
```
    pijul status
```

Deletion in sections/6-pijul.md at line 107 [11.12149]

B:BD[16.2587] → [3.522:795]


(Here `y` means yes, `n` means no, `k` means undo and remake last decision, `a` means include this and all remaining patches, `d` means include neither this patch nor the remaining patches and `i` means ignore this file locally (i.e. it is added to .pijul/local/ignore).)

Replacement in sections/6-pijul.md at line 116 [11.12149]

B:BD[3.981] → [3.981:1026]

    pijul branches
    pijul checkout master

[3.981]

[3.1026]

    pijul channel
    pijul channel switch next-week
    pijul channel switch main

Insertion in sections/6-pijul.md at line 120 [11.12149]
[3.1044]
[3.1044]
```
    pijul add movies.txt
```
Replacement in sections/6-pijul.md at line 126 [11.12149]
B:BD[3.1176] → [3.1176:1201]
```
    pijul add movies.txt
```
[3.1176]
[3.1201]
```
    pijul add * 
```
Insertion in sections/6-pijul.md at line 129 [11.12149]
[3.1259]
[3.1259]
```
    // copy the hashes somewhere
```
Insertion in sections/6-pijul.md at line 133 [11.12149]
[3.1325]
[3.1325]
```
    pijul log
```

Replacement in sections/6-pijul.md at line 135 [11.12149]

B:BD[3.1364] → [3.1364:1434]

    pijul apply <hash> (movie)
    pijul apply <hash> (another movie)

[3.1364]

[16.2747]

    // notice the dependent patch!
    ls
    pijul log
    pijul unrecord --reset <hash> (another movie)
    pijul unrecord --reset <hash> (movie)
    pijul unrecord --reset <hash> (another movie)

Replacement in sections/6-pijul.md at line 144 [11.12149]
B:BD[16.2753] → [16.2753:2764]
```
## The Bad
```
[16.2753]
[16.2764]
```
## Pijul's current status
```

Replacement in sections/6-pijul.md at line 147 [11.12149]

B:BD[20.689545] → [4.1238:1416]

    <li>Complete rewrite in progress for v1.0</li>
    <small><a href="https://pijul.org/posts/2020-11-07-towards-1.0">https://pijul.org/posts/2020-11-07-towards-1.0</a></small>

[20.689545]

[20.690001]

    <li>v1.0-beta</li>
    <small><a href="https://pijul.org/posts/2022-01-08-beta">https://pijul.org/posts/2022-01-08-beta</a></small>

Replacement in sections/6-pijul.md at line 153 [11.12149]

B:BD[20.690015] → [20.690015:690161]

So in the demo I used Pijul 0.12, which was clearly labeled as a preview version for research purposes.
So not production-ready in the slightest.

[20.690015]

[20.690161]

Previous version of the talk I used v0.12, which was clearly labeled as a preview version for research purposes.
v1.0 uses a complete rewrite of the patch format, amongst other things.

Deletion in sections/6-pijul.md at line 156 [11.12149]

B:BD[20.690162] → [20.690162:690758]

Now what would you do if you're building a version control system and a bug has to be fixed?
This turns out to be quite a challenge.
Version control systems that use itself for its versioning (bootstrapping) are famously hard when dealing with bugs.
If you're building a compiler, for example, bootstrapping can be done one step at a time, and previous versions are always available to compile your current one.
But a version control system has the additional problem that the previous versions might not always be easily accessible if there is a bug.
So this is exactly what happened to Pijul.

Replacement in sections/6-pijul.md at line 160 [11.12149]
∅:D[13.4236768] → [14.1593:1597]
B:BD[14.1593] → [14.1593:1597]
```
---
```
[13.4236768]
[21.7972985]
```
It is now feature-complete and it will be backwards-compatible from now on.
However, it is still in beta.
```

Replacement in sections/6-pijul.md at line 163 [11.12149]

B:BD[21.7972986] → [20.691151:691173]

∅:D[14.1621] → [21.7972986:7972987]

∅:D[20.691173] → [21.7972986:7972987]

B:BD[21.7972986] → [21.7972986:7972987]

B:BD[21.7972987] → [4.1417:1629]

∅:D[4.1629] → [20.691288:691637]

∅:D[8.2360] → [20.691288:691637]

B:BD[20.691288] → [20.691288:691637]

B:BD[20.691831] → [20.691831:692034]

B:BD[20.692034] → [7.2989:3050]

∅:D[7.3050] → [20.692095:692337]

B:BD[20.692095] → [20.692095:692337]

B:BD[20.692453] → [20.692453:692454]

B:BD[20.692805] → [20.692805:693009]

## Pijul towards v1.0
* New change format; 'patches' are now called 'changes' <!-- .element: class="fragment fade-in-then-semi-out" -->
* Apply dependent changes automatically <!-- .element: class="fragment fade-in-then-semi-out" -->
* 'Branches' are now called 'channels' <!-- .element: class="fragment fade-in-then-semi-out" -->
* Better support for large files and repositories by compressing changes <!-- .element: class="fragment fade-in-then-semi-out" -->
* Interactive recording is replaced by a 'change draft screen' <!-- .element: class="fragment fade-in-then-semi-out" -->
* Documentation is lagging a bit <!-- .element: class="fragment fade-in-then-semi-out" -->
note:
So this is what the Pijul maintainers are doing to make Pijul production-ready.
* change draft screen
Which looks a bit like the interactive rebase screen in Git.
* documentation is lagging
I've used the Pijul v1.0-alpha for a bit in preparation for this talk and I found that the documentation is lagging a bit.
It used to be better in v0.12.
Which is no surprise, because the rewrite is not done yet.
Overall, I think Pijul is quite promising, but it needs some work in its current alpha phase.
So some of its popularity will be depending on how they will get to beta and stable versions later this year.

[21.7972986]

Overall, I think Pijul is quite promising, but it needs some work in its current beta phase.
So some of its popularity will be depending on how they will get stable versions later this year.

Update for Pijul v1.0-beta

Dependencies

In channels

Change contents

Replacement in docker/Dockerfile at line 9 [6.21]

Replacement in docker/Dockerfile at line 12 [6.21]

Replacement in index.html at line 111 [9.29501907]

Replacement in sections/2-git.md at line 190 [11.11907]

Replacement in sections/2-git.md at line 194 [11.11907]

Replacement in sections/2-git.md at line 198 [11.11907]

Replacement in sections/2-git.md at line 202 [11.11907]

Replacement in sections/2-git.md at line 232 [11.11907]

Replacement in sections/2-git.md at line 237 [11.11907]

Replacement in sections/2-git.md at line 242 [11.11907]

Replacement in sections/2-git.md at line 247 [11.11907]

Replacement in sections/2-git.md at line 280 [11.11907]

Replacement in sections/2-git.md at line 286 [11.11907]

Replacement in sections/2-git.md at line 292 [11.11907]

Replacement in sections/2-git.md at line 298 [11.11907]

Deletion in sections/6-pijul.md at line 89 [11.12149]

Deletion in sections/6-pijul.md at line 93 [11.12149]

Insertion in sections/6-pijul.md at line 95 [11.12149]

Replacement in sections/6-pijul.md at line 101 [11.12149]

Deletion in sections/6-pijul.md at line 106 [11.12149]

Deletion in sections/6-pijul.md at line 107 [11.12149]

Replacement in sections/6-pijul.md at line 116 [11.12149]

Insertion in sections/6-pijul.md at line 120 [11.12149]

Replacement in sections/6-pijul.md at line 126 [11.12149]

Insertion in sections/6-pijul.md at line 129 [11.12149]

Insertion in sections/6-pijul.md at line 133 [11.12149]

Replacement in sections/6-pijul.md at line 135 [11.12149]

Replacement in sections/6-pijul.md at line 144 [11.12149]

Replacement in sections/6-pijul.md at line 147 [11.12149]

Replacement in sections/6-pijul.md at line 153 [11.12149]

Deletion in sections/6-pijul.md at line 156 [11.12149]

Replacement in sections/6-pijul.md at line 160 [11.12149]

Replacement in sections/6-pijul.md at line 163 [11.12149]