Revise hg Repo - Revision history

Joachim: /* Prerequisites */

2011-10-17T18:51:00Z

Prerequisites

← Older revision		Revision as of 18:51, 17 October 2011
Line 13:		Line 13:
	=== Prerequisites ===		=== Prerequisites ===
	* you have full control over all clones, because they have to be deleted and replaced by the revised repository or the revised info will come back during syncs.		* you have full control over all clones, because they have to be deleted and replaced by the revised repository or the revised info will come back during syncs.
	* there is basically only ~~on line of development~~ possible (no ~~branches/~~merges)		* there is basically only one branch possible from start to end changelist (no merges)

	If you know the changes are only in one revision and one file (or a low number at least) it may be better to use mq extention		If you know the changes are only in one revision and one file (or a low number at least) it may be better to use mq extention

Joachim at 16:52, 17 October 2011

2011-10-17T16:52:18Z

← Older revision		Revision as of 16:52, 17 October 2011
Line 6:		Line 6:

	Ok, this literally took months to figure out, but in the end it was so easy.		Ok, this literally took months to figure out, but in the end it was so easy.


	=== Preparations ===		=== Preparations ===
Line 14:		Line 13:
	=== Prerequisites ===		=== Prerequisites ===
	* you have full control over all clones, because they have to be deleted and replaced by the revised repository or the revised info will come back during syncs.		* you have full control over all clones, because they have to be deleted and replaced by the revised repository or the revised info will come back during syncs.
	* ~~merges need to be checked manually~~ (~~worked for me, but may not work)~~		* there is basically only on line of development possible (no branches/merges)
	* no ~~branching (perhaps needs manual intervention~~)

	If you know the changes are only in one revision and one file (or a low number at least) it may be better to use ~~quilt~~ extention		If you know the changes are only in one revision and one file (or a low number at least) it may be better to use mq extention

	If it is only about author changes, it may be better to use convert extention		If it is only about author changes, it may be better to use convert extention
Line 46:		Line 44:
	cd -		cd -

	=== Method using ~~quilt~~ extension ===		=== Method using mq extension ===

	This works with some changes in some files, not for metadata changes.		This works with some changes in some files, not for metadata changes.
Line 92:		Line 90:
	# could look similar to this:		# could look similar to this:
	[paths]		[paths]
	default = ssh://user@host:port//srv~~/www/htdocs~~/hg/~~repos/mspr~~		default = ssh://user@host:port//srv/hg/sourcerepo
	[ui]		[ui]
	username = ~~joban123@job2~~ <~~joban123.psn~~@~~googlemail~~.com>		username = me <me@mail.com>
	[web]		[web]
	contact = ~~joban123~~ <~~joban123.psn~~@~~googlemail~~.com>		contact = me <me@mail.com>
	description = ~~Motorstorm Leaderboards~~		description = The Repo
	allowgz = true		allowgz = true
	hg log -gp >/tmp/good-repo-history-unfolded.txt		hg log -gp >/tmp/good-repo-history-unfolded.txt

Joachim: /* Method using convert extension */

2011-10-17T13:41:13Z

Method using convert extension

← Older revision		Revision as of 13:41, 17 October 2011
Line 74:		Line 74:

	=== Method using convert extension ===		=== Method using convert extension ===

			This works for changing authornames.

	cd repodir		cd repodir
Line 91:		Line 93:
	[paths]		[paths]
	default = ssh://user@host:port//srv/www/htdocs/hg/repos/mspr		default = ssh://user@host:port//srv/www/htdocs/hg/repos/mspr

	[ui]		[ui]
	username = joban123@job2 <joban123.psn@googlemail.com>		username = joban123@job2 <joban123.psn@googlemail.com>

	[web]		[web]
	contact = joban123 <joban123.psn@googlemail.com>		contact = joban123 <joban123.psn@googlemail.com>

Joachim: /* Replace clones with the new version */

2011-10-17T13:39:35Z

Replace clones with the new version

← Older revision		Revision as of 13:39, 17 October 2011
Line 119:		Line 119:
	If eclipse is in use, then by removing the eclipse project with files (except .hg/hgrc) ,		If eclipse is in use, then by removing the eclipse project with files (except .hg/hgrc) ,
	then create mercurial project by cloning, then copy hgrc back		then create mercurial project by cloning, then copy hgrc back

	If eclipse is not used: cp -av repodir/.hg/hgrc hgrc.bak; rm -r repodir; hg clone sourcerepo repodir; cp -av hgrc.bak repodir/.hg/hgrc		If eclipse is not used: cp -av repodir/.hg/hgrc hgrc.bak; rm -r repodir; hg clone sourcerepo repodir; cp -av hgrc.bak repodir/.hg/hgrc

	Make sure all repodir/.hg/hgrc have valid authors and all clones are replaced.		Make sure all repodir/.hg/hgrc have valid authors and all clones are replaced.
	If not, you will have to repeat the whole procedure after the next commit/push/pull ;)		If not, you will have to repeat the whole procedure after the next commit/push/pull ;)

