hgsubversion: util.py annotate

annotate util.py @ 194:13ae1bded5e7

Add some comprehensive tests that can be run with nose in order to make it easier to verify stupid and real replay do the same thing.

author	Augie Fackler <durin42@gmail.com>
date	Wed, 21 Jan 2009 20:27:51 -0600
parents	6e3f99ba47ec
children	906d3f302b45

rev	line source
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	1 import os
34 50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	2 import pickle
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	3 import shutil
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	4
34 50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	5 from mercurial import node
50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	6
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 svn_subcommands = { }
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	8
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	9 def register_subcommand(name):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	10 def inner(fn):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	11 svn_subcommands[name] = fn
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	12 return fn
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	13 return inner
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	14
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	15
115 ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	16 def generate_help():
185 57355b0e7bd1 Creating patch for documention messages. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 159 diff changeset	17 ret = ['hg svn ...', '',
57355b0e7bd1 Creating patch for documention messages. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 159 diff changeset	18 'subcommands for Subversion integration', '',
57355b0e7bd1 Creating patch for documention messages. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 159 diff changeset	19 'list of subcommands:', '']
115 ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	20
ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	21 for name, func in sorted(svn_subcommands.items()):
185 57355b0e7bd1 Creating patch for documention messages. Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 159 diff changeset	22 short_description = (func.__doc__ or '').splitlines()[0]
115 ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	23 ret.append(" %-10s %s" % (name, short_description))
ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	24
ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	25 return "\n".join(ret) + '\n'
ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	26
ed42f6e5705a Clean up help text, document subcommands. Luke Opperman <luke@loppear.com> parents: 99 diff changeset	27
140 9ffde8662967 util: Add a command to normalize svn urls and use it in a couple of places. Test that it works and prevents failed assertions. Augie Fackler <durin42@gmail.com> parents: 124 diff changeset	28 def normalize_url(svn_url):
193 6e3f99ba47ec Simplify normalize_url. Martin Geisler <mg@daimi.au.dk> parents: 186 diff changeset	29 return svn_url.rstrip('/')
140 9ffde8662967 util: Add a command to normalize svn urls and use it in a couple of places. Test that it works and prevents failed assertions. Augie Fackler <durin42@gmail.com> parents: 124 diff changeset	30
9ffde8662967 util: Add a command to normalize svn urls and use it in a couple of places. Test that it works and prevents failed assertions. Augie Fackler <durin42@gmail.com> parents: 124 diff changeset	31
0 f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	32 def wipe_all_files(hg_wc_path):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	33 files = [f for f in os.listdir(hg_wc_path) if f != '.hg']
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	34 for f in files:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	35 f = os.path.join(hg_wc_path, f)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	36 if os.path.isdir(f):
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	37 shutil.rmtree(f)
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	38 else:
f2636cfed115 Initial import of hgsubversion into a public repository. Augie Fackler <durin42@gmail.com> parents: diff changeset	39 os.remove(f)
34 50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	40
50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	41 REVMAP_FILE_VERSION = 1
50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	42 def parse_revmap(revmap_filename):
50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	43 revmap = {}
50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	44 f = open(revmap_filename)
159 463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	45 ver = int(f.readline())
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	46 if ver == 1:
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	47 for l in f:
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	48 revnum, node_hash, branch = l.split(' ', 2)
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	49 if branch == '\n':
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	50 branch = None
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	51 else:
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	52 branch = branch[:-1]
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	53 revmap[int(revnum), branch] = node.bin(node_hash)
34 50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	54 f.close()
159 463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	55 else: #pragma: no cover
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	56 print ('Your revmap was made by a newer version of hgsubversion.'
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	57 ' Please upgrade.')
463998d266e3 parse_revmap: Stop supporting pickled revmaps. I've made enough major changes Augie Fackler <durin42@gmail.com> parents: 154 diff changeset	58 raise NotImplementedError
34 50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	59 return revmap
50d55c3e0d85 Some refactors of the previous change, including transparent upgrade of old-style pickled dictionaries. Augie Fackler <durin42@gmail.com> parents: 19 diff changeset	60
39 b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	61
b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	62 class PrefixMatch(object):
b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	63 def __init__(self, prefix):
b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	64 self.p = prefix
140 9ffde8662967 util: Add a command to normalize svn urls and use it in a couple of places. Test that it works and prevents failed assertions. Augie Fackler <durin42@gmail.com> parents: 124 diff changeset	65
39 b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	66 def files(self):
b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	67 return []
140 9ffde8662967 util: Add a command to normalize svn urls and use it in a couple of places. Test that it works and prevents failed assertions. Augie Fackler <durin42@gmail.com> parents: 124 diff changeset	68
39 b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	69 def __call__(self, fn):
b3c7b844b782 Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code. Augie Fackler <durin42@gmail.com> parents: 34 diff changeset	70 return fn.startswith(self.p)
99 1da7aafdd323 Refactored outgoing_revisions into util where it really belongs. Augie Fackler <durin42@gmail.com> parents: 39 diff changeset	71
152 1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	72 def outgoing_revisions(ui, repo, hg_editor, reverse_map, sourcerev):
99 1da7aafdd323 Refactored outgoing_revisions into util where it really belongs. Augie Fackler <durin42@gmail.com> parents: 39 diff changeset	73 """Given a repo and an hg_editor, determines outgoing revisions for the
1da7aafdd323 Refactored outgoing_revisions into util where it really belongs. Augie Fackler <durin42@gmail.com> parents: 39 diff changeset	74 current working copy state.
1da7aafdd323 Refactored outgoing_revisions into util where it really belongs. Augie Fackler <durin42@gmail.com> parents: 39 diff changeset	75 """
1da7aafdd323 Refactored outgoing_revisions into util where it really belongs. Augie Fackler <durin42@gmail.com> parents: 39 diff changeset	76 outgoing_rev_hashes = []
152 1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	77 if sourcerev in reverse_map:
99 1da7aafdd323 Refactored outgoing_revisions into util where it really belongs. Augie Fackler <durin42@gmail.com> parents: 39 diff changeset	78 return
152 1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	79 sourcerev = repo[sourcerev]
1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	80 while (not sourcerev.node() in reverse_map
1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	81 and sourcerev.node() != node.nullid):
1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	82 outgoing_rev_hashes.append(sourcerev.node())
1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	83 sourcerev = sourcerev.parents()
1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	84 assert len(sourcerev) == 1
1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	85 sourcerev = sourcerev[0]
1fde85a10f9e push: Fix the bad implementation that required modifying the dirstate to push. Augie Fackler <durin42@gmail.com> parents: 140 diff changeset	86 if sourcerev.node() != node.nullid:
99 1da7aafdd323 Refactored outgoing_revisions into util where it really belongs. Augie Fackler <durin42@gmail.com> parents: 39 diff changeset	87 return outgoing_rev_hashes
124 291925677a9f tag_repo: remove gentags command, extend repo.tags(), HgChangeEditor now takes either repo or repo_path Luke Opperman <luke@loppear.com> parents: 115 diff changeset	88
154 6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	89 def build_extra(revnum, branch, uuid, subdir):
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	90 # TODO this needs to be fixed with the new revmap
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	91 extra = {}
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	92 branchpath = 'trunk'
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	93 if branch:
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	94 extra['branch'] = branch
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	95 branchpath = 'branches/%s' % branch
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	96 if subdir and subdir[-1] == '/':
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	97 subdir = subdir[:-1]
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	98 if subdir and subdir[0] != '/':
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	99 subdir = '/' + subdir
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	100 extra['convert_revision'] = 'svn:%(uuid)s%(path)s@%(rev)s' % {
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	101 'uuid': uuid,
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	102 'path': '%s/%s' % (subdir , branchpath),
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	103 'rev': revnum,
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	104 }
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	105 return extra
6fa97cfbf62f fetch: Refactor extra creation to be shared by real and diff replay. Augie Fackler <durin42@gmail.com> parents: 152 diff changeset	106
124 291925677a9f tag_repo: remove gentags command, extend repo.tags(), HgChangeEditor now takes either repo or repo_path Luke Opperman <luke@loppear.com> parents: 115 diff changeset	107
291925677a9f tag_repo: remove gentags command, extend repo.tags(), HgChangeEditor now takes either repo or repo_path Luke Opperman <luke@loppear.com> parents: 115 diff changeset	108 def is_svn_repo(repo):
291925677a9f tag_repo: remove gentags command, extend repo.tags(), HgChangeEditor now takes either repo or repo_path Luke Opperman <luke@loppear.com> parents: 115 diff changeset	109 return os.path.exists(os.path.join(repo.path, 'svn'))
186 6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	110
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	111 default_commit_msg = '* empty log message *'
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	112
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	113 def describe_revision(r):
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	114 try:
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	115 msg = [s for s in map(str.strip, r.message.splitlines()) if s][0]
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	116 except:
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	117 msg = default_commit_msg
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	118
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	119 return ('[r%d] %s: %s' % (r.revnum, r.author, msg))[:80] + '\n'
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	120
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	121 def describe_commit(h, b):
6266ba36ee15 Create patch to make normal output much less verbose… Dan Villiom Podlaski Christiansen <danchr@cs.au.dk> parents: 185 diff changeset	122 return ' committed to "%s" as %s\n' % ((b or 'default'), node.short(h))

Mercurial > hgsubversion

annotate util.py @ 194:13ae1bded5e7