ActiveState Community

File Revisions (with diff)

Posted by nathan on 2009-05-20 09:35
OS: All / Any

This macro is based on the Auto Backup Macro by Rob Sigrest and the modifications by pepebe.

I am going to convert this into an actual extension but for now this will serve as a nice prototype.

Basically this does the same thing; it creates a backup in a folder you specify, what it does differently is that it saves the folder structure of the file as well.

The main feature I added is a second macro which will launch the diff utility (thanks Todd! :)) and generate the diff between the current version of the file you have open and a past version which you can specify by entering a "revision number".
What works different with these revision numbers is that the lower the number the more recent revision you will get, so for example revision 1 will be the most recent version. In the extension I will create an interface for this instead.

Once imported, you will want to edit both macro's and change the revision path, which is where the file backups will be placed. You can launch the diff utility by double clicking the "Show Diff" macro or by adding the macro to your toolbar.

Note that I have not had a chance yet to test it on any other OS'es but Windows XP, but theoretically it should work on any OS.

AttachmentSize
File Revisions v1.0.kpz3.57 KB

Works Great on Linux (Ubuntu
ioan1k | Tue, 2009-05-26 13:25

Works Great on Linux (Ubuntu 9.04)

Only issue is that when you press cancel for Show Revisions is throws a error, but great work this is quite possiably the most useful tool I have seen for komodo

TypeError: fname1 is undefined

exception[message] = fname1 is undefined
exception[fileName] = chrome://komodo/content/project/peFile.js
exception[lineNumber] = 700
exception[stack] = peFile_ShowDiffs((void 0),"/var/www/goconvergence/profile.php")@chrome://komodo/content/project/peFile.js:700
anonymous([object Object])@chrome://komodo/content/project/peMacro.js:774
macro_evalAsJavascript("var revPath = \"/root/.programming-rev/\";\n\nif (komodo.document.file==null)\n    return;\n\nif (komodo.document.file.scheme != \"file\")\n    return false;\n\nvar revNr = prompt('Enter revision number (older revisions have higher numbers - the most recent will be \"1\")');\n\nvar file = Components.classes[\"@mozilla.org/file/local;1\"]\n                     .createInstance(Components.interfaces.nsILocalFile);\nfile.initWithPath(komodo.document.file.path);\n\nvar fileFullPath = komodo.document.file.displayPath;\nvar fileFullPathDyn = fileFullPath.replace(/(\\:)/g,'');\nvar filePath = revPath + fileFullPathDyn.replace(/^(.*\\\\|.*\\/).*$/,'$1');\nvar fileName = fileFullPathDyn.replace(/^.*(\\\\|\\/)(.*)$/,'$2');\n\nvar rfile = Components.classes[\"@mozilla.org/file/local;1\"]\n                     .createInstance(Components.interfaces.nsILocalFile);\nrfile.initWithPath(filePath);\nvar entries = rfile.directoryEntries;\nvar array = [];\n\nwhile(entries.hasMoreElements()) {\n\n  var entry = entries.getNext();\n  entry.QueryInterface(Components.interfaces.nsIFile);\n  var origName = entry.leafName.substr(0,fileName.length);\n  if (fileName==origName) array.push(entry.path);\n\n}\n\narray = array.reverse();\nif (revNr<0 || revNr>array.length) {\n    alert('Given revision number was not found, max rev is: '+array.length);\n    return false;\n}\n\nko.fileutils.showDiffs(array[revNr],fileFullPath);",[object XPCWrappedNative_NoHelper],null,[object XULElement])@chrome://komodo/content/project/peMacro.js:742
_executeMacro([object XPCWrappedNative_NoHelper],false,null)@chrome://komodo/content/project/peMacro.js:207
macro_executeMacro([object XPCWrappedNative_NoHelper])@chrome://komodo/content/project/peMacro.js:148
([object XPCWrappedNative_NoHelper],[object MouseEvent])@chrome://komodo/content/project/peMacro.js:51
([object XPCWrappedNative_NoHelper],"ondblclick",[object MouseEvent])@chrome://komodo/content/project/projectExtensionManager.js:466
onDblClick([object MouseEvent])@chrome://komodo/content/bindings/partviewer.xml:292
ondblclick([object MouseEvent])@chrome://komodo/content/komodo.xul:1

exception[name] = TypeError

Great addition, far better
pepebe | Sun, 2009-08-23 12:41

Great addition, far better than the original approach!

Thanks for your work.

pepebe

P.S. Today I was thinking about a way to set the backup path automatically to the root directory of the currently active project path.

Example:

- NewProject
-- MyProject.kpf
-- document_root
--- index.html
-- backup
--- index.html.2009-07-22_18-21-00.bak

This would make it possible to use the project directory tree to browse revisions and would also get rid from individually setting up the revPath variable.

Any idea how I can get the necessary information from komodo?