Mercurial > public > mercurial-scm > hg

comparison hgext/fetch.py @ 9258:1aeb22492b25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: wrap docstrings at 70 characters
author Martin Geisler <mg@lazybytes.net>
date Sun, 26 Jul 2009 01:46:02 +0200
parents 3f650f6aa130
children 25e572394f5c
comparison
equal deleted inserted replaced
9257:50ebe8845a1b 9258:1aeb22492b25
13 from mercurial.lock import release 13 from mercurial.lock import release
14 14
15 def fetch(ui, repo, source='default', **opts): 15 def fetch(ui, repo, source='default', **opts):
16 '''pull changes from a remote repository, merge new changes if needed. 16 '''pull changes from a remote repository, merge new changes if needed.
17 17
18 This finds all changes from the repository at the specified path or URL 18 This finds all changes from the repository at the specified path
19 and adds them to the local repository. 19 or URL and adds them to the local repository.
20 20
21 If the pulled changes add a new branch head, the head is automatically 21 If the pulled changes add a new branch head, the head is
22 merged, and the result of the merge is committed. Otherwise, the working 22 automatically merged, and the result of the merge is committed.
23 directory is updated to include the new changes. 23 Otherwise, the working directory is updated to include the new
24 changes.
24 25
25 When a merge occurs, the newly pulled changes are assumed to be 26 When a merge occurs, the newly pulled changes are assumed to be
26 "authoritative". The head of the new changes is used as the first parent, 27 "authoritative". The head of the new changes is used as the first
27 with local changes as the second. To switch the merge order, use 28 parent, with local changes as the second. To switch the merge
28 --switch-parent. 29 order, use --switch-parent.
29 30
30 See 'hg help dates' for a list of formats valid for -d/--date. 31 See 'hg help dates' for a list of formats valid for -d/--date.
31 ''' 32 '''
32 33
33 date = opts.get('date') 34 date = opts.get('date')