Joachim: /* Replace clones with the new version */

2011-10-17T13:39:09Z

Replace clones with the new version

← Older revision		Revision as of 13:39, 17 October 2011
Line 116:		Line 116:
	If checks are ok, remove the old repo(s) and all intermediate files in /tmp and replace all cloned repos now		If checks are ok, remove the old repo(s) and all intermediate files in /tmp and replace all cloned repos now

	==== Replace clones with the new version ====		=== Replace clones with the new version ===
	If eclipse is in use, then by removing the eclipse project with files (except .hg/hgrc) ,		If eclipse is in use, then by removing the eclipse project with files (except .hg/hgrc) ,
	then create mercurial project by cloning, then copy hgrc back		then create mercurial project by cloning, then copy hgrc back

Joachim at 13:38, 17 October 2011

2011-10-17T13:38:30Z

@@ Line 7: / Line 7: @@
 Ok, this literally took months to figure out, but in the end it was so easy.
-Prerequisites are
 * you have full control over all clones, because they have to be deleted and replaced by the revised repository or the revised info will come back during syncs.
 * merges need to be checked manually (worked for me, but may not work)
@@ Line 68: / Line 73: @@
   cd -
-=== Method using convert extension
+=== Method using convert extension ===
 === Final Checks ===
@@ Line 81: / Line 114: @@
   grep toxic-pattern /tmp/good-repo-history-unfolded.txt
-If checks are ok, remove the old repo(s) and all intermediate files in /tmp
+If checks are ok, remove the old repo(s) and all intermediate files in /tmp and replace all cloned repos now

Joachim at 13:14, 17 October 2011

2011-10-17T13:14:42Z

← Older revision		Revision as of 13:14, 17 October 2011
Line 48:		Line 48:

	hg clone orig revised		hg clone orig revised
	cd revised/		cd orig
			hg log -gp >/tmp/toxic-repo-history-unfolded.txt
			cd -
			cd revised
	vi .hg/hgrc		vi .hg/hgrc
	[diff]		[diff]
Line 62:		Line 65:
	vi another.txt		vi another.txt
	hg qrefresh		hg qrefresh
			hg log -gp >/tmp/good-repo-history-unfolded.txt
			cd -

	=== Method using convert extension		=== Method using convert extension

Joachim at 13:12, 17 October 2011

2011-10-17T13:12:14Z

@@ Line 12: / Line 12: @@
 * no branching (perhaps needs manual intervention)
   start=5 (no changes needed up to and including this revision)
   end=10 (last repository revision)
@@ Line 32: / Line 40: @@
   hg log -gp >/tmp/good-repo-history-unfolded.txt
   cd -
 That's it. Check thoroughly if it worked:

Joachim: New page: == Revise a HG Repository == I have a mercurial repository, that I wanted to publish for a long time. But it contains some infos in its history (files, author, commit messages) that are n...

2011-10-14T12:14:46Z

New page: == Revise a HG Repository == I have a mercurial repository, that I wanted to publish for a long time. But it contains some infos in its history (files, author, commit messages) that are n...

New page

== Revise a HG Repository ==

I have a mercurial repository, that I wanted to publish for a long time. But it contains some infos in its history (files, author, commit messages) that are not intended for public audience.

How do I get rid of this in the entire repositories history and not just at tip?

Ok, this literally took months to figure out, but in the end it was so easy.

Prerequisites are
* you have full control over all clones, because they have to be deleted and replaced by the revised repository or the revised info will come back during syncs.
* merges need to be checked manually (worked for me, but may not work)
* no branching (perhaps needs manual intervention)

start=5 (no changes needed up to and including this revision)
end=10 (last repository revision)
hg clone originalrepo revisedrepo --rev $start
cd originalrepo
hg log -gp >/tmp/toxic-repo-history-unfolded.txt
i=$((start + 1))
while [ $i -le $end ]; do
hg export --rev $i -g >/tmp/changelist-$i.export
sed -i 's/toxic-pattern/good-pattern/g' /tmp/changelist-$i.export
i=$((i+1))
done
cd -
cd revisedrepo
i=$((start + 1))
while [ $i -le $end ]; do
hg import /tmp/changelist-$i.export
i=$((i+1))
done
hg log -gp >/tmp/good-repo-history-unfolded.txt
cd -

That's it. Check thoroughly if it worked:

Check changes between toxic and good repo. Should only output lines expected to changed from toxic to good.
diff -U0 /tmp/toxic-repo-history-unfolded.txt /tmp/good-repo-history-unfolded.txt

Check for toxic patterns in good repo history. Should not output anything
grep toxic-pattern /tmp/good-repo-history-unfolded.txt

If checks are ok, remove the old repo(s) and all intermediate files in /tmp