hgsubversion: hgsubversion/wrappers.py annotate

annotate hgsubversion/wrappers.py @ 1236:f367a4462191

push: update to branch tip instead of tip We previously updated to the repository tip after pushing a revision, presumably on the assumption that tip would be the last revision we just pushed. This assumption is flawed for high traffic repositories. In particular, you previsouly would sometimes end up on a completley unrelated commit if someone else commits to a different branch in between the time we push a revision and pull it back from the server. This changes to instead update to the branch tip of the branch we were on at the beginning of the push. This should be either the revision we just pushed or a linear descendent of the revision we just pushed, with a fair degree of reliability.

author	David Schleimer <dschleimer@fb.com>
date	Sat, 30 Aug 2014 09:23:31 -0700
parents	43384d2782dc
children	2179747e7fea

rev	line source
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	1 from hgext import rebase as hgrebase
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	2
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	3 from mercurial import cmdutil
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	4 from mercurial import discovery
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	5 from mercurial import patch
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	6 from mercurial import hg
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	7 from mercurial import util as hgutil
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	8 from mercurial import node
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	9 from mercurial import i18n
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	10 from mercurial import extensions
933 a9f315eae67c push: use native rebase instead of our rebase wrapper David Schleimer <dschleimer@fb.com> parents: 930 diff changeset	11 from mercurial import repair
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	12 from mercurial import revset
3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	13 from mercurial import scmutil
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	14
1004 b2d89ba6b871 layouts: pull out code for detecting layout from subversion David Schleimer <dschleimer@fb.com> parents: 999 diff changeset	15 import layouts
992 110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	16 import os
435 7c576ae19d80 replay: start new replay module that has the relevant functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	17 import replay
438 e8f13bd20467 pushmod: split push functions out into separate module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 435 diff changeset	18 import pushmod
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	19 import stupid as stupidmod
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	20 import svnwrap
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	21 import svnrepo
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	22 import util
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	23
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	24 try:
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	25 from mercurial import obsolete
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	26 except ImportError:
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	27 obsolete = None
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	28
366 25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	29 pullfuns = {
435 7c576ae19d80 replay: start new replay module that has the relevant functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 432 diff changeset	30 True: replay.convert_rev,
366 25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	31 False: stupidmod.convert_rev,
25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	32 }
25ebdc16b05b Simplify pulling revs a bit, unify stupid/replay interfaces. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 356 diff changeset	33
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	34 revmeta = [
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	35 ('revision', 'revnum'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	36 ('user', 'author'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	37 ('date', 'date'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	38 ('message', 'message'),
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	39 ]
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	40
507 4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	41
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	42 def version(orig, ui, args, *opts):
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	43 svn = opts.pop('svn', None)
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	44 orig(ui, args, *opts)
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	45 if svn:
664 5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	46 svnversion, bindings = svnwrap.version()
5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	47 ui.status('\n')
507 4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	48 ui.status('hgsubversion: %s\n' % util.version(ui))
664 5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	49 ui.status('Subversion: %s\n' % svnversion)
5c94a86ddd73 version: mention bindings type in version Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 657 diff changeset	50 ui.status('bindings: %s\n' % bindings)
507 4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	51
4ce09bf4d382 wrappers: wrap version with a --svn flag Augie Fackler <durin42@gmail.com> parents: 499 diff changeset	52
403 37c96b78b8c0 uisetup: use a single loop/abstraction for wrapping all the commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 402 diff changeset	53 def parents(orig, ui, repo, args, *opts):
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	54 """show Mercurial & Subversion parents of the working dir or revision
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	55 """
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	56 if not opts.get('svn', False):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	57 return orig(ui, repo, args, *opts)
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	58 meta = repo.svnmeta()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	59 hashes = meta.revmap.hashes()
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	60 ha = util.parentrev(ui, repo, meta, hashes)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	61 if ha.node() == node.nullid:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	62 raise hgutil.Abort('No parent svn revision!')
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	63 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=False)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	64 displayer.show(ha)
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	65 return 0
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	66
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	67
915 d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	68 def getpeer(ui, opts, source):
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	69 # Since 2.3 (1ac628cd7113)
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	70 peer = getattr(hg, 'peer', None)
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	71 if peer:
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	72 return peer(ui, opts, source)
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	73 return hg.repository(ui, source)
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	74
930 5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	75 def getlocalpeer(ui, opts, source):
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	76 peer = getpeer(ui, opts, source)
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	77 repo = getattr(peer, 'local', lambda: peer)()
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	78 if isinstance(repo, bool):
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	79 repo = peer
5bacb9c63e3e Fix more peer breakage with old hg versions Patrick Mezard <patrick@mezard.eu> parents: 928 diff changeset	80 return repo
915 d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	81
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	82 def getcaps(other):
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	83 return (getattr(other, 'caps', None) or
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	84 getattr(other, 'capabilities', None) or set())
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	85
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	86
771 768639283275 incoming: pass unexpanded source to wrapped function (fixes #178) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 769 diff changeset	87 def incoming(orig, ui, repo, origsource='default', **opts):
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	88 """show incoming revisions from Subversion
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	89 """
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	90
771 768639283275 incoming: pass unexpanded source to wrapped function (fixes #178) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 769 diff changeset	91 source, revs, checkout = util.parseurl(ui.expandpath(origsource))
915 d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	92 other = getpeer(ui, opts, source)
d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	93 if 'subversion' not in getcaps(other):
771 768639283275 incoming: pass unexpanded source to wrapped function (fixes #178) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 769 diff changeset	94 return orig(ui, repo, origsource, **opts)
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	95
751 5e54e333ec3d wrappers: pass on subdir when creating obtaining svnmeta Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 749 diff changeset	96 svn = other.svn
5e54e333ec3d wrappers: pass on subdir when creating obtaining svnmeta Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 749 diff changeset	97 meta = repo.svnmeta(svn.uuid, svn.subdir)
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	98
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	99 ui.status('incoming changes from %s\n' % other.svnurl)
1184 43384d2782dc svnmeta: move revmap.youngest to meta.lastpulled Sean Farley <sean.michael.farley@gmail.com> parents: 1180 diff changeset	100 svnrevisions = list(svn.revisions(start=meta.lastpulled))
984 6315bdd1546e wrappers: Implement --newest-first option in incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 983 diff changeset	101 if opts.get('newest_first'):
6315bdd1546e wrappers: Implement --newest-first option in incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 983 diff changeset	102 svnrevisions.reverse()
985 b303b60be11e wrappers: Return the same value as the original incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 984 diff changeset	103 # Returns 0 if there are incoming changes, 1 otherwise.
b303b60be11e wrappers: Return the same value as the original incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 984 diff changeset	104 if len(svnrevisions) > 0:
b303b60be11e wrappers: Return the same value as the original incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 984 diff changeset	105 ret = 0
b303b60be11e wrappers: Return the same value as the original incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 984 diff changeset	106 else:
b303b60be11e wrappers: Return the same value as the original incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 984 diff changeset	107 ret = 1
984 6315bdd1546e wrappers: Implement --newest-first option in incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 983 diff changeset	108 for r in svnrevisions:
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	109 ui.status('\n')
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	110 for label, attr in revmeta:
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	111 l1 = label + ':'
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	112 val = str(getattr(r, attr)).strip()
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	113 if not ui.verbose:
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	114 val = val.split('\n')[0]
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	115 ui.status('%s%s\n' % (l1.ljust(13), val))
985 b303b60be11e wrappers: Return the same value as the original incoming command Mitsuhiro Koga <shiena.jp@gmail.com> parents: 984 diff changeset	116 return ret
404 28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	117
28e4b47b2179 add a working incoming wrapper command Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 403 diff changeset	118
999 3f45bd7b60cf bundle: add 'portable' parameter to prevent error (issue383) Michael Connor <mconnor@fb.com> parents: 992 diff changeset	119 def findcommonoutgoing(repo, other, onlyheads=None, force=False,
3f45bd7b60cf bundle: add 'portable' parameter to prevent error (issue383) Michael Connor <mconnor@fb.com> parents: 992 diff changeset	120 commoninc=None, portable=False):
805 a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	121 assert other.capable('subversion')
a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	122 # split off #rev; TODO implement --revision/#rev support
a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	123 svn = other.svn
a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	124 meta = repo.svnmeta(svn.uuid, svn.subdir)
a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	125 parent = repo.parents()[0].node()
a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	126 hashes = meta.revmap.hashes()
845 8cf8ff0f52fe outgoing: fix for hg change cd956049fc14 Augie Fackler <durin42@gmail.com> parents: 841 diff changeset	127 common, heads = util.outgoing_common_and_heads(repo, hashes, parent)
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	128 outobj = getattr(discovery, 'outgoing', None)
3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	129 if outobj is not None:
3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	130 # Mercurial 2.1 and later
3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	131 return outobj(repo.changelog, common, heads)
845 8cf8ff0f52fe outgoing: fix for hg change cd956049fc14 Augie Fackler <durin42@gmail.com> parents: 841 diff changeset	132 # Mercurial 2.0 and earlier
8cf8ff0f52fe outgoing: fix for hg change cd956049fc14 Augie Fackler <durin42@gmail.com> parents: 841 diff changeset	133 return common, heads
805 a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	134
a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	135
a3f727c41c1d Fix breakage introduced by discovery refactoring Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 804 diff changeset	136 def findoutgoing(repo, dest=None, heads=None, force=False):
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	137 """show changesets not found in the Subversion repository
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	138 """
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	139 assert dest.capable('subversion')
284 f8f9a2993705 Implement parseurl support (#revision in repository urls) Martijn Pieters <mj@zopatista.com> parents: 283 diff changeset	140 # split off #rev; TODO implement --revision/#rev support
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 821 diff changeset	141 # svnurl, revs, checkout = util.parseurl(dest.svnurl, heads)
751 5e54e333ec3d wrappers: pass on subdir when creating obtaining svnmeta Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 749 diff changeset	142 svn = dest.svn
5e54e333ec3d wrappers: pass on subdir when creating obtaining svnmeta Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 749 diff changeset	143 meta = repo.svnmeta(svn.uuid, svn.subdir)
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	144 parent = repo.parents()[0].node()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	145 hashes = meta.revmap.hashes()
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	146 return util.outgoing_revisions(repo, hashes, parent)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	147
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	148
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	149 def diff(orig, ui, repo, args, *opts):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	150 """show a diff of the most recent revision against its parent from svn
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	151 """
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	152 if not opts.get('svn', False) or opts.get('change', None):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	153 return orig(ui, repo, args, *opts)
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	154 meta = repo.svnmeta()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	155 hashes = meta.revmap.hashes()
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	156 if not opts.get('rev', None):
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	157 parent = repo.parents()[0]
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	158 o_r = util.outgoing_revisions(repo, hashes, parent.node())
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	159 if o_r:
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	160 parent = repo[o_r[-1]].parents()[0]
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	161 opts['rev'] = ['%s:.' % node.hex(parent.node()), ]
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	162 node1, node2 = scmutil.revpair(repo, opts['rev'])
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	163 baserev, _junk = hashes.get(node1, (-1, 'junk'))
e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	164 newrev, _junk = hashes.get(node2, (-1, 'junk'))
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	165 it = patch.diff(repo, node1, node2,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	166 opts=patch.diffopts(ui, opts={'git': True,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	167 'show_function': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	168 'ignore_all_space': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	169 'ignore_space_change': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	170 'ignore_blank_lines': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	171 'unified': True,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	172 'text': False,
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	173 }))
440 80909328aef1 move remaining cmdutils into util Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 438 diff changeset	174 ui.write(util.filterdiff(''.join(it), baserev, newrev))
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	175
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	176 def push(repo, dest, force, revs):
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	177 """push revisions starting at a specified head back to Subversion.
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	178 """
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	179 assert not revs, 'designated revisions for push remains unimplemented.'
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	180 cmdutil.bailifchanged(repo)
783 7913a82a8cdd Check mercurial/third-parties push conditions before pushing Patrick Mezard <pmezard@gmail.com> parents: 779 diff changeset	181 checkpush = getattr(repo, 'checkpush', None)
7913a82a8cdd Check mercurial/third-parties push conditions before pushing Patrick Mezard <pmezard@gmail.com> parents: 779 diff changeset	182 if checkpush:
1175 d6296f901fc7 push: update push logic to match mercurial upstream Durham Goode <durham@fb.com> parents: 1094 diff changeset	183 try:
1173 b04758acf410 wrappers: note which version of hg e10000369b47 is from Augie Fackler <raf@durin42.com> parents: 1172 diff changeset	184 # The checkpush function changed as of e10000369b47 (first
b04758acf410 wrappers: note which version of hg e10000369b47 is from Augie Fackler <raf@durin42.com> parents: 1172 diff changeset	185 # in 3.0) in mercurial
1175 d6296f901fc7 push: update push logic to match mercurial upstream Durham Goode <durham@fb.com> parents: 1094 diff changeset	186 from mercurial.exchange import pushoperation
d6296f901fc7 push: update push logic to match mercurial upstream Durham Goode <durham@fb.com> parents: 1094 diff changeset	187 pushop = pushoperation(repo, dest, force, revs, False)
d6296f901fc7 push: update push logic to match mercurial upstream Durham Goode <durham@fb.com> parents: 1094 diff changeset	188 checkpush(pushop)
d6296f901fc7 push: update push logic to match mercurial upstream Durham Goode <durham@fb.com> parents: 1094 diff changeset	189 except (ImportError, TypeError):
d6296f901fc7 push: update push logic to match mercurial upstream Durham Goode <durham@fb.com> parents: 1094 diff changeset	190 checkpush(force, revs)
d6296f901fc7 push: update push logic to match mercurial upstream Durham Goode <durham@fb.com> parents: 1094 diff changeset	191
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	192 ui = repo.ui
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	193 old_encoding = util.swap_out_encoding()
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	194
1176 97a064e2075d push: fix obsolete feature detection Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1175 diff changeset	195 try:
97a064e2075d push: fix obsolete feature detection Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1175 diff changeset	196 hasobsolete = obsolete._enabled
97a064e2075d push: fix obsolete feature detection Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1175 diff changeset	197 except:
97a064e2075d push: fix obsolete feature detection Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1175 diff changeset	198 hasobsolete = False
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	199
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	200 temporary_commits = []
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	201 try:
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	202 # TODO: implement --rev/#rev support
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	203 # TODO: do credentials specified in the URL still work?
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	204 svn = dest.svn
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	205 meta = repo.svnmeta(svn.uuid, svn.subdir)
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	206
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	207 # Strategy:
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	208 # 1. Find all outgoing commits from this head
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	209 if len(repo.parents()) != 1:
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	210 ui.status('Cowardly refusing to push branch merge\n')
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 620 diff changeset	211 return 0 # results in nonzero exit status, see hg's commands.py
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	212 workingrev = repo.parents()[0]
1236 f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	213 workingbranch = workingrev.branch()
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	214 ui.status('searching for changes\n')
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	215 hashes = meta.revmap.hashes()
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	216 outgoing = util.outgoing_revisions(repo, hashes, workingrev.node())
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	217 if not (outgoing and len(outgoing)):
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	218 ui.status('no changes found\n')
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	219 return 1 # so we get a sane exit status, see hg's commands.push
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	220
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	221 tip_ctx = repo[outgoing[-1]].p1()
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	222 svnbranch = tip_ctx.branch()
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	223 modified_files = {}
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	224 for i in range(len(outgoing) - 1, -1, -1):
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	225 # 2. Pick the oldest changeset that needs to be pushed
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	226 current_ctx = repo[outgoing[i]]
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	227 original_ctx = current_ctx
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	228
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	229 if len(current_ctx.parents()) != 1:
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	230 ui.status('Found a branch merge, this needs discussion and '
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	231 'implementation.\n')
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	232 # results in nonzero exit status, see hg's commands.py
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	233 return 0
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	234
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	235 # 3. Move the changeset to the tip of the branch if necessary
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	236 conflicts = False
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	237 for file in current_ctx.files():
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	238 if file in modified_files:
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	239 conflicts = True
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	240 break
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	241
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	242 if conflicts or current_ctx.branch() != svnbranch:
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	243 util.swap_out_encoding(old_encoding)
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	244 try:
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	245 def extrafn(ctx, extra):
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	246 extra['branch'] = ctx.branch()
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	247
1050 fb0715c9347d decrease verbosity somewhat Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1045 diff changeset	248 ui.note('rebasing %s onto %s \n' % (current_ctx, tip_ctx))
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	249 hgrebase.rebase(ui, repo,
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	250 dest=node.hex(tip_ctx.node()),
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	251 rev=[node.hex(current_ctx.node())],
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	252 extrafn=extrafn, keep=True)
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	253 finally:
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	254 util.swap_out_encoding()
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	255
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	256 # Don't trust the pre-rebase repo and context.
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	257 repo = getlocalpeer(ui, {}, meta.path)
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	258 tip_ctx = repo[tip_ctx.node()]
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	259 for c in tip_ctx.descendants():
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	260 rebasesrc = c.extra().get('rebase_source')
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	261 if rebasesrc and node.bin(rebasesrc) == current_ctx.node():
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	262 current_ctx = c
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	263 temporary_commits.append(c.node())
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	264 break
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	265
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	266 # 4. Push the changeset to subversion
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	267 tip_hash = hashes[tip_ctx.node()][0]
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	268 try:
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	269 ui.status('committing %s\n' % current_ctx)
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	270 pushedrev = pushmod.commit(ui, repo, current_ctx, meta,
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	271 tip_hash, svn)
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	272 except pushmod.NoFilesException:
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	273 ui.warn("Could not push revision %s because it had no changes "
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	274 "in svn.\n" % current_ctx)
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	275 return
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	276
1236 f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	277 # This hook is here purely for testing. It allows us to
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	278 # onsistently trigger hit the race condition between
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	279 # pushing and pulling here. In particular, we use it to
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	280 # trigger another revision landing between the time we
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	281 # push a revision and pull it back.
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	282 repo.hook('debug-hgsubversion-between-push-and-pull-for-tests')
f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	283
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	284 # 5. Pull the latest changesets from subversion, which will
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	285 # include the one we just committed (and possibly others).
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	286 r = repo.pull(dest, force=force)
c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	287 assert not r or r == 0
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	288 meta = repo.svnmeta(svn.uuid, svn.subdir)
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	289 hashes = meta.revmap.hashes()
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	290
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	291 # 6. Move our tip to the latest pulled tip
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	292 for c in tip_ctx.descendants():
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	293 if c.node() in hashes and c.branch() == svnbranch:
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	294 if meta.get_source_rev(ctx=c)[0] == pushedrev.revnum:
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	295 # This is corresponds to the changeset we just pushed
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	296 if hasobsolete:
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	297 ui.note('marking %s as obsoleted by %s\n' %
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	298 (original_ctx.hex(), c.hex()))
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	299 obsolete.createmarkers(repo, [(original_ctx, [c])])
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	300
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	301 tip_ctx = c
933 a9f315eae67c push: use native rebase instead of our rebase wrapper David Schleimer <dschleimer@fb.com> parents: 930 diff changeset	302
991 26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	303 # Remember what files have been modified since the
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	304 # whole push started.
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	305 for file in c.files():
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	306 modified_files[file] = True
26e9fd21f3bf push: avoid rebasing when we know there are no conflicts Durham Goode <durham@fb.com> parents: 990 diff changeset	307
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	308 # 7. Rebase any children of the commit we just pushed
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	309 # that are not in the outgoing set
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	310 for c in original_ctx.children():
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	311 if not c.node() in hashes and not c.node() in outgoing:
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	312 util.swap_out_encoding(old_encoding)
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	313 try:
992 110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	314 # Path changed as subdirectories were getting
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	315 # deleted during push.
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	316 saved_path = os.getcwd()
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	317 os.chdir(repo.root)
110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	318
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	319 def extrafn(ctx, extra):
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	320 extra['branch'] = ctx.branch()
933 a9f315eae67c push: use native rebase instead of our rebase wrapper David Schleimer <dschleimer@fb.com> parents: 930 diff changeset	321
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	322 ui.status('rebasing non-outgoing %s onto %s\n' % (c, tip_ctx))
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	323 needs_rebase_set = "%s::" % node.hex(c.node())
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	324 hgrebase.rebase(ui, repo,
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	325 dest=node.hex(tip_ctx.node()),
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	326 rev=[needs_rebase_set],
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	327 extrafn=extrafn,
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	328 keep=not hasobsolete)
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	329 finally:
992 110794582448 push: avoid failure when push is being called from a newly created subdirectory Kapil Bajaj <kapilbajaj@fb.com> parents: 991 diff changeset	330 os.chdir(saved_path)
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	331 util.swap_out_encoding()
933 a9f315eae67c push: use native rebase instead of our rebase wrapper David Schleimer <dschleimer@fb.com> parents: 930 diff changeset	332
a9f315eae67c push: use native rebase instead of our rebase wrapper David Schleimer <dschleimer@fb.com> parents: 930 diff changeset	333
946 289f2c7752a8 push: reset encoding before the final update Patrick Mezard <patrick@mezard.eu> parents: 933 diff changeset	334 util.swap_out_encoding(old_encoding)
289f2c7752a8 push: reset encoding before the final update Patrick Mezard <patrick@mezard.eu> parents: 933 diff changeset	335 try:
1236 f367a4462191 push: update to branch tip instead of tip David Schleimer <dschleimer@fb.com> parents: 1184 diff changeset	336 hg.update(repo, repo.branchtip(workingbranch))
946 289f2c7752a8 push: reset encoding before the final update Patrick Mezard <patrick@mezard.eu> parents: 933 diff changeset	337 finally:
289f2c7752a8 push: reset encoding before the final update Patrick Mezard <patrick@mezard.eu> parents: 933 diff changeset	338 util.swap_out_encoding()
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	339
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	340 if not hasobsolete:
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	341 # strip the original changesets since the push was
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	342 # successful and changeset obsolescence is unavailable
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	343 util.strip(ui, repo, outgoing, "all")
926 c4001eecfdb1 wrappers: properly reset encoding when leaving push() Patrick Mezard <patrick@mezard.eu> parents: 925 diff changeset	344 finally:
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	345 try:
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	346 # It's always safe to delete the temporary commits.
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	347 # The originals are not deleted unless the push
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	348 # completely succeeded.
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	349 if temporary_commits:
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	350 # If the repo is on a temporary commit, get off before
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	351 # the strip.
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	352 parent = repo[None].p1()
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	353 if parent.node() in temporary_commits:
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	354 hg.update(repo, parent.p1().node())
1055 2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	355 if hasobsolete:
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	356 relations = ((repo[n], ()) for n in temporary_commits)
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	357 obsolete.createmarkers(repo, relations)
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	358 else:
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	359 util.strip(ui, repo, temporary_commits, backup=None)
2d7398fffd0d push: obsolete rather than rebase & strip when enabled Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1050 diff changeset	360
990 def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	361 finally:
def2144c0a8c push: rebase one at a time before push Durham Goode <durham@fb.com> parents: 986 diff changeset	362 util.swap_out_encoding(old_encoding)
626 8e621dbb82d4 push: return reasonable status codes to the end user Augie Fackler <durin42@gmail.com> parents: 620 diff changeset	363 return 1 # so we get a sane exit status, see hg's commands.push
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	364
ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	365
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	366 def pull(repo, source, heads=[], force=False):
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	367 """pull new revisions from Subversion"""
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	368 assert source.capable('subversion')
537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	369 svn_url = source.svnurl
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	370
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	371 # Split off #rev
555 cbd7065e6ab4 util: add parseurl method to abstract away differences between 1.4 and 1.5 Augie Fackler <durin42@gmail.com> parents: 523 diff changeset	372 svn_url, heads, checkout = util.parseurl(svn_url, heads)
257 ffccf0080e54 Move wrappers for hg commands to their own module. Augie Fackler <durin42@gmail.com> parents: diff changeset	373 old_encoding = util.swap_out_encoding()
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	374 total = None
342 76c833526fbc Use fallbacks in the wrappers for Subversion support, instead of prefixes. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 341 diff changeset	375 try:
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	376 have_replay = not repo.ui.configbool('hgsubversion', 'stupid')
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	377 if not have_replay:
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	378 repo.ui.note('fetching stupidly...\n')
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	379
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	380 svn = source.svn
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	381 meta = repo.svnmeta(svn.uuid, svn.subdir)
331 75f082b5897e Switch to using url scheme wrappers instead of duplicating each command we wrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 329 diff changeset	382
974 336f4bce479a consolidate revision parsing Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	383 stopat_rev = util.parse_revnum(svn, checkout)
336f4bce479a consolidate revision parsing Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	384
1005 5bba4d1becde layouts: refactor layout loading based on config into function David Schleimer <dschleimer@fb.com> parents: 1004 diff changeset	385 layout = layouts.detect.layout_from_config(repo.ui, allow_auto=True)
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	386 if layout == 'auto':
1004 b2d89ba6b871 layouts: pull out code for detecting layout from subversion David Schleimer <dschleimer@fb.com> parents: 999 diff changeset	387 layout = layouts.detect.layout_from_subversion(svn,
b2d89ba6b871 layouts: pull out code for detecting layout from subversion David Schleimer <dschleimer@fb.com> parents: 999 diff changeset	388 (stopat_rev or None),
b2d89ba6b871 layouts: pull out code for detecting layout from subversion David Schleimer <dschleimer@fb.com> parents: 999 diff changeset	389 repo.ui)
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	390 repo.ui.note('using %s layout\n' % layout)
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	391
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	392 branch = repo.ui.config('hgsubversion', 'branch')
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	393 if branch:
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	394 if layout != 'single':
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	395 msg = ('branch cannot be specified for Subversion clones using '
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	396 'standard directory layout')
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	397 raise hgutil.Abort(msg)
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	398
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	399 meta.branchmap['default'] = branch
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	400
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	401 ui = repo.ui
1184 43384d2782dc svnmeta: move revmap.youngest to meta.lastpulled Sean Farley <sean.michael.farley@gmail.com> parents: 1180 diff changeset	402 start = meta.lastpulled
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	403 origrevcount = len(meta.revmap)
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	404
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	405 if start <= 0:
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	406 # we are initializing a new repository
974 336f4bce479a consolidate revision parsing Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	407 start = util.parse_revnum(svn, repo.ui.config('hgsubversion',
336f4bce479a consolidate revision parsing Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	408 'startrev', 0))
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	409
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	410 if start > 0:
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	411 if layout == 'standard':
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	412 raise hgutil.Abort('non-zero start revisions are only '
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	413 'supported for single-directory clones.')
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	414 ui.note('starting at revision %d; any prior will be ignored\n'
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	415 % start)
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	416 # fetch all revisions including the one specified...
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	417 start -= 1
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	418
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	419 # anything less than zero makes no sense
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	420 if start < 0:
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	421 start = 0
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	422
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	423 skiprevs = repo.ui.configlist('hgsubversion', 'unsafeskip', '')
974 336f4bce479a consolidate revision parsing Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	424 skiprevs = set(util.parse_revnum(svn, r) for r in skiprevs)
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	425
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	426 oldrevisions = len(meta.revmap)
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	427 if stopat_rev:
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	428 total = stopat_rev - start
651 827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	429 else:
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	430 total = svn.HEAD - start
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	431 lastpulled = None
3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	432
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	433 try:
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	434 # start converting revisions
787 4bbc6bf947f5 replay: fetch full revision at most once per run (issue252) Patrick Mezard <pmezard@gmail.com> parents: 783 diff changeset	435 firstrun = True
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	436 for r in svn.revisions(start=start, stop=stopat_rev):
980 641d0c41d1ea pull: use a single if-statement for the two ways to skip revisions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	437 if (r.revnum in skiprevs or
641d0c41d1ea pull: use a single if-statement for the two ways to skip revisions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	438 (r.author is None and
641d0c41d1ea pull: use a single if-statement for the two ways to skip revisions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 946 diff changeset	439 r.message == 'This is an empty revision for padding.')):
981 82bbb3428684 pull: save the last pulled revision after converting revisions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 980 diff changeset	440 lastpulled = r.revnum
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	441 continue
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	442 tbdelta = meta.update_branch_tag_map_for_rev(r)
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	443 # got a 502? Try more than once!
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	444 tries = 0
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	445 converted = False
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	446 while not converted:
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	447 try:
1045 67e11b650e94 handle invalid UTF-8 in commit messages consistently Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1040 diff changeset	448 msg = util.getmessage(ui, r).strip()
67e11b650e94 handle invalid UTF-8 in commit messages consistently Dan Villiom Podlaski Christiansen <dan@cabo.dk> parents: 1040 diff changeset	449 if msg:
431 612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	450 msg = [s.strip() for s in msg.splitlines() if s][0]
749 ec52205e5ed1 pull: handle change in termwidth() api from hg change c52c629ce19e Augie Fackler <durin42@gmail.com> parents: 748 diff changeset	451 if getattr(ui, 'termwidth', False):
ec52205e5ed1 pull: handle change in termwidth() api from hg change c52c629ce19e Augie Fackler <durin42@gmail.com> parents: 748 diff changeset	452 w = ui.termwidth()
ec52205e5ed1 pull: handle change in termwidth() api from hg change c52c629ce19e Augie Fackler <durin42@gmail.com> parents: 748 diff changeset	453 else:
ec52205e5ed1 pull: handle change in termwidth() api from hg change c52c629ce19e Augie Fackler <durin42@gmail.com> parents: 748 diff changeset	454 w = hgutil.termwidth()
431 612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	455 bits = (r.revnum, r.author, msg)
606 789eec0a339c wrappers: fix pull output if termwidth() is inexact Patrick Mezard <pmezard@gmail.com> parents: 604 diff changeset	456 ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	457 ui.progress('pull', r.revnum - start, total=total)
431 612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	458
444 8c545dcad7b1 wrappers: save tbdelta in one place for both stupid and replay Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 440 diff changeset	459 meta.save_tbdelta(tbdelta)
787 4bbc6bf947f5 replay: fetch full revision at most once per run (issue252) Patrick Mezard <pmezard@gmail.com> parents: 783 diff changeset	460 close = pullfuns[have_replay](ui, meta, svn, r, tbdelta,
4bbc6bf947f5 replay: fetch full revision at most once per run (issue252) Patrick Mezard <pmezard@gmail.com> parents: 783 diff changeset	461 firstrun)
520 5a5b90a6d522 svnmeta: internalize tags delta Patrick Mezard <pmezard@gmail.com> parents: 507 diff changeset	462 meta.committags(r, close)
432 4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	463 for branch, parent in close.iteritems():
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	464 if parent in (None, node.nullid):
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	465 continue
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	466 meta.delbranch(branch, parent, r)
4bf90f8c9b7b consolidate metadata calls from stupid and replay code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 431 diff changeset	467
418 92beeefeaf93 save metadata from one place Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 416 diff changeset	468 meta.save()
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	469 converted = True
787 4bbc6bf947f5 replay: fetch full revision at most once per run (issue252) Patrick Mezard <pmezard@gmail.com> parents: 783 diff changeset	470 firstrun = False
431 612b8d753549 inline describe_revision(), use custom termwidth Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 419 diff changeset	471
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 821 diff changeset	472 except svnwrap.SubversionRepoCanNotReplay, e: # pragma: no cover
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	473 ui.status('%s\n' % e.message)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	474 stupidmod.print_your_svn_is_old_message(ui)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	475 have_replay = False
837 805ef27fbcbe hgsubversion/.py: add space after comment symbol # Yonggang Luo <luoyonggang@gmail.com>* parents: 821 diff changeset	476 except svnwrap.SubversionException, e: # pragma: no cover
601 0fe490ce2fbb isolate all imports of Subversion modules in svnwrap. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 600 diff changeset	477 if (e.args[1] == svnwrap.ERR_RA_DAV_REQUEST_FAILED
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	478 and '502' in str(e)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	479 and tries < 3):
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	480 tries += 1
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	481 ui.status('Got a 502, retrying (%s)\n' % tries)
afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	482 else:
705 385213d2e2da pull: reveal the handled SubversionException to --traceback. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 701 diff changeset	483 ui.traceback()
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	484 raise hgutil.Abort(*e.args)
981 82bbb3428684 pull: save the last pulled revision after converting revisions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 980 diff changeset	485
82bbb3428684 pull: save the last pulled revision after converting revisions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 980 diff changeset	486 lastpulled = r.revnum
82bbb3428684 pull: save the last pulled revision after converting revisions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 980 diff changeset	487
390 afe93f14a361 wrappers: Python 2.4 compat. Augie Fackler <durin42@gmail.com> parents: 367 diff changeset	488 except KeyboardInterrupt:
895 5b9f17e34126 don't suppress KeyboardInterrupt exception tracebacks Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 876 diff changeset	489 ui.traceback()
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	490 finally:
927 3271fa883f34 wrappers: ensure all pull() code path reset the encoding Patrick Mezard <patrick@mezard.eu> parents: 926 diff changeset	491 if total is not None:
1039 3df6ed4e7561 drop support for pre-2.0 versions of Mercurial Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1005 diff changeset	492 ui.progress('pull', None, total=total)
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	493 util.swap_out_encoding(old_encoding)
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	494
821 f28e0f54a6ef svnmeta: store youngest revision pulled from subversion Augie Fackler <durin42@gmail.com> parents: 819 diff changeset	495 if lastpulled is not None:
1184 43384d2782dc svnmeta: move revmap.youngest to meta.lastpulled Sean Farley <sean.michael.farley@gmail.com> parents: 1180 diff changeset	496 meta.lastpulled = lastpulled
523 fa7aab230f1d wrappers: calculate and return exact count of changesets added. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 520 diff changeset	497 revisions = len(meta.revmap) - oldrevisions
fa7aab230f1d wrappers: calculate and return exact count of changesets added. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 520 diff changeset	498
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	499 if revisions == 0:
521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	500 ui.status(i18n._("no changes found\n"))
347 537de0300510 Remove the 'outgoing' wrapper, and use the Mercurial infrastructure instead. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 346 diff changeset	501 return 0
283 521d9c1bb11d Implement -u/--update support when pulling. Martijn Pieters <mj@zopatista.com> parents: 278 diff changeset	502 else:
341 cfbd0e563af9 wrappers: remove unused clone() function. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 337 diff changeset	503 ui.status("pulled %d revisions\n" % revisions)
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	504
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	505 def rebase(orig, ui, repo, **opts):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	506 """rebase current unpushed revisions onto the Subversion head
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	507
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	508 This moves a line of development from making its own head to the top of
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	509 Subversion development, linearizing the changes. In order to make sure you
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	510 rebase on top of the current top of Subversion work, you should probably run
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	511 'hg svn pull' before running this.
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	512
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	513 Also looks for svnextrafn and svnsourcerev in **opts.
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	514 """
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	515 if not opts.get('svn', False):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	516 return orig(ui, repo, **opts)
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	517 def extrafn2(ctx, extra):
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	518 """defined here so we can add things easily.
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	519 """
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	520 extra['branch'] = ctx.branch()
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	521 extrafn = opts.get('svnextrafn', extrafn2)
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	522 sourcerev = opts.get('svnsourcerev', repo.parents()[0].node())
464 0f7095f53ca3 Extend svnrepos with SubversionRepo and SVNMeta Patrick Mezard <pmezard@gmail.com> parents: 463 diff changeset	523 meta = repo.svnmeta()
416 cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	524 hashes = meta.revmap.hashes()
cd6317fe70be invert the svnmeta/editor relationship Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 415 diff changeset	525 o_r = util.outgoing_revisions(repo, hashes, sourcerev=sourcerev)
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	526 if not o_r:
1050 fb0715c9347d decrease verbosity somewhat Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1045 diff changeset	527 ui.note('nothing to rebase\n')
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	528 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	529 if len(repo[sourcerev].children()):
1050 fb0715c9347d decrease verbosity somewhat Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1045 diff changeset	530 ui.status('refusing to rebase non-head commit like a coward\n')
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	531 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	532 parent_rev = repo[o_r[-1]].parents()[0]
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	533 target_rev = parent_rev
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	534 p_n = parent_rev.node()
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	535 exhausted_choices = False
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	536 while target_rev.children() and not exhausted_choices:
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	537 for c in target_rev.children():
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	538 exhausted_choices = True
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	539 n = c.node()
406 e360558ba65f add a function to generate svn_commit_hashes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 405 diff changeset	540 if (n in hashes and hashes[n][1] == hashes[p_n][1]):
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	541 target_rev = c
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	542 exhausted_choices = False
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	543 break
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	544 if parent_rev == target_rev:
1050 fb0715c9347d decrease verbosity somewhat Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 1045 diff changeset	545 ui.status('already up to date!\n')
264 112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	546 return 0
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	547 return orig(ui, repo, dest=node.hex(target_rev.node()),
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	548 base=node.hex(sourcerev),
112d57bb736e rebase: moved to wrappers, now a wrapper around rebase triggered with --svn. Augie Fackler <durin42@gmail.com> parents: 263 diff changeset	549 extrafn=extrafn)
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	550
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	551
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	552 optionmap = {
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	553 'tagpaths': ('hgsubversion', 'tagpaths'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	554 'authors': ('hgsubversion', 'authormap'),
1093 791382a21cc4 layouts: add support for configuring branches directory David Schleimer <dschleimer@fb.com> parents: 1092 diff changeset	555 'branchdir': ('hgsubversion', 'branchdir'),
1094 9a7e3dbd0f6e layouts: add support for an infix between tbt and the hg root David Schleimer <dschleimer@fb.com> parents: 1093 diff changeset	556 'infix': ('hgsubversion', 'infix'),
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	557 'filemap': ('hgsubversion', 'filemap'),
574 8e025a6f0db4 add basic branchmap functionality, to rename branches Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 561 diff changeset	558 'branchmap': ('hgsubversion', 'branchmap'),
729 467b95348e6a implement tag renames Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 713 diff changeset	559 'tagmap': ('hgsubversion', 'tagmap'),
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	560 'stupid': ('hgsubversion', 'stupid'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	561 'defaulthost': ('hgsubversion', 'defaulthost'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	562 'defaultauthors': ('hgsubversion', 'defaultauthors'),
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	563 'usebranchnames': ('hgsubversion', 'usebranchnames'),
499 1fd3cfa47c5e Support for single-directory clones. Augie Fackler <durin42@gmail.com> parents: 466 diff changeset	564 'layout': ('hgsubversion', 'layout'),
651 827547493112 clone: allow specifying a start revision. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 647 diff changeset	565 'startrev': ('hgsubversion', 'startrev'),
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	566 }
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	567
1092 cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	568 extrasections = set(['hgsubversionbranch'])
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	569
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	570
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	571 dontretain = {
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	572 'hgsubversion': set(['authormap', 'filemap', 'layout', ]),
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	573 'hgsubversionbranch': set(),
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	574 }
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	575
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	576 def clone(orig, ui, source, dest=None, **opts):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	577 """
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	578 Some of the options listed below only apply to Subversion
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	579 %(target)s. See 'hg help %(extension)s' for more information on
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	580 them as well as other ways of customising the conversion process.
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	581 """
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	582
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	583 data = {}
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	584 def hgclonewrapper(orig, ui, args, *opts):
1121 7a4d8525737a wrappers: remove pre-1.9 code from hgclonewrapper Sean Farley <sean.michael.farley@gmail.com> parents: 1120 diff changeset	585 origsource = args[1]
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	586
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	587 if isinstance(origsource, str):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	588 source, branch, checkout = util.parseurl(ui.expandpath(origsource),
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	589 opts.get('branch'))
915 d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	590 srcrepo = getpeer(ui, opts, source)
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	591 else:
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	592 srcrepo = origsource
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	593
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	594 if srcrepo.capable('subversion'):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	595 branches = opts.pop('branch', None)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	596 if branches:
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	597 data['branches'] = branches
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	598 ui.setconfig('hgsubversion', 'branch', branches[-1])
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	599
816 86d124a8768e Fix hg.clone() calls changed by d976542986d2 Patrick Mezard <pmezard@gmail.com> parents: 807 diff changeset	600 data['srcrepo'], data['dstrepo'] = orig(ui, args, *opts)
701 3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	601
840 88f3cda47def wrappers: clone must return hg.clone() result (issue300, issue306) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 821 diff changeset	602 return data['srcrepo'], data['dstrepo']
88f3cda47def wrappers: clone must return hg.clone() result (issue300, issue306) Wagner Bruna <wbruna@softwareexpress.com.br> parents: 821 diff changeset	603
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	604 for opt, (section, name) in optionmap.iteritems():
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	605 if opt in opts and opts[opt]:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	606 ui.setconfig(section, name, str(opts.pop(opt)))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	607
713 69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	608 # calling hg.clone directoly to get the repository instances it returns,
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	609 # breaks in subtle ways, so we double-wrap
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	610 orighgclone = extensions.wrapfunction(hg, 'clone', hgclonewrapper)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	611 orig(ui, source, dest, **opts)
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	612 hg.clone = orighgclone
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	613
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	614 # do this again; the ui instance isn't shared between the wrappers
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	615 if data.get('branches'):
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	616 ui.setconfig('hgsubversion', 'branch', data['branches'][-1])
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	617
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	618 dstrepo = data.get('dstrepo')
69c0e7c4faf9 clone: call the wrapped function (fixes #181) Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 705 diff changeset	619 srcrepo = data.get('srcrepo')
1120 8a734c3e9b8d wrappers: remove pre-1.9 code from clone Sean Farley <sean.michael.farley@gmail.com> parents: 1094 diff changeset	620 dst = dstrepo.local()
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	621
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	622 if dstrepo.local() and srcrepo.capable('subversion'):
915 d6c47c33f6a2 fix breakage introduced by peer classes in hg 2.3 Bryan O'Sullivan <bryano@fb.com> parents: 908 diff changeset	623 dst = dstrepo.local()
1120 8a734c3e9b8d wrappers: remove pre-1.9 code from clone Sean Farley <sean.michael.farley@gmail.com> parents: 1094 diff changeset	624 fd = dst.opener("hgrc", "a", text=True)
1092 cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	625 preservesections = set(s for s, v in optionmap.itervalues())
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	626 preservesections \|= extrasections
cd0d14e25757 layouts: add custom layout for those of us that need weird mappings David Schleimer <dschleimer@fb.com> parents: 1055 diff changeset	627 for section in preservesections:
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	628 config = dict(ui.configitems(section))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	629 for name in dontretain[section]:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	630 config.pop(name, None)
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	631
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	632 if config:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	633 fd.write('\n[%s]\n' % section)
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	634 map(fd.write, ('%s = %s\n' % p for p in config.iteritems()))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	635
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	636
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	637 def generic(orig, ui, repo, args, *opts):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	638 """
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	639 Subversion %(target)s can be used for %(command)s. See 'hg help
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	640 %(extension)s' for more on the conversion process.
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	641 """
701 3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	642
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	643 branch = opts.get('branch', None)
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	644 if branch:
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	645 ui.setconfig('hgsubversion', 'branch', branch[-1])
3b8088de027d clone: replace the --singlebranch with overloading for --branch Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 693 diff changeset	646
402 d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	647 for opt, (section, name) in optionmap.iteritems():
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	648 if opt in opts and opts[opt]:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	649 if isinstance(repo, str):
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	650 ui.setconfig(section, name, opts.pop(opt))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	651 else:
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	652 repo.ui.setconfig(section, name, opts.pop(opt))
d453cf1aafa3 uisetup: move clone and push/pull wrappers to wrappers module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 390 diff changeset	653 return orig(ui, repo, args, *opts)

Mercurial > hgsubversion

annotate hgsubversion/wrappers.py @ 1236:f367a4462191