Iceberg - finding deleted classes, reverting versions?

On 13 Jun 2018, at 17:23, Sean P. DeNigris <[hidden email]> wrote:

Tim Mackinnon wrote

Hi - I am interested in what the future holds with Iceberg for things like
finding deleted classes or reverting to older versions of things.

Great question! It used to be in the Change Sorter that delections were
logged and reversible. At some point that stopped working and then I moved
to git so I don't know if it was ever fixed. Obviously, that only looks back
w/in the current image which doesn't fully solve your issue. The cool thing
about git is that we inherit all its functionality - the good and bad. So
iot got me wondering whether we could drop down to the command line for the
time being. After some googling and experimentation, I came up with the
following:

   git log --full-history -- */{{className}}.class/properties.json

NB. I had to add the properties.json because directories don't work, but
that may not be needed with Tonel



-----
Cheers,
Sean
--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html

On 13 Jun 2018, at 21:53, Sean P. DeNigris <[hidden email]> wrote:

Tim Mackinnon wrote

I didn’t quite get your fu to work

Interesting.

When I searched for commits affecting the deleted class SuDebianKey:

$ git log --full-history -- */SuDebianKey.class/properties.json

I got back a list of commits (obviously with the last chronologically being
the deletion):

commit a38fbced4abec59ff9879d4c607da80dc89b6637
Author: Sean DeNigris <[hidden email]>
Date:   Mon Jan 30 17:13:58 2017 -0500

   Extract Lots to ComputerWorld, Absorb Rest of Old ScriptingBase Project

commit 61175745d57c60a1707d5e2f9a2fc92e6c19a6ea
Author: Sean DeNigris <[hidden email]>
Date:   Sat Aug 20 17:14:12 2016 -0400

   Basket O' Enhancements
...



-----
Cheers,
Sean
--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html

Hi,

Regarding history, right now we have a history browser implemented as a Calypso plugin, that is open using context menu => history or the little box button on the top right of the method pane (second button from the left in the picture):

<Screen Shot 2018-06-14 at 09.34.24.png>

That button will nowadays only be shown if the method's package is linked to an iceberg repository.

Once you click it, you will have the entire history of the method.

<Screen Shot 2018-06-14 at 09.47.46.png>

With the possibility to install that version of the method (among others).

Now, regarding the recovery of deleted classes/methods, have you tried the repository browser?

Go to Iceberg, right click on a repository and select "Repository".

You can there select a commit in history and then in the tabs below see the diff between

 - your current version and the selected commit

 - the selected commit and its main parent

Of course any of these can be improved, but if you have concrete requests, it is much easier :)

https://github.com/pharo-vcs/iceberg

Guille

On Wed, Jun 13, 2018 at 11:22 PM Tim Mackinnon <[hidden email]> wrote:

Hi Sean - I tried it again, and it worked:

git log --full-history -- */PrismicBlock.class*

(I got my wildcard slightly wrong for tonel format) - although the beauty of the one I gave was that it shows you all deleted classes (in case you don’t know the name)

I’m still confused why I can’t checkout the deleted class though - damn you git, for the cryptic error: : error: pathspec 'PrismicDemo/PrismicBlock.class.st' did not match any file(s) known to git.

I was hoping a quick hack to iceberg might be to OSProcess a few choice git commands to help us along while we work out better ways to do things.

Tim

On 13 Jun 2018, at 21:53, Sean P. DeNigris <[hidden email]> wrote:

Tim Mackinnon wrote

I didn’t quite get your fu to work

Interesting.

When I searched for commits affecting the deleted class SuDebianKey:

$ git log --full-history -- */SuDebianKey.class/properties.json

I got back a list of commits (obviously with the last chronologically being
the deletion):

commit a38fbced4abec59ff9879d4c607da80dc89b6637
Author: Sean DeNigris <[hidden email]>
Date:   Mon Jan 30 17:13:58 2017 -0500

   Extract Lots to ComputerWorld, Absorb Rest of Old ScriptingBase Project

commit 61175745d57c60a1707d5e2f9a2fc92e6c19a6ea
Author: Sean DeNigris <[hidden email]>
Date:   Sat Aug 20 17:14:12 2016 -0400

   Basket O' Enhancements
