hgsubversion: hgsubversion/svncommands.py annotate

annotate hgsubversion/svncommands.py @ 1292:7bbe120be193

layouts: turn taglocations method into a property We no longer need to pass the meta path since we have an internal reference to the meta object, so we remove the parameter from the taglocations method.

author	Sean Farley <sean.michael.farley@gmail.com>
date	Mon, 24 Mar 2014 11:20:53 -0500
parents	5ee3e5030a35
children	5f80c92be718

rev	line source
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	1 import os
493 41c333473dda try to deal with weirdly located branches in rebuildmeta (#118) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 474 diff changeset	2 import posixpath
616 532c545d162c svncommands: add two missing imports Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	3 import sys
532c545d162c svncommands: add two missing imports Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 611 diff changeset	4 import traceback
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	5 import urlparse
989 68191be64af8 updatemeta: fix missing errno import Patrick Mezard <patrick@mezard.eu> parents: 988 diff changeset	6 import errno
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	7
598 e432b61c6d74 Use Mercurial-provided infrastructure for `svn' metacommand help. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 595 diff changeset	8 from mercurial import commands
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	9 from mercurial import hg
06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	10 from mercurial import node
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	11 from mercurial import util as hgutil
573 00393e9abff8 svncommands: make repo optional (useful for things like listauthors) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 566 diff changeset	12 from mercurial import error
242 06130689a2c8 Move push into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 241 diff changeset	13
1007 e95f4de8709a layouts: refactor buildmeta layout reading and writing David Schleimer <dschleimer@fb.com> parents: 1002 diff changeset	14 import layouts
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	15 import maps
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	16 import svnwrap
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	17 import svnrepo
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	18 import util
291 ba8e91a7c077 Add 'updateexternals' to synchronize externals with remote repo. Patrick Mezard <pmezard@gmail.com> parents: 274 diff changeset	19 import svnexternals
897 6bc8046e3d0a move verify to a file of its own Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 893 diff changeset	20 import verify
1162 cb14dba562eb svncommands: add svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1152 diff changeset	21 import svnmeta
241 4950b18cf949 Move fetch_command.fetch_revisions() to svncommands.pull(). Dirkjan Ochtman <dirkjan@ochtman.nl> parents: diff changeset	22
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	23
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	24 def updatemeta(ui, repo, args, **opts):
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	25 """Do a partial rebuild of the subversion metadata.
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	26
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	27 Assumes that the metadata that currently exists is valid, but that
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	28 some is missing, e.g. because you have pulled some revisions via a
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	29 native mercurial method.
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	30
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	31 """
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	32
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	33 return _buildmeta(ui, repo, args, partial=True)
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	34
395 636e9bf5d49c svncommands: add verify command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 384 diff changeset	35
918 761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	36 def rebuildmeta(ui, repo, args, unsafe_skip_uuid_check=False, **opts):
246 074f27c68818 Move rebuildmeta into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	37 """rebuild hgsubversion metadata using values stored in revisions
074f27c68818 Move rebuildmeta into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	38 """
918 761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	39 return _buildmeta(ui, repo, args, partial=False,
761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	40 skipuuid=unsafe_skip_uuid_check)
573 00393e9abff8 svncommands: make repo optional (useful for things like listauthors) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 566 diff changeset	41
918 761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	42 def _buildmeta(ui, repo, args, partial=False, skipuuid=False):
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	43
573 00393e9abff8 svncommands: make repo optional (useful for things like listauthors) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 566 diff changeset	44 if repo is None:
00393e9abff8 svncommands: make repo optional (useful for things like listauthors) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 566 diff changeset	45 raise error.RepoError("There is no Mercurial repository"
00393e9abff8 svncommands: make repo optional (useful for things like listauthors) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 566 diff changeset	46 " here (.hg not found)")
00393e9abff8 svncommands: make repo optional (useful for things like listauthors) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 566 diff changeset	47
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	48 dest = None
1002 117b3b421294 buildmeta: verify uuid when passed explicit url David Schleimer <dschleimer@fb.com> parents: 997 diff changeset	49 validateuuid = False
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	50 if len(args) == 1:
419 3ed71e63f64c imported patch import-cleanup Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 414 diff changeset	51 dest = args[0]
1002 117b3b421294 buildmeta: verify uuid when passed explicit url David Schleimer <dschleimer@fb.com> parents: 997 diff changeset	52 validateuuid = True
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	53 elif len(args) > 1:
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	54 raise hgutil.Abort('rebuildmeta takes 1 or no arguments')
754 caa527346a0f svncommands: abort on missing metadata or Subversion URL (fixes #226) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 748 diff changeset	55 url = repo.ui.expandpath(dest or repo.ui.config('paths', 'default-push') or
caa527346a0f svncommands: abort on missing metadata or Subversion URL (fixes #226) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 748 diff changeset	56 repo.ui.config('paths', 'default') or '')
1162 cb14dba562eb svncommands: add svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1152 diff changeset	57
cb14dba562eb svncommands: add svnmeta object Sean Farley <sean.michael.farley@gmail.com> parents: 1152 diff changeset	58 meta = svnmeta.SVNMeta(repo, skiperrorcheck=True)
246 074f27c68818 Move rebuildmeta into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	59
997 c8cb06e1f323 buildmeta: do not contact svn unless needed Bryan O'Sullivan <bryano@fb.com> parents: 996 diff changeset	60 svn = None
1165 eba7de99c576 svncommands: use meta.subdir instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1164 diff changeset	61 if meta.subdir is None:
997 c8cb06e1f323 buildmeta: do not contact svn unless needed Bryan O'Sullivan <bryano@fb.com> parents: 996 diff changeset	62 svn = svnrepo.svnremoterepo(ui, url).svn
1165 eba7de99c576 svncommands: use meta.subdir instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1164 diff changeset	63 meta.subdir = svn.subdir
246 074f27c68818 Move rebuildmeta into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	64
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	65 youngest = 0
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	66 startrev = 0
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	67 sofar = []
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	68 branchinfo = {}
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	69 if partial:
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	70 try:
1185 65ca78ac2ee1 svncommands: use meta.lastpulled instead of revmap.youngest Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	71 # we can't use meta.lastpulled here because we are bootstraping the
65ca78ac2ee1 svncommands: use meta.lastpulled instead of revmap.youngest Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	72 # lastpulled and want to keep the cached value on disk during a
65ca78ac2ee1 svncommands: use meta.lastpulled instead of revmap.youngest Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	73 # partial rebuild
922 6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	74 foundpartialinfo = False
1185 65ca78ac2ee1 svncommands: use meta.lastpulled instead of revmap.youngest Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	75 youngestpath = os.path.join(meta.metapath, 'lastpulled')
922 6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	76 if os.path.exists(youngestpath):
1142 f4a32d381e03 util: remove all calls to load_string Sean Farley <sean.michael.farley@gmail.com> parents: 1132 diff changeset	77 youngest = util.load(youngestpath)
1182 8f9619a67565 maps: change readmapfile to take a path instead of repo Sean Farley <sean.michael.farley@gmail.com> parents: 1169 diff changeset	78 sofar = list(maps.RevMap.readmapfile(meta.revmap_file))
922 6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	79 if sofar and len(sofar[-1].split(' ', 2)) > 1:
6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	80 lasthash = sofar[-1].split(' ', 2)[1]
6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	81 startrev = repo[lasthash].rev() + 1
1166 8a1bf7d011c3 svncommands: use meta.branch_info instead of duplicating logic Sean Farley <sean.michael.farley@gmail.com> parents: 1165 diff changeset	82 branchinfo = util.load(meta.branch_info_file)
922 6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	83 foundpartialinfo = True
6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	84 if not foundpartialinfo:
6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	85 ui.status('missing some metadata -- doing a full rebuild\n')
6b7ac659c855 updatemeta: correctly handle empty metadata Jun Fang <junfang@fb.com> parents: 918 diff changeset	86 partial = False
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	87 except IOError, err:
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	88 if err.errno != errno.ENOENT:
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	89 raise
988 06d0009b22ad updatemeta: add missing EOL to status messages Patrick Mezard <patrick@mezard.eu> parents: 922 diff changeset	90 ui.status('missing some metadata -- doing a full rebuild\n')
913 9fff2b8217b6 add except for AttributeError if youngestrepo doesn't exist Brad Hall <bhall@fb.com> parents: 897 diff changeset	91 except AttributeError:
988 06d0009b22ad updatemeta: add missing EOL to status messages Patrick Mezard <patrick@mezard.eu> parents: 922 diff changeset	92 ui.status('no metadata available -- doing a full rebuild\n')
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	93
1168 6137fcdef1b9 svncommands: use meta.revmap_file Sean Farley <sean.michael.farley@gmail.com> parents: 1167 diff changeset	94 revmap = open(meta.revmap_file, 'w')
1169 8be519003868 svncommands: use RevMap.VERSION instead of hardcoding '1' Sean Farley <sean.michael.farley@gmail.com> parents: 1168 diff changeset	95 revmap.write('%d\n' % maps.RevMap.VERSION)
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	96 revmap.writelines(sofar)
246 074f27c68818 Move rebuildmeta into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	97 last_rev = -1
1167 4f31a0a6fc86 svncommands: use meta.tags instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1166 diff changeset	98 if not partial and os.path.exists(meta.tagfile):
4f31a0a6fc86 svncommands: use meta.tags instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1166 diff changeset	99 os.unlink(meta.tagfile)
452 ae35c389cdef tags: allow editing tags of closed branches without reopening the branch Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	100
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 493 diff changeset	101 layout = None
1033 32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	102 layoutobj = None
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 493 diff changeset	103
452 ae35c389cdef tags: allow editing tags of closed branches without reopening the branch Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	104 skipped = set()
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	105 closed = set()
452 ae35c389cdef tags: allow editing tags of closed branches without reopening the branch Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	106
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	107 numrevs = len(repo) - startrev
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	108
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	109 # ctx.children() visits all revisions in the repository after ctx. Calling
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	110 # it would make us use O(revisions^2) time, so we perform an extra traversal
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	111 # of the repository instead. During this traversal, we find all converted
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	112 # changesets that close a branch, and store their first parent
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	113 for rev in xrange(startrev, len(repo)):
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1033 diff changeset	114 ui.progress('prepare', rev - startrev, total=numrevs)
1019 d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	115 try:
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	116 ctx = repo[rev]
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	117 except error.RepoError:
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	118 # this revision is hidden
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	119 continue
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	120
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	121 convinfo = util.getsvnrev(ctx, None)
821 f28e0f54a6ef svnmeta: store youngest revision pulled from subversion Augie Fackler <durin42@gmail.com> parents: 810 diff changeset	122 if not convinfo:
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion Augie Fackler <durin42@gmail.com> parents: 810 diff changeset	123 continue
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion Augie Fackler <durin42@gmail.com> parents: 810 diff changeset	124 svnrevnum = int(convinfo.rsplit('@', 1)[1])
f28e0f54a6ef svnmeta: store youngest revision pulled from subversion Augie Fackler <durin42@gmail.com> parents: 810 diff changeset	125 youngest = max(youngest, svnrevnum)
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	126
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	127 if ctx.extra().get('close', None) is None:
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	128 continue
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	129
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	130 droprev = lambda x: x.rsplit('@', 1)[0]
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	131 parentctx = ctx.parents()[0]
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	132 parentinfo = util.getsvnrev(parentctx, '@')
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	133
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	134 if droprev(parentinfo) == droprev(convinfo):
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	135 if parentctx.rev() < startrev:
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	136 parentbranch = parentctx.branch()
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	137 if parentbranch == 'default':
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	138 parentbranch = None
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	139 branchinfo.pop(parentbranch)
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	140 else:
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	141 closed.add(parentctx.rev())
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	142
1185 65ca78ac2ee1 svncommands: use meta.lastpulled instead of revmap.youngest Sean Farley <sean.michael.farley@gmail.com> parents: 1182 diff changeset	143 meta.lastpulled = youngest
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1033 diff changeset	144 ui.progress('prepare', None, total=numrevs)
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	145
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	146 for rev in xrange(startrev, len(repo)):
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1033 diff changeset	147 ui.progress('rebuild', rev-startrev, total=numrevs)
1019 d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	148 try:
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	149 ctx = repo[rev]
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	150 except error.RepoError:
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	151 # this revision is hidden
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	152 continue
d0f3a5c2cb56 updatemeta/rebuildmeta: handle hidden changesets Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 922 diff changeset	153
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	154 convinfo = util.getsvnrev(ctx, None)
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	155 if not convinfo:
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	156 continue
448 fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	157 if '.hgtags' in ctx.files():
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	158 parent = ctx.parents()[0]
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	159 parentdata = ''
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	160 if '.hgtags' in parent:
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	161 parentdata = parent.filectx('.hgtags').data()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	162 newdata = ctx.filectx('.hgtags').data()
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	163 for newtag in newdata[len(parentdata):-1].split('\n'):
fbc7cf4fd701 tags: reinstate a tag map file in a better way Augie Fackler <durin42@gmail.com> parents: 447 diff changeset	164 ha, tag = newtag.split(' ', 1)
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	165 tagged = util.getsvnrev(repo[ha], None)
453 bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	166 if tagged is None:
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	167 tagged = -1
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	168 else:
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	169 tagged = int(tagged[40:].split('@')[1])
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	170 # This is max(tagged rev, tagging rev) because if it is a normal
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	171 # tag, the tagging revision has the right rev number. However, if it
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	172 # was an edited tag, then the tagged revision has the correct revision
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	173 # number.
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	174 tagging = int(convinfo[40:].split('@')[1])
bb612e625be6 tags: handle copyfrom old versions of tags more correctly Augie Fackler <durin42@gmail.com> parents: 452 diff changeset	175 tagrev = max(tagged, tagging)
1167 4f31a0a6fc86 svncommands: use meta.tags instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1166 diff changeset	176 meta.tags[tag] = node.bin(ha), tagrev
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	177
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	178 # check that the conversion metadata matches expectations
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	179 assert convinfo.startswith('svn:')
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	180 revpath, revision = convinfo[40:].split('@')
1165 eba7de99c576 svncommands: use meta.subdir instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1164 diff changeset	181 # use tmp variable for testing
eba7de99c576 svncommands: use meta.subdir instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1164 diff changeset	182 subdir = meta.subdir
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	183 if subdir and subdir[0] != '/':
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	184 subdir = '/' + subdir
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	185 if subdir and subdir[-1] == '/':
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	186 subdir = subdir[:-1]
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	187 assert revpath.startswith(subdir), ('That does not look like the '
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	188 'right location in the repo.')
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	189
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 493 diff changeset	190 if layout is None:
1091 384eb7e05b61 layouts: teach layout detection from file about alternate layouts David Schleimer <dschleimer@fb.com> parents: 1039 diff changeset	191 layout = layouts.detect.layout_from_commit(subdir, revpath,
1265 4744b7bfa476 layouts: change constructor to take a meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1262 diff changeset	192 ctx.branch(), meta)
4744b7bfa476 layouts: change constructor to take a meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1262 diff changeset	193 existing_layout = layouts.detect.layout_from_file(meta)
1007 e95f4de8709a layouts: refactor buildmeta layout reading and writing David Schleimer <dschleimer@fb.com> parents: 1002 diff changeset	194 if layout != existing_layout:
1262 199933008ab5 svncommands: use util.dump instead of layout_to_file Sean Farley <sean.michael.farley@gmail.com> parents: 1185 diff changeset	195 util.dump(layout, meta.layout_file)
1265 4744b7bfa476 layouts: change constructor to take a meta object Sean Farley <sean.michael.farley@gmail.com> parents: 1262 diff changeset	196 layoutobj = layouts.layout_from_name(layout, meta)
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 493 diff changeset	197 elif layout == 'single':
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 493 diff changeset	198 assert (subdir or '/') == revpath, ('Possible layout detection'
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 493 diff changeset	199 ' defect in replay')
1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 493 diff changeset	200
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	201 # write repository uuid if required
1164 52de1f3b6824 svncommands: use meta.uuid instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1163 diff changeset	202 if meta.uuid is None or validateuuid:
1002 117b3b421294 buildmeta: verify uuid when passed explicit url David Schleimer <dschleimer@fb.com> parents: 997 diff changeset	203 validateuuid = False
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	204 uuid = convinfo[4:40]
918 761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	205 if not skipuuid:
997 c8cb06e1f323 buildmeta: do not contact svn unless needed Bryan O'Sullivan <bryano@fb.com> parents: 996 diff changeset	206 if svn is None:
c8cb06e1f323 buildmeta: do not contact svn unless needed Bryan O'Sullivan <bryano@fb.com> parents: 996 diff changeset	207 svn = svnrepo.svnremoterepo(ui, url).svn
918 761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	208 if uuid != svn.uuid:
761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	209 raise hgutil.Abort('remote svn repository identifier '
761a87134501 rebuildmeta: accept unrelated svn repo with --unsafe-skip-uuid-check Patrick Mezard <patrick@mezard.eu> parents: 913 diff changeset	210 'does not match')
1164 52de1f3b6824 svncommands: use meta.uuid instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 1163 diff changeset	211 meta.uuid = uuid
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	212
423 021bdbf391bb put convert_revision in branch-closing csets Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	213 # don't reflect closed branches
452 ae35c389cdef tags: allow editing tags of closed branches without reopening the branch Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	214 if (ctx.extra().get('close') and not ctx.files() or
ae35c389cdef tags: allow editing tags of closed branches without reopening the branch Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	215 ctx.parents()[0].node() in skipped):
ae35c389cdef tags: allow editing tags of closed branches without reopening the branch Augie Fackler <durin42@gmail.com> parents: 448 diff changeset	216 skipped.add(ctx.node())
423 021bdbf391bb put convert_revision in branch-closing csets Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	217 continue
021bdbf391bb put convert_revision in branch-closing csets Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	218
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	219 # find commitpath, write to revmap
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	220 commitpath = revpath[len(subdir)+1:]
1033 32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	221
1292 7bbe120be193 layouts: turn taglocations method into a property Sean Farley <sean.michael.farley@gmail.com> parents: 1266 diff changeset	222 tag_locations = layoutobj.taglocations
1033 32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	223 found_tag = False
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	224 for location in tag_locations:
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	225 if commitpath.startswith(location + '/'):
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	226 found_tag = True
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	227 break
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	228 if found_tag and ctx.extra().get('close'):
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	229 continue
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	230
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	231 branch = layoutobj.localname(commitpath)
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	232 revmap.write('%s %s %s\n' % (revision, ctx.hex(), branch or ''))
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	233
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	234 revision = int(revision)
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	235 if revision > last_rev:
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	236 last_rev = revision
375 af9fc01299b4 Make branch closing more Mercurial-like. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 371 diff changeset	237
af9fc01299b4 Make branch closing more Mercurial-like. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 371 diff changeset	238 # deal with branches
1033 32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	239 if branch and branch.startswith('../'):
641 67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	240 parent = ctx
67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	241 while parent.node() != node.nullid:
67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	242 parentextra = parent.extra()
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	243 parentinfo = util.getsvnrev(parent)
641 67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	244 assert parentinfo
67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	245 parent = parent.parents()[0]
67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	246
67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	247 parentpath = parentinfo[40:].split('@')[0][len(subdir) + 1:]
67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	248
1033 32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	249 found_tag = False
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	250 for location in tag_locations:
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	251 if parentpath.startswith(location + '/'):
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	252 found_tag = True
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	253 break
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	254 if found_tag and parentextra.get('close'):
641 67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	255 continue
1033 32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	256
32f6b970c762 buildmeta: use layouts library for branch and tag mapping in _buildmeta David Schleimer <dschleimer@fb.com> parents: 1021 diff changeset	257 branch = layoutobj.localname(parentpath)
641 67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	258 break
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	259
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	260 if rev in closed:
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	261 # a direct child of this changeset closes the branch; drop it
92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	262 branchinfo.pop(branch, None)
641 67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	263 elif ctx.extra().get('close'):
67513cca972f rebuildmeta: handle mapped branch names. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 637 diff changeset	264 pass
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	265 elif branch not in branchinfo:
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	266 parent = ctx.parents()[0]
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	267 if (parent.node() not in skipped
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	268 and util.getsvnrev(parent, '').startswith('svn:')
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	269 and parent.branch() != ctx.branch()):
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	270 parentbranch = parent.branch()
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	271 if parentbranch == 'default':
246 074f27c68818 Move rebuildmeta into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	272 parentbranch = None
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	273 else:
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	274 parentbranch = None
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	275 # branchinfo is a map from mercurial branch to a
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	276 # (svn branch, svn parent revision, svn revision) tuple
78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	277 parentrev = util.getsvnrev(parent, '@').split('@')[1] or 0
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	278 branchinfo[branch] = (parentbranch,
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	279 int(parentrev),
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	280 revision)
637 92f4a4b60696 rebuildmeta: optimize by removing quadratic time usage Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 616 diff changeset	281
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1033 diff changeset	282 ui.progress('rebuild', None, total=numrevs)
371 b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	283
b45671850969 Add some comments for rebuildmeta, simplify a little. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 342 diff changeset	284 # save off branch info
1166 8a1bf7d011c3 svncommands: use meta.branch_info instead of duplicating logic Sean Farley <sean.michael.farley@gmail.com> parents: 1165 diff changeset	285 util.dump(branchinfo, meta.branch_info_file)
246 074f27c68818 Move rebuildmeta into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 244 diff changeset	286
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	287
595 200770235bf0 svncommands: rename the `help' function to `help_'. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 580 diff changeset	288 def help_(ui, args=None, **opts):
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	289 """show help for a given subcommands or a help overview
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	290 """
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	291 if args:
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	292 subcommand = args[0]
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	293 if subcommand not in table:
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	294 candidates = []
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	295 for c in table:
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	296 if c.startswith(subcommand):
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	297 candidates.append(c)
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	298 if len(candidates) == 1:
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	299 subcommand = candidates[0]
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	300 elif len(candidates) > 1:
603 24c73f35f3cf metacommand: use AmbiguousCommand from hg for consistency. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 599 diff changeset	301 raise error.AmbiguousCommand(subcommand, candidates)
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	302 return
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	303 doc = table[subcommand].__doc__
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	304 if doc is None:
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	305 doc = "No documentation available for %s." % subcommand
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	306 ui.status(doc.strip(), '\n')
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	307 return
598 e432b61c6d74 Use Mercurial-provided infrastructure for `svn' metacommand help. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 595 diff changeset	308 commands.help_(ui, 'svn')
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	309
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	310
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	311 def update(ui, args, repo, clean=False, **opts):
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	312 """update to a specified Subversion revision number
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	313 """
446 cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	314
755 9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	315 try:
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	316 rev = int(args[0])
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	317 except IndexError:
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	318 raise error.CommandError('svn',
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	319 "no revision number specified for 'update'")
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	320 except ValueError:
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	321 raise error.Abort("'%s' is not a valid Subversion revision number"
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	322 % args[0])
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	323
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	324 meta = repo.svnmeta()
446 cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	325
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	326 answers = []
446 cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	327 for k, v in meta.revmap.iteritems():
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	328 if k[0] == rev:
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	329 answers.append((v, k[1]))
446 cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	330
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	331 if len(answers) == 1:
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	332 if clean:
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	333 return hg.clean(repo, answers[0][0])
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	334 return hg.update(repo, answers[0][0])
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	335 elif len(answers) == 0:
446 cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	336 ui.status('revision %s did not produce an hg revision\n' % rev)
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	337 return 1
1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	338 else:
446 cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	339 ui.status('ambiguous revision!\n')
cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	340 revs = ['%s on %s' % (node.hex(a[0]), a[1]) for a in answers] + ['']
cbd230043379 svncommands: get update working again Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 441 diff changeset	341 ui.status('\n'.join(revs))
247 1272e87546ed Move help, update into svncommands. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 246 diff changeset	342 return 1
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	343
c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	344
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	345 def genignore(ui, repo, force=False, **opts):
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	346 """generate .hgignore from svn:ignore properties.
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	347 """
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	348
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	349 if repo is None:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	350 raise error.RepoError("There is no Mercurial repository"
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	351 " here (.hg not found)")
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	352
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	353 ignpath = repo.wjoin('.hgignore')
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	354 if not force and os.path.exists(ignpath):
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	355 raise hgutil.Abort('not overwriting existing .hgignore, try --force?')
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	356 svn = svnrepo.svnremoterepo(repo.ui).svn
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	357 meta = repo.svnmeta()
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	358 hashes = meta.revmap.hashes()
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	359 parent = util.parentrev(ui, repo, meta, hashes)
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	360 r, br = hashes[parent.node()]
1015 ea6109f5c000 layouts: use layouts library for branch mapping with generating .hgignore David Schleimer <dschleimer@fb.com> parents: 1007 diff changeset	361 branchpath = meta.layoutobj.remotename(br)
ea6109f5c000 layouts: use layouts library for branch mapping with generating .hgignore David Schleimer <dschleimer@fb.com> parents: 1007 diff changeset	362 if branchpath:
ea6109f5c000 layouts: use layouts library for branch mapping with generating .hgignore David Schleimer <dschleimer@fb.com> parents: 1007 diff changeset	363 branchpath += '/'
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	364 ignorelines = ['.hgignore', 'syntax:glob']
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	365 dirs = [''] + [d[0] for d in svn.list_files(branchpath, r)
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	366 if d[1] == 'd']
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	367 for dir in dirs:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	368 path = '%s%s' % (branchpath, dir)
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	369 props = svn.list_props(path, r)
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	370 if 'svn:ignore' not in props:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	371 continue
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	372 lines = props['svn:ignore'].strip().split('\n')
1258 85fe080461c6 genignore: fitler out empty lines in svn:ignore. peter.geer parents: 1185 diff changeset	373 ignorelines += [dir and (dir + '/' + prop) or prop for prop in lines if prop.strip()]
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	374
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	375 repo.wopener('.hgignore', 'w').write('\n'.join(ignorelines) + '\n')
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	376
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	377
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	378 def info(ui, repo, **opts):
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	379 """show Subversion details similar to `svn info'
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	380 """
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	381
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	382 if repo is None:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	383 raise error.RepoError("There is no Mercurial repository"
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	384 " here (.hg not found)")
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	385
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	386 meta = repo.svnmeta()
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	387 hashes = meta.revmap.hashes()
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	388
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	389 if opts.get('rev'):
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	390 parent = repo[opts['rev']]
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	391 else:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	392 parent = util.parentrev(ui, repo, meta, hashes)
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	393
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	394 pn = parent.node()
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	395 if pn not in hashes:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	396 ui.status('Not a child of an svn revision.\n')
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	397 return 0
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	398 r, br = hashes[pn]
884 1b261e0f85aa Abstract away the details of where svn revs are stored in a commit Bryan O'Sullivan <bryano@fb.com> parents: 881 diff changeset	399 subdir = util.getsvnrev(parent)[40:].split('@')[0]
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	400 remoterepo = svnrepo.svnremoterepo(repo.ui)
1016 438dc704b0d6 layouts: use layout library in hg svn info David Schleimer <dschleimer@fb.com> parents: 1015 diff changeset	401 url = meta.layoutobj.remotepath(br, remoterepo.svnurl)
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	402 author = meta.authors.reverselookup(parent.user())
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	403 # cleverly figure out repo root w/o actually contacting the server
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	404 reporoot = url[:len(url)-len(subdir)]
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	405 ui.write('''URL: %(url)s
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	406 Repository Root: %(reporoot)s
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	407 Repository UUID: %(uuid)s
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	408 Revision: %(revision)s
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	409 Node Kind: directory
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	410 Last Changed Author: %(author)s
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	411 Last Changed Rev: %(revision)s
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	412 Last Changed Date: %(date)s\n''' %
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	413 {'reporoot': reporoot,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	414 'uuid': meta.uuid,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	415 'url': url,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	416 'author': author,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	417 'revision': r,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	418 # TODO I'd like to format this to the user's local TZ if possible
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	419 'date': hgutil.datestr(parent.date(),
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	420 '%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	421 })
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	422
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	423
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	424 def listauthors(ui, args, authors=None, **opts):
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	425 """list all authors in a Subversion repository
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	426 """
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	427 if not len(args):
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	428 ui.status('No repository specified.\n')
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	429 return
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	430 svn = svnrepo.svnremoterepo(ui, args[0]).svn
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	431 author_set = set()
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	432 for rev in svn.revisions():
735 c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 728 diff changeset	433 if rev.author is None:
c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 728 diff changeset	434 author_set.add('(no author)')
c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 728 diff changeset	435 else:
c2b9e08ecf10 maps: map a missing author to '(no author)' Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 728 diff changeset	436 author_set.add(rev.author)
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	437 if authors:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	438 authorfile = open(authors, 'w')
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	439 authorfile.write('%s=\n' % '=\n'.join(sorted(author_set)))
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	440 authorfile.close()
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	441 else:
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	442 ui.write('%s\n' % '\n'.join(sorted(author_set)))
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	443
c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	444
c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	445 def _helpgen():
598 e432b61c6d74 Use Mercurial-provided infrastructure for `svn' metacommand help. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 595 diff changeset	446 ret = ['subcommands for Subversion integration', '',
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	447 'list of subcommands:', '']
c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	448 for name, func in sorted(table.items()):
504 bc117ea4c95a do not assume that doc-strings are present. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 499 diff changeset	449 if func.__doc__:
bc117ea4c95a do not assume that doc-strings are present. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 499 diff changeset	450 short_description = func.__doc__.splitlines()[0]
bc117ea4c95a do not assume that doc-strings are present. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 499 diff changeset	451 else:
bc117ea4c95a do not assume that doc-strings are present. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 499 diff changeset	452 short_description = ''
598 e432b61c6d74 Use Mercurial-provided infrastructure for `svn' metacommand help. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 595 diff changeset	453 ret.append(" :%s: %s" % (name, short_description))
253 c3d5c4ae9c7c Work with simple command table instead of decorators. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 247 diff changeset	454 return '\n'.join(ret) + '\n'
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	455
599 408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	456 def svn(ui, repo, subcommand, args, *opts):
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	457 '''see detailed help for list of subcommands'''
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	458
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	459 # guess command if prefix
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	460 if subcommand not in table:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	461 candidates = []
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	462 for c in table:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	463 if c.startswith(subcommand):
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	464 candidates.append(c)
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	465 if len(candidates) == 1:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	466 subcommand = candidates[0]
755 9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	467 elif not candidates:
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	468 raise error.CommandError('svn',
9c9565643704 svn metacommand: improved argument checking Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 754 diff changeset	469 "unknown subcommand '%s'" % subcommand)
599 408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	470 else:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	471 raise error.AmbiguousCommand(subcommand, candidates)
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	472
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	473 # override subversion credentials
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	474 for key in ('username', 'password'):
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	475 if key in opts:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	476 ui.setconfig('hgsubversion', key, opts[key])
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	477
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	478 try:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	479 commandfunc = table[subcommand]
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	480 return commandfunc(ui, args=args, repo=repo, **opts)
611 b70f7c82b9b8 svncommands: fix layering violation & tweak error messages. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 603 diff changeset	481 except svnwrap.SubversionConnectionException, e:
b70f7c82b9b8 svncommands: fix layering violation & tweak error messages. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 603 diff changeset	482 raise hgutil.Abort(*e.args)
599 408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	483 except TypeError:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	484 tb = traceback.extract_tb(sys.exc_info()[2])
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	485 if len(tb) == 1:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	486 ui.status('Bad arguments for subcommand %s\n' % subcommand)
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	487 else:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	488 raise
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	489 except KeyError, e:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	490 tb = traceback.extract_tb(sys.exc_info()[2])
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	491 if len(tb) == 1:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	492 ui.status('Unknown subcommand %s\n' % subcommand)
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	493 else:
408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	494 raise
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	495
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	496 table = {
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	497 'genignore': genignore,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	498 'info': info,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	499 'listauthors': listauthors,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	500 'update': update,
595 200770235bf0 svncommands: rename the `help' function to `help_'. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 580 diff changeset	501 'help': help_,
890 78db88de9622 Partial metadata rebuilding David Schleimer <dschleimer@fb.com> parents: 885 diff changeset	502 'updatemeta': updatemeta,
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	503 'rebuildmeta': rebuildmeta,
de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	504 'updateexternals': svnexternals.updateexternals,
897 6bc8046e3d0a move verify to a file of its own Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 893 diff changeset	505 'verify': verify.verify,
578 de384e4e0423 merge commands from utility_commands into svncommands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 573 diff changeset	506 }
599 408869906fbf Move the 'svn' metacommand into the 'svncommands' module. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 598 diff changeset	507 svn.__doc__ = _helpgen()

Mercurial > hgsubversion

annotate hgsubversion/svncommands.py @ 1292:7bbe120be193