mercurial-scm/hg-stable: hgext/fetch.py annotate

annotate hgext/fetch.py @ 8188:f3abe032fc89

add cmdutil.remoteui remoteui sorts out the issues of getting ssh config options from the local repo into the remote one while not copying other options like hooks.

author	Matt Mackall <mpm@selenic.com>
date	Sun, 26 Apr 2009 16:50:43 -0500
parents	6ee71f78497c
children	46293a0c7e9f

rev	line source
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	1 # fetch.py - pull and merge remote changes
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2 #
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	3 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	4 #
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
6666 53465a7464e2 convert comments to docstrings in a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6385 diff changeset	7 '''pulling, updating and merging in one command'''
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	8
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from mercurial.i18n import _
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6207 diff changeset	10 from mercurial.node import nullid, short
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7049 diff changeset	11 from mercurial import commands, cmdutil, hg, util, url
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7991 diff changeset	12 from mercurial.lock import release
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	13
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	14 def fetch(ui, repo, source='default', **opts):
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7270 diff changeset	15 '''pull changes from a remote repository, merge new changes if needed.
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	16
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	17 This finds all changes from the repository at the specified path
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	18 or URL and adds them to the local repository.
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	19
7991 675a5a1ab0ee fetch: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	20 If the pulled changes add a new branch head, the head is
675a5a1ab0ee fetch: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	21 automatically merged, and the result of the merge is committed.
675a5a1ab0ee fetch: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	22 Otherwise, the working directory is updated to include the new
675a5a1ab0ee fetch: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	23 changes.
6206 0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	24
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	25 When a merge occurs, the newly pulled changes are assumed to be
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7854 diff changeset	26 "authoritative". The head of the new changes is used as the first
7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7854 diff changeset	27 parent, with local changes as the second. To switch the merge
6206 0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	28 order, use --switch-parent.
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6139 diff changeset	29
1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6139 diff changeset	30 See 'hg help dates' for a list of formats valid for -d/--date.
1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6139 diff changeset	31 '''
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	32
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	33 date = opts.get('date')
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	34 if date:
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	35 opts['date'] = util.parsedate(date)
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	36
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	37 parent, p2 = repo.dirstate.parents()
7049 6489ee64b522 fetch: use dirstate branch instead of first parents Sune Foldager <cryo@cyanite.org> parents: 7007 diff changeset	38 branch = repo.dirstate.branch()
6489ee64b522 fetch: use dirstate branch instead of first parents Sune Foldager <cryo@cyanite.org> parents: 7007 diff changeset	39 branchnode = repo.branchtags().get(branch)
6489ee64b522 fetch: use dirstate branch instead of first parents Sune Foldager <cryo@cyanite.org> parents: 7007 diff changeset	40 if parent != branchnode:
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	41 raise util.Abort(_('working dir not at branch tip '
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	42 '(use "hg update" to check out branch tip)'))
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	43
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	44 if p2 != nullid:
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	45 raise util.Abort(_('outstanding uncommitted merge'))
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	46
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	47 wlock = lock = None
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	48 try:
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	49 wlock = repo.wlock()
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	50 lock = repo.lock()
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	51 mod, add, rem, del_ = repo.status()[:4]
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	52
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	53 if mod or add or rem:
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	54 raise util.Abort(_('outstanding uncommitted changes'))
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	55 if del_:
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	56 raise util.Abort(_('working directory is missing some files'))
7854 423b4482c5cb fetch: do not count inactive branches when inferring a merge Benjamin Pollack <benjamin@bitquabit.com> parents: 7598 diff changeset	57 bheads = repo.branchheads(branch)
423b4482c5cb fetch: do not count inactive branches when inferring a merge Benjamin Pollack <benjamin@bitquabit.com> parents: 7598 diff changeset	58 bheads = [head for head in bheads if len(repo[head].children()) == 0]
423b4482c5cb fetch: do not count inactive branches when inferring a merge Benjamin Pollack <benjamin@bitquabit.com> parents: 7598 diff changeset	59 if len(bheads) > 1:
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	60 raise util.Abort(_('multiple heads in this branch '
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	61 '(use "hg heads ." and "hg merge" to merge)'))
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	62
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8112 diff changeset	63 other = hg.repository(cmdutil.remoteui(repo, opts),
f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8112 diff changeset	64 ui.expandpath(source))
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	65 ui.status(_('pulling from %s\n') %
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7049 diff changeset	66 url.hidepassword(ui.expandpath(source)))
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	67 revs = None
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	68 if opts['rev']:
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	69 if not other.local():
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	70 raise util.Abort(_("fetch -r doesn't work for remote "
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	71 "repositories yet"))
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	72 else:
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	73 revs = [other.lookup(rev) for rev in opts['rev']]
b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	74
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	75 # Are there any changes at all?
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	76 modheads = repo.pull(other, heads=revs)
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	77 if modheads == 0:
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	78 return 0
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	79
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	80 # Is this a simple fast-forward along the current branch?
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	81 newheads = repo.branchheads(branch)
7854 423b4482c5cb fetch: do not count inactive branches when inferring a merge Benjamin Pollack <benjamin@bitquabit.com> parents: 7598 diff changeset	82 newheads = [head for head in newheads if len(repo[head].children()) == 0]
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	83 newchildren = repo.changelog.nodesbetween([parent], newheads)[2]
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	84 if len(newheads) == 1:
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	85 if newchildren[0] != parent:
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	86 return hg.clean(repo, newchildren[0])
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	87 else:
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	88 return
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	89
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	90 # Are there more than one additional branch heads?
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	91 newchildren = [n for n in newchildren if n != parent]
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	92 newparent = parent
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	93 if newchildren:
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	94 newparent = newchildren[0]
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	95 hg.clean(repo, newparent)
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	96 newheads = [n for n in newheads if n != newparent]
6206 0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	97 if len(newheads) > 1:
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	98 ui.status(_('not merging with %d other new branch heads '
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	99 '(use "hg heads ." and "hg merge" to merge them)\n') %
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	100 (len(newheads) - 1))
6206 0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	101 return
7007 a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	102
a6b74fbb5ce0 fetch: added support for named branches Sune Foldager <cryo@cyanite.org> parents: 6941 diff changeset	103 # Otherwise, let's merge.
6206 0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	104 err = False
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	105 if newheads:
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	106 # By default, we consider the repository we're pulling
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	107 # from as authoritative, so we merge our changes into
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	108 # theirs.
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	109 if opts['switch_parent']:
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	110 firstparent, secondparent = newparent, newheads[0]
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	111 else:
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	112 firstparent, secondparent = newheads[0], newparent
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	113 ui.status(_('updating to %d:%s\n') %
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	114 (repo.changelog.rev(firstparent),
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	115 short(firstparent)))
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	116 hg.clean(repo, firstparent)
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	117 ui.status(_('merging with %d:%s\n') %
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	118 (repo.changelog.rev(secondparent), short(secondparent)))
0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	119 err = hg.merge(repo, secondparent, remind=False)
6941 b2bc2d984bac fetch: linearize code by eliminating nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6666 diff changeset	120
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	121 if not err:
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	122 mod, add, rem = repo.status()[:3]
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 3891 diff changeset	123 message = (cmdutil.logmessage(opts) or
5798 86f5d8f608b7 fetch: hide authentication details Bryan O'Sullivan <bos@serpentine.com> parents: 5147 diff changeset	124 (_('Automated merge with %s') %
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7049 diff changeset	125 url.removeauth(other.url())))
6225 595a69a01129 fetch: rename --force-editor option to --edit, for consistency Bryan O'Sullivan <bos@serpentine.com> parents: 6212 diff changeset	126 force_editor = opts.get('force_editor') or opts.get('edit')
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	127 n = repo.commit(mod + add + rem, message,
6385 0d4e068e9e52 commit: when committing the results of a merge, it's all or nothing Bryan O'Sullivan <bos@serpentine.com> parents: 6226 diff changeset	128 opts['user'], opts['date'], force=True,
6225 595a69a01129 fetch: rename --force-editor option to --edit, for consistency Bryan O'Sullivan <bos@serpentine.com> parents: 6212 diff changeset	129 force_editor=force_editor)
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	130 ui.status(_('new changeset %d:%s merges remote changes '
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	131 'with local\n') % (repo.changelog.rev(n),
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	132 short(n)))
6206 0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	133
2825 0496cfb05243 fetch: lock repo across pull and commit Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2824 diff changeset	134 finally:
8112 6ee71f78497c switch lock releasing in the extensions from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7991 diff changeset	135 release(lock, wlock)
2800 135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	136
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	137 cmdtable = {
135823f37304 new extension: fetch -> combine pull and merge/update Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	138 'fetch':
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4549 diff changeset	139 (fetch,
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4917 diff changeset	140 [('r', 'rev', [], _('a specific revision you would like to pull')),
6225 595a69a01129 fetch: rename --force-editor option to --edit, for consistency Bryan O'Sullivan <bos@serpentine.com> parents: 6212 diff changeset	141 ('e', 'edit', None, _('edit commit message')),
595a69a01129 fetch: rename --force-editor option to --edit, for consistency Bryan O'Sullivan <bos@serpentine.com> parents: 6212 diff changeset	142 ('', 'force-editor', None, _('edit commit message (DEPRECATED)')),
6206 0b6f12495276 fetch: switch the default parent used for a merge Bryan O'Sullivan <bos@serpentine.com> parents: 6163 diff changeset	143 ('', 'switch-parent', None, _('switch parents when merging')),
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4917 diff changeset	144 ] + commands.commitopts + commands.commitopts2 + commands.remoteopts,
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4549 diff changeset	145 _('hg fetch [SOURCE]')),
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4549 diff changeset	146 }

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/fetch.py @ 8188:f3abe032fc89