...



-----
Cheers,
Sean
--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html

--

Guille Polito Research Engineer Centre de Recherche en Informatique, Signal et Automatique de Lille CRIStAL - UMR 9189 French National Center for Scientific Research - http://www.cnrs.fr Web: http://guillep.github.io Phone: +33 06 52 70 66 13

On 14 Jun 2018, at 08:52, Guillermo Polito <[hidden email]> wrote:

Hi,

Regarding history, right now we have a history browser implemented as a Calypso plugin, that is open using context menu => history or the little box button on the top right of the method pane (second button from the left in the picture):

<Screen Shot 2018-06-14 at 09.34.24.png>

That button will nowadays only be shown if the method's package is linked to an iceberg repository.

Once you click it, you will have the entire history of the method.

<Screen Shot 2018-06-14 at 09.47.46.png>

With the possibility to install that version of the method (among others).

Now, regarding the recovery of deleted classes/methods, have you tried the repository browser?

Go to Iceberg, right click on a repository and select "Repository".

You can there select a commit in history and then in the tabs below see the diff between

 - your current version and the selected commit

 - the selected commit and its main parent

Of course any of these can be improved, but if you have concrete requests, it is much easier :)

https://github.com/pharo-vcs/iceberg

Guille

On Wed, Jun 13, 2018 at 11:22 PM Tim Mackinnon <[hidden email]> wrote:

Hi Sean - I tried it again, and it worked:

git log --full-history -- */PrismicBlock.class*

(I got my wildcard slightly wrong for tonel format) - although the beauty of the one I gave was that it shows you all deleted classes (in case you don’t know the name)

I’m still confused why I can’t checkout the deleted class though - damn you git, for the cryptic error: : error: pathspec 'PrismicDemo/PrismicBlock.class.st' did not match any file(s) known to git.

I was hoping a quick hack to iceberg might be to OSProcess a few choice git commands to help us along while we work out better ways to do things.

Tim

On 13 Jun 2018, at 21:53, Sean P. DeNigris <[hidden email]> wrote:

Tim Mackinnon wrote

I didn’t quite get your fu to work

Interesting.

When I searched for commits affecting the deleted class SuDebianKey:

$ git log --full-history -- */SuDebianKey.class/properties.json

I got back a list of commits (obviously with the last chronologically being
the deletion):

commit a38fbced4abec59ff9879d4c607da80dc89b6637
Author: Sean DeNigris <[hidden email]>
Date:   Mon Jan 30 17:13:58 2017 -0500

   Extract Lots to ComputerWorld, Absorb Rest of Old ScriptingBase Project

commit 61175745d57c60a1707d5e2f9a2fc92e6c19a6ea
Author: Sean DeNigris <[hidden email]>
Date:   Sat Aug 20 17:14:12 2016 -0400

   Basket O' Enhancements
...



-----
Cheers,
Sean
--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html

--

Guille Polito Research Engineer Centre de Recherche en Informatique, Signal et Automatique de Lille CRIStAL - UMR 9189 French National Center for Scientific Research - http://www.cnrs.fr Web: http://guillep.github.io Phone: +33 06 52 70 66 13

On 21 Jun 2018, at 16:07, Tim Mackinnon <[hidden email]> wrote:

Guille - just following up on this thread as I’d like to get more confident with this stuff.

You mentioned a Calypso plugin for versions - where is that? I loaded a recentish P7 image and I don’t see those icons? Is this something I can easily load to try out?

As I don’t have that plugin, I’ve followed up on your next suggestion (just to learn how to do this) about looking up a commit having used the command line git history to list all of my deleted classes (I think this might be a useful thing to add to Iceberg BTW).

Not sure how to get a repository but I cobbled together the following?

(IceLibgitRepository registry detect: [ :r | r name beginsWith: 'Prismic' ]) lookupCommit: '65363ad’.

This give me an IceGitCommit - but then what can I easily do with this to try and iterate over deleted classes to try and get the one I’ve identified back?

Failing all of this - I went back to the command line again (which should work) - and I’m really wondering if we do something weird with files or paths when checking in?

Having got a valid commitID (I used: git log --diff-filter=D --summary —pretty="format:%cd|%h|%cn%n%s%n” )

if I simply run the following (with the id and pathname taken from the output of my previous command

git checkout 65363ad src/PrismicDemo/PrismicBlock.class.st

I keep getting an error : error: pathspec ‘src/PrismicDemo/PrismicBlock.class.st' did not match any file(s) known to git. 

Are you able to confirm if you can restore a deleted class from a commit? I’ve tried it on 2 different OSX machines and neither of them works - making me think we do something odd.

Tim

On 14 Jun 2018, at 08:52, Guillermo Polito <[hidden email]> wrote:

Hi,

Regarding history, right now we have a history browser implemented as a Calypso plugin, that is open using context menu => history or the little box button on the top right of the method pane (second button from the left in the picture):

<Screen Shot 2018-06-14 at 09.34.24.png>

That button will nowadays only be shown if the method's package is linked to an iceberg repository.

Once you click it, you will have the entire history of the method.

<Screen Shot 2018-06-14 at 09.47.46.png>

With the possibility to install that version of the method (among others).

Now, regarding the recovery of deleted classes/methods, have you tried the repository browser?

Go to Iceberg, right click on a repository and select "Repository".

You can there select a commit in history and then in the tabs below see the diff between

 - your current version and the selected commit

 - the selected commit and its main parent

Of course any of these can be improved, but if you have concrete requests, it is much easier :)

https://github.com/pharo-vcs/iceberg

Guille

On Wed, Jun 13, 2018 at 11:22 PM Tim Mackinnon <[hidden email]> wrote:

Hi Sean - I tried it again, and it worked:

git log --full-history -- */PrismicBlock.class*

(I got my wildcard slightly wrong for tonel format) - although the beauty of the one I gave was that it shows you all deleted classes (in case you don’t know the name)

I’m still confused why I can’t checkout the deleted class though - damn you git, for the cryptic error: : error: pathspec 'PrismicDemo/PrismicBlock.class.st' did not match any file(s) known to git.

I was hoping a quick hack to iceberg might be to OSProcess a few choice git commands to help us along while we work out better ways to do things.

Tim

On 13 Jun 2018, at 21:53, Sean P. DeNigris <[hidden email]> wrote:

Tim Mackinnon wrote

I didn’t quite get your fu to work

Interesting.

When I searched for commits affecting the deleted class SuDebianKey:

$ git log --full-history -- */SuDebianKey.class/properties.json

I got back a list of commits (obviously with the last chronologically being
the deletion):

commit a38fbced4abec59ff9879d4c607da80dc89b6637
Author: Sean DeNigris <[hidden email]>
Date:   Mon Jan 30 17:13:58 2017 -0500

   Extract Lots to ComputerWorld, Absorb Rest of Old ScriptingBase Project

commit 61175745d57c60a1707d5e2f9a2fc92e6c19a6ea
Author: Sean DeNigris <[hidden email]>
Date:   Sat Aug 20 17:14:12 2016 -0400

   Basket O' Enhancements
...



-----
Cheers,
Sean
--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html

--

Guille Polito Research Engineer Centre de Recherche en Informatique, Signal et Automatique de Lille CRIStAL - UMR 9189 French National Center for Scientific Research - http://www.cnrs.fr Web: http://guillep.github.io Phone: +33 06 52 70 66 13

On 22 Jun 2018, at 01:39, Tim Mackinnon <[hidden email]> wrote:

Just to add more information to this - I did try what was suggested here (it refers to a branch and not a commit id - but heck worth a shot) https://stackoverflow.com/questions/5989592/git-cannot-checkout-branch-error-pathspec-did-not-match-any-files-kn - but nah /refs/heads/src… or /origin/src… didn’t seem to give a recognised path.

Grasping at straws I also tried --ignore-skip-worktree-bits 

So I’m really curious if anyone else has managed to restore a deleted Pharo class in git?

Tim

On 21 Jun 2018, at 16:07, Tim Mackinnon <[hidden email]> wrote:

Guille - just following up on this thread as I’d like to get more confident with this stuff.

You mentioned a Calypso plugin for versions - where is that? I loaded a recentish P7 image and I don’t see those icons? Is this something I can easily load to try out?

As I don’t have that plugin, I’ve followed up on your next suggestion (just to learn how to do this) about looking up a commit having used the command line git history to list all of my deleted classes (I think this might be a useful thing to add to Iceberg BTW).

Not sure how to get a repository but I cobbled together the following?

(IceLibgitRepository registry detect: [ :r | r name beginsWith: 'Prismic' ]) lookupCommit: '65363ad’.

This give me an IceGitCommit - but then what can I easily do with this to try and iterate over deleted classes to try and get the one I’ve identified back?

Failing all of this - I went back to the command line again (which should work) - and I’m really wondering if we do something weird with files or paths when checking in?

Having got a valid commitID (I used: git log --diff-filter=D --summary —pretty="format:%cd|%h|%cn%n%s%n” )

if I simply run the following (with the id and pathname taken from the output of my previous command

git checkout 65363ad src/PrismicDemo/PrismicBlock.class.st

I keep getting an error : error: pathspec ‘src/PrismicDemo/PrismicBlock.class.st' did not match any file(s) known to git. 

Are you able to confirm if you can restore a deleted class from a commit? I’ve tried it on 2 different OSX machines and neither of them works - making me think we do something odd.

Tim

On 14 Jun 2018, at 08:52, Guillermo Polito <[hidden email]> wrote:

Hi,

Regarding history, right now we have a history browser implemented as a Calypso plugin, that is open using context menu => history or the little box button on the top right of the method pane (second button from the left in the picture):

<Screen Shot 2018-06-14 at 09.34.24.png>

That button will nowadays only be shown if the method's package is linked to an iceberg repository.

Once you click it, you will have the entire history of the method.

<Screen Shot 2018-06-14 at 09.47.46.png>

With the possibility to install that version of the method (among others).

Now, regarding the recovery of deleted classes/methods, have you tried the repository browser?

Go to Iceberg, right click on a repository and select "Repository".

You can there select a commit in history and then in the tabs below see the diff between

 - your current version and the selected commit

 - the selected commit and its main parent

Of course any of these can be improved, but if you have concrete requests, it is much easier :)

https://github.com/pharo-vcs/iceberg

Guille

On Wed, Jun 13, 2018 at 11:22 PM Tim Mackinnon <[hidden email]> wrote:

Hi Sean - I tried it again, and it worked:

git log --full-history -- */PrismicBlock.class*

(I got my wildcard slightly wrong for tonel format) - although the beauty of the one I gave was that it shows you all deleted classes (in case you don’t know the name)

I’m still confused why I can’t checkout the deleted class though - damn you git, for the cryptic error: : error: pathspec 'PrismicDemo/PrismicBlock.class.st' did not match any file(s) known to git.

I was hoping a quick hack to iceberg might be to OSProcess a few choice git commands to help us along while we work out better ways to do things.

Tim

On 13 Jun 2018, at 21:53, Sean P. DeNigris <[hidden email]> wrote:

Tim Mackinnon wrote

I didn’t quite get your fu to work

Interesting.

When I searched for commits affecting the deleted class SuDebianKey:

$ git log --full-history -- */SuDebianKey.class/properties.json

I got back a list of commits (obviously with the last chronologically being
the deletion):

commit a38fbced4abec59ff9879d4c607da80dc89b6637
Author: Sean DeNigris <[hidden email]>
Date:   Mon Jan 30 17:13:58 2017 -0500

   Extract Lots to ComputerWorld, Absorb Rest of Old ScriptingBase Project

commit 61175745d57c60a1707d5e2f9a2fc92e6c19a6ea
Author: Sean DeNigris <[hidden email]>
Date:   Sat Aug 20 17:14:12 2016 -0400

   Basket O' Enhancements
...



-----
Cheers,
Sean
--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html

--

Guille Polito Research Engineer Centre de Recherche en Informatique, Signal et Automatique de Lille CRIStAL - UMR 9189 French National Center for Scientific Research - http://www.cnrs.fr Web: http://guillep.github.io Phone: +33 06 52 70 66 13

On 25 Jun 2018, at 14:21, Ben Coman <[hidden email]> wrote:

On 25 June 2018 at 19:41, Tim Mackinnon <[hidden email]> wrote:

I’d be really interested if someone with lower level GIT knowledge might try a:

git checkout <gitid> src/<proj>/<class>.class.st 

For their project - as I don’t understand what I’m doing wrong - and I’d like the comfort of knowing that our source is in a place/state where we can rely on normal git tools in a case of emergency. At the moment, I’m a bit nervous that we are corrupting something .

Tim

I'm not sure if this is what you wanted, but I found a test case for for Pharo 7, a deleted class "MultiByteFileStreamTest.class.st"

https://github.com/pharo-project/pharo/pull/1031/files#diff-750a25fb99d29cda8c2c388dc18f6c1cL1

From Windows 10 cmd.exe I tried the following (I can't remember which tool installed `git`)...

> mkdir C:\temp\test

> cd C:\temp\test

> git clone [hidden email]:pharo-project/pharo.git

> cd pharo\src\Deprecated70

> dir  Multi*

no result

> git checkout e74308e67d9f84 MultiByteFileStreamTest.class.st

> dir Multi*

MultiByteFileStreamTest.class.st

Then I compared the file I checked out to the raw file on github and they were identical...

https://www.diffchecker.com/gVCpJzFe

btw, I did get a momentary error "error: pathspec 'src/Deprecated70/MultiByteFileStreamTest.class.st' did not match any file(s) known to git."

when I incorrectly did...

> cd pharo\src\Deprecated70

> git  git checkout e74308e67d9f84  src/Deprecated70/MultiByteFileStreamTest.class.st

This worked with the longer path... 

> cd pharo

> git  git checkout e74308e67d9f84  src/Deprecated70/MultiByteFileStreamTest.class.st

cheers -ben

On 28 Jun 2018, at 00:38, Tim Mackinnon <[hidden email]> wrote:

Hey thanks Ben - this still doesn’t work for me… good idea to try on the Pharo repo itself.

I have a fork of it, which I catch up periodically - so I tried a similar suggestion to you - went into my directory (underneath the src folder) and typed:

log --diff-filter=D --summary --graph --pretty='format:%cd | %h | %H | %cn%n-> %s%n’

This gave me:

Tue Jun 19 19:28:37 2018 +0200 | 13e81343e | 13e81343e8a23a8d6ca43f1c77b804b8134fc986 | CyrilFerlicot

-> Remove now useless logs

 delete mode 100755 bootstrap/scripts/printFolderContent.sh

Mon Jun 18 16:50:19 2018 +0200 | 0433d908d | 0433d908de2987fa0069a47dee1f0794ccbb52c2 | GitHub

-> Revert "22161-Add-more-log-to-bootstrap"

 delete mode 100755 bootstrap/scripts/printFolderContent.sh

Thu Jun 14 11:41:16 2018 +0200 | b4a285a61 | b4a285a61d3eb0cc1e642b2fcc242dac7092617f | Marcus Denker

-> fix the last sender of #asIcon https://pharo.fogbugz.com/f/cases/22139/fix-the-last-sender-of-asIcon

 delete mode 100644 src/Polymorph-Widgets-Rules/IconShortcutRule.class.st

So then I tried to recover that last one (again at root underneath the src directory)

git checkout b4a285a61 src/Polymorph-Widgets-Rules/IconShortcutRule.class.st

error: pathspec 'src/Polymorph-Widgets-Rules/IconShortcutRule.class.st' did not match any file(s) known to git.

And I still get that dreaded pathspec error. This is on OSX (not windows) - so I’m struggling to understand what I could be doing wrong. It must be something obvious - but damned if I can see how I’m doing anything different to you. And it wouldn’t make sense that git is broken on OSX?

Tim

On 25 Jun 2018, at 14:21, Ben Coman <[hidden email]> wrote:

On 25 June 2018 at 19:41, Tim Mackinnon <[hidden email]> wrote:

I’d be really interested if someone with lower level GIT knowledge might try a:

git checkout <gitid> src/<proj>/<class>.class.st 

For their project - as I don’t understand what I’m doing wrong - and I’d like the comfort of knowing that our source is in a place/state where we can rely on normal git tools in a case of emergency. At the moment, I’m a bit nervous that we are corrupting something .

Tim

I'm not sure if this is what you wanted, but I found a test case for for Pharo 7, a deleted class "MultiByteFileStreamTest.class.st"

https://github.com/pharo-project/pharo/pull/1031/files#diff-750a25fb99d29cda8c2c388dc18f6c1cL1

From Windows 10 cmd.exe I tried the following (I can't remember which tool installed `git`)...

> mkdir C:\temp\test

> cd C:\temp\test

> git clone [hidden email]:pharo-project/pharo.git

> cd pharo\src\Deprecated70

> dir  Multi*

no result

> git checkout e74308e67d9f84 MultiByteFileStreamTest.class.st

> dir Multi*

MultiByteFileStreamTest.class.st

Then I compared the file I checked out to the raw file on github and they were identical...

https://www.diffchecker.com/gVCpJzFe

btw, I did get a momentary error "error: pathspec 'src/Deprecated70/MultiByteFileStreamTest.class.st' did not match any file(s) known to git."

when I incorrectly did...

> cd pharo\src\Deprecated70

> git  git checkout e74308e67d9f84  src/Deprecated70/MultiByteFileStreamTest.class.st

This worked with the longer path... 

> cd pharo

> git  git checkout e74308e67d9f84  src/Deprecated70/MultiByteFileStreamTest.class.st

cheers -ben

On 28 Jun 2018, at 12:25, Ben Coman <[hidden email]> wrote:

On 28 June 2018 at 07:38, Tim Mackinnon <[hidden email]> wrote:

Hey thanks Ben - this still doesn’t work for me… good idea to try on the Pharo repo itself.

I have a fork of it, which I catch up periodically - so I tried a similar suggestion to you - went into my directory (underneath the src folder) and typed:

log --diff-filter=D --summary --graph --pretty='format:%cd | %h | %H | %cn%n-> %s%n’

This gave me:

Tue Jun 19 19:28:37 2018 +0200 | 13e81343e | 13e81343e8a23a8d6ca43f1c77b804b8134fc986 | CyrilFerlicot

-> Remove now useless logs

 delete mode 100755 bootstrap/scripts/printFolderContent.sh

Mon Jun 18 16:50:19 2018 +0200 | 0433d908d | 0433d908de2987fa0069a47dee1f0794ccbb52c2 | GitHub

-> Revert "22161-Add-more-log-to-bootstrap"

 delete mode 100755 bootstrap/scripts/printFolderContent.sh

Thu Jun 14 11:41:16 2018 +0200 | b4a285a61 | b4a285a61d3eb0cc1e642b2fcc242dac7092617f | Marcus Denker

-> fix the last sender of #asIcon https://pharo.fogbugz.com/f/cases/22139/fix-the-last-sender-of-asIcon

 delete mode 100644 src/Polymorph-Widgets-Rules/IconShortcutRule.class.st

So then I tried to recover that last one (again at root underneath the src directory)

git checkout b4a285a61 src/Polymorph-Widgets-Rules/IconShortcutRule.class.st

error: pathspec 'src/Polymorph-Widgets-Rules/IconShortcutRule.class.st' did not match any file(s) known to git.

Concrete examples help.   I get the same error

when I try checking that file out from b4a285a61 

Now looking at https://github.com/pharo-project/pharo/tree/b4a285a61/src/Polymorph-Widgets-Rules/

there is no file  IconShortcutRule.class.st

So from try clicking the <History> button,

and currently at the top you'll see " b4a28" on Jun 14,  

and the next one down is "d4b4464". 

Click the "<>" button to the right of that,

then browse back to .../src/Polymorph-Widgets-Rules

and now you'll see  IconShortcutRule.class.st

So the following works for me...

git checkout d4b4464 src/Polymorph-Widgets-Rules/IconShortcutRule.class.st 

In summary ;), you can't check out a file from a commit that doesn't exist in that commit.

HTH

cheers -ben