Ticket #3977 (closed: fixed)
Changes required after migration to git
| Reported by: | Russell Taylor | Owned by: | Russell Taylor |
|---|---|---|---|
| Priority: | blocker | Milestone: | Release 2.0 |
| Component: | Infrastructure | Keywords: | |
| Cc: | Blocked By: | ||
| Blocking: | Tester: | Nick Draper |
Description
E.g. Add back data, change how we deal with version numbers (was based off of svn revision number), add a .gitignore, add hooks, add Third_Party handling....
Change History
comment:1 Changed 9 years ago by Russell Taylor
- Priority changed from critical to blocker
- Status changed from new to accepted
comment:2 Changed 9 years ago by Russell Taylor
Add back unit test data. Re #3977.
As at final subversion repository revision (15368), but without history to save space.
Changeset: 32c91f7689786ca1cd32f3f9acf64ae0280c827d
comment:3 Changed 9 years ago by Russell Taylor
Add back performance test code. Re #3977.
Changeset: 7e1c653d71e088beabedac98af9cbbc75ef4fe01
comment:4 Changed 9 years ago by Russell Taylor
Change all the line ending Pete must have missed..... Re #3977.
Changeset: 64d42bb39a18c857bfd9d70f45ecdc0a78100eee
comment:5 Changed 9 years ago by Russell Taylor
Add a script to pull in Third_Party includes and libs on Windows. Re #3977.
Changeset: 30819758ac950a69bb77e808f406df0c13a47b79
comment:6 Changed 9 years ago by Russell Taylor
Remove SVN_WORKING_COPY cmake variable. Re #3977.
Changeset: 7661ccba0e10aa0e22b771d9b468e70c2b2e1b4b
comment:7 Changed 9 years ago by unknown
Add scons to WinInstaller directory, as that's the only place it's used. Re #3977.
Changeset: af48bd7a0c34401ecace1804faa2868d514c9054
comment:8 Changed 9 years ago by Russell Taylor
Add scons to WinInstaller directory, as that's the only place it's used. Re #3977.
Changeset: 4d5823e70ba2fadc778593f8941ca57467d6450c
comment:9 Changed 9 years ago by Russell Taylor
Add a version number (the number of commits since the last release). Re #3977.
Changeset: b486439c36c47632d0333ad4112fbfcc61fbb6ea
comment:10 Changed 9 years ago by Martyn Gigg
Add a script to pull in Third_Party on the Mac. Refs #3977
Changeset: a07786a257e96ad39e74a06c1024a5feeef32ce4
comment:11 Changed 9 years ago by Russell Taylor
Remove SVN_WORKING_COPY guard to make sure version number is updated. Re #3977.
Changeset: b9efa02b1482741ed6602aa72836941d8485f795
comment:12 Changed 9 years ago by Russell Taylor
Bump up the minor version number as a way of avoiding the problems associated with the version number otherwise going backwards. Re #3977.
Changeset: 8cec3ac6f9d44f7becbd4937e86c7fdbe0697f63
comment:13 Changed 9 years ago by Russell Taylor
Get the version date from the Git log. Re #3977.
Changeset: 33aa4ad845de5ba07ae07a5404531179d8d21af5
comment:14 Changed 9 years ago by Martyn Gigg
Add some gitignore files for things like pyc files in certain directories and some other autogenerated stuff when you run a build, i.e. MantidVersion. Refs #3977
Changeset: 3e21a4c0cd0044f49ed8991beb83868691d802f2
comment:15 Changed 9 years ago by Russell Taylor
Add a top-level gitignore file with various things we don't want checked in by mistake. Re #3977.
Changeset: e7987e9b7955d2989c82e127b855005e27f0e720
comment:16 Changed 9 years ago by Martyn Gigg
Refs #3977. Line endings conversion
Changeset: 0c08117a3000c8f6cbec1addacabab623e15f0c8
comment:17 Changed 9 years ago by Martyn Gigg
Refs #3977. Line-ending conversion
Changeset: a3c98783276b851df5a0aa68fb741ceb8fa9917e
comment:18 Changed 9 years ago by Russell Taylor
Re #3977: Add the SHA-1 part of the 'git describe' revision id to the 'About MantidPlot' window. Also returned by a 'MantidPlot --revision'.
Changeset: 62e56696527123643f5fdbaf14b165e0bff92a8c
comment:19 Changed 9 years ago by Russell Taylor
Make sure the version number comes out right if building off the source tarball. Re #3977
Changeset: ee65b096bcdd72fb00816865ef7790b9fe162836
comment:20 Changed 9 years ago by Russell Taylor
Minor tidy-up. Re #3977.
Changeset: 34ad4b4bd86444da0fcc2c9a069f4fb85400ba3b
comment:21 Changed 9 years ago by Russell Taylor
Small fix to third party script. Re #3977.
Changeset: b0b87b751dc6d4620f894909cdfd6beb95346d67
comment:22 Changed 9 years ago by Peter Peterson
Forgot to set the default. Refs #3977.
Changeset: 9623cd70ea562db2433069d60e12b152ba31b6fb
comment:23 Changed 9 years ago by Russell Taylor
Modify to check for includes and libraries separately. Re #3977.
Changeset: 74bf15cc83eb6eecf84e194afaa397c449d71c14
comment:24 Changed 9 years ago by Russell Taylor
Add a couple of git hooks files. Re #3977.
These were taken from Kitware. See http://www.vtk.org/Wiki/Git/Hooks for details on what is checked. I also added a check that a trac ticket is referenced (which must say 're(fs)', not 'fixes'). In order for these to do anything, developers will need to link to these files from their .git/hooks directory.
Changeset: 1894914808c6ed6c4086f9d05231da746dc5dcf5
comment:25 Changed 9 years ago by Russell Taylor
Add copying of our commit hooks into .git/hooks when cmake runs.
The commit hooks in .githooks/ are now copied (or sym-linked) into the local clone's .git/hooks when cmake runs. They will then automatically run on all commits (unless jgit is being used - e.g. by Eclipse). Re #3977.
Changeset: 78de4f47366cccbefc7bb6bf409af4388fc9521a
comment:26 Changed 9 years ago by Russell Taylor
Removed 'personal' entries from .gitignore files. Re #3977.
These should go in an individual's .git/info/exclude file. Also removed some redundant entries from deeper in the directory tree because they were already included in higher-level .gitignore files (which act recursively).
Changeset: dbedfdc1ead34c7123847404cc275f9611f6eaf1
comment:27 Changed 9 years ago by Russell Taylor
Modify to check for includes and libraries separately. Re #3977.
Changeset: 74bf15cc83eb6eecf84e194afaa397c449d71c14
comment:28 Changed 9 years ago by Russell Taylor
Add a couple of git hooks files. Re #3977.
These were taken from Kitware. See http://www.vtk.org/Wiki/Git/Hooks for details on what is checked. I also added a check that a trac ticket is referenced (which must say 're(fs)', not 'fixes'). In order for these to do anything, developers will need to link to these files from their .git/hooks directory.
Changeset: 1894914808c6ed6c4086f9d05231da746dc5dcf5
comment:29 Changed 9 years ago by Russell Taylor
Add copying of our commit hooks into .git/hooks when cmake runs.
The commit hooks in .githooks/ are now copied (or sym-linked) into the local clone's .git/hooks when cmake runs. They will then automatically run on all commits (unless jgit is being used - e.g. by Eclipse). Re #3977.
Changeset: 78de4f47366cccbefc7bb6bf409af4388fc9521a
comment:30 Changed 9 years ago by Russell Taylor
Removed 'personal' entries from .gitignore files. Re #3977.
These should go in an individual's .git/info/exclude file. Also removed some redundant entries from deeper in the directory tree because they were already included in higher-level .gitignore files (which act recursively).
Changeset: dbedfdc1ead34c7123847404cc275f9611f6eaf1
comment:31 Changed 9 years ago by Russell Taylor
Lessen the pain. Re #3977.
Changeset: 0082f23cf68e6bac9ad07e0a33ede00dba5084a5
comment:32 Changed 9 years ago by Russell Taylor
Lessen the pain. Re #3977.
Changeset: 0082f23cf68e6bac9ad07e0a33ede00dba5084a5
comment:33 Changed 9 years ago by Russell Taylor
Encourage meaningful commit messages. Re #3977.
Changeset: 88c8861f598876b2ced54559ead0039d9f6dff90
comment:34 Changed 9 years ago by Russell Taylor
Tweak message length check to avoid truncation on github. Re #3977.
Changeset: 24a96717da83d0884dd9810b3523839de6c8a008
comment:35 Changed 9 years ago by Russell Taylor
Tweak message length check to avoid truncation on github. Re #3977.
...and this time remember to actually change the values that are used in the check.
Changeset: ae202959054f51bf16e583ecb0a9a6b2368be984
comment:36 Changed 9 years ago by Russell Taylor
- Status changed from accepted to verify
- Resolution set to fixed
Closing this one off now..... anything further probably belongs under the trivial changes ticket.
comment:37 Changed 9 years ago by Nick Draper
- Status changed from verify to verifying
- Tester set to Nick Draper
comment:38 Changed 9 years ago by Nick Draper
- Status changed from verifying to closed
git transfer is complete, all files are available and in sensible repositories
comment:39 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 4824
