hg/pyhgsh: mercurial/commands.py annotate

annotate mercurial/commands.py @ 1619:1ba0d7041ac4

Distinguish removed and deleted files. Tests are not fixed yet. hg status will now show "R filename" for "hg rm"ed files and "! filename" for files which were deleted manually. Manually deleted files are considered unmodified.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Thu, 12 Jan 2006 13:58:36 +0100
parents	ff339dd21976
children	5e9168401a68

rev	line source
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1 # commands.py - command processing for mercurial
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	2 #
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	4 #
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	5 # This software may be used and distributed according to the terms
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	7
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	8 from demandload import demandload
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	9 from node import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1395 diff changeset	10 from i18n import gettext as _
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	11 demandload(globals(), "os re sys signal shutil imp urllib pdb")
1093 1f1661c58283 commands: use revlog directly for debug commands mpm@selenic.com parents: 1092 diff changeset	12 demandload(globals(), "fancyopts ui hg util lock revlog")
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	13 demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	14 demandload(globals(), "errno socket version struct atexit sets bz2")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	15
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	16 class UnknownCommand(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	17 """Exception raised if command is not in the command table."""
1518 ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	18 class AmbiguousCommand(Exception):
ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	19 """Exception raised if command shortcut matches more than one command."""
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	20
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	21 def filterfiles(filters, files):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	22 l = [x for x in files if x in filters]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	23
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	24 for t in filters:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	25 if t and t[-1] != "/":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	26 t += "/"
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	27 l += [x for x in files if x.startswith(t)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	28 return l
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	29
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	30 def relpath(repo, args):
628 8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	31 cwd = repo.getcwd()
8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	32 if cwd:
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	33 return [util.normpath(os.path.join(cwd, x)) for x in args]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	34 return args
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	35
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	36 def matchpats(repo, pats=[], opts={}, head=''):
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	37 cwd = repo.getcwd()
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	38 if not pats and cwd:
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	39 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	40 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	41 cwd = ''
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1405 diff changeset	42 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	43 opts.get('exclude'), head) + (cwd,)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	44
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	45 def makewalk(repo, pats, opts, node=None, head=''):
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	46 files, matchfn, anypats, cwd = matchpats(repo, pats, opts, head)
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	47 exact = dict(zip(files, files))
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	48 def walk():
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	49 for src, fn in repo.walk(node=node, files=files, match=matchfn):
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	50 yield src, fn, util.pathto(cwd, fn), fn in exact
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	51 return files, matchfn, walk()
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	52
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	53 def walk(repo, pats, opts, node=None, head=''):
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	54 files, matchfn, results = makewalk(repo, pats, opts, node, head)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	55 for r in results:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	56 yield r
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	57
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	58 def walkchangerevs(ui, repo, pats, opts):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	59 '''Iterate over files and the revs they changed in.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	60
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	61 Callers most commonly need to iterate backwards over the history
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	62 it is interested in. Doing so has awful (quadratic-looking)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	63 performance, so we use iterators in a "windowed" way.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	64
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	65 We walk a window of revisions in the desired order. Within the
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	66 window, we first walk forwards to gather data, then in the desired
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	67 order (usually backwards) to display it.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	68
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	69 This function returns an (iterator, getchange, matchfn) tuple. The
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	70 getchange function returns the changelog entry for a numeric
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	71 revision. The iterator yields 3-tuples. They will be of one of
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	72 the following forms:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	73
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	74 "window", incrementing, lastrev: stepping through a window,
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	75 positive if walking forwards through revs, last rev in the
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	76 sequence iterated over - use to reset state for the current window
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	77
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	78 "add", rev, fns: out-of-order traversal of the given file names
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	79 fns, which changed during revision rev - use to gather data for
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	80 possible display
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	81
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	82 "iter", rev, None: in-order traversal of the revs earlier iterated
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	83 over with "add" - use to display data'''
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	84
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	85 files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	86
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	87 if repo.changelog.count() == 0:
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	88 return [], False, matchfn
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	89
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	90 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	91 wanted = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	92 slowpath = anypats
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	93 window = 300
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	94 fncache = {}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	95
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	96 chcache = {}
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	97 def getchange(rev):
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	98 ch = chcache.get(rev)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	99 if ch is None:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	100 chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	101 return ch
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	102
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	103 if not slowpath and not files:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	104 # No files, no patterns. Display all revs.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	105 wanted = dict(zip(revs, revs))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	106 if not slowpath:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	107 # Only files, no patterns. Check the history of each file.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	108 def filerevgen(filelog):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	109 for i in xrange(filelog.count() - 1, -1, -window):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	110 revs = []
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	111 for j in xrange(max(0, i - window), i + 1):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	112 revs.append(filelog.linkrev(filelog.node(j)))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	113 revs.reverse()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	114 for rev in revs:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	115 yield rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	116
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	117 minrev, maxrev = min(revs), max(revs)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	118 for file in files:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	119 filelog = repo.file(file)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	120 # A zero count may be a directory or deleted file, so
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	121 # try to find matching entries on the slow path.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	122 if filelog.count() == 0:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	123 slowpath = True
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	124 break
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	125 for rev in filerevgen(filelog):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	126 if rev <= maxrev:
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	127 if rev < minrev:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	128 break
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	129 fncache.setdefault(rev, [])
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	130 fncache[rev].append(file)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	131 wanted[rev] = 1
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	132 if slowpath:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	133 # The slow path checks files modified in every changeset.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	134 def changerevgen():
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	135 for i in xrange(repo.changelog.count() - 1, -1, -window):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	136 for j in xrange(max(0, i - window), i + 1):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	137 yield j, getchange(j)[3]
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	138
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	139 for rev, changefiles in changerevgen():
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	140 matches = filter(matchfn, changefiles)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	141 if matches:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	142 fncache[rev] = matches
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	143 wanted[rev] = 1
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	144
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	145 def iterate():
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	146 for i in xrange(0, len(revs), window):
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	147 yield 'window', revs[0] < revs[-1], revs[-1]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	148 nrevs = [rev for rev in revs[i:min(i+window, len(revs))]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	149 if rev in wanted]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	150 srevs = list(nrevs)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	151 srevs.sort()
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	152 for rev in srevs:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	153 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	154 yield 'add', rev, fns
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	155 for rev in nrevs:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	156 yield 'iter', rev, None
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	157 return iterate(), getchange, matchfn
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	158
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	159 revrangesep = ':'
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	160
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	161 def revrange(ui, repo, revs, revlog=None):
1066 ea878688221e Shortened commands.revrange() a little bit, added docstring. Thomas Arendsen Hein <thomas@intevation.de> parents: 1065 diff changeset	162 """Yield revision as strings from a list of revision specifications."""
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	163 if revlog is None:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	164 revlog = repo.changelog
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	165 revcount = revlog.count()
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	166 def fix(val, defval):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	167 if not val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	168 return defval
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	169 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	170 num = int(val)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	171 if str(num) != val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	172 raise ValueError
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	173 if num < 0:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	174 num += revcount
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	175 if num < 0:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	176 num = 0
1257 fe7fbfdb066d Clamp negative rev numbers at zero. Bryan O'Sullivan <bos@serpentine.com> parents: 1255 diff changeset	177 elif num >= revcount:
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	178 raise ValueError
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	179 except ValueError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	180 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	181 num = repo.changelog.rev(repo.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	182 except KeyError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	183 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	184 num = revlog.rev(revlog.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	185 except KeyError:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	186 raise util.Abort(_('invalid revision identifier %s'), val)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	187 return num
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	188 seen = {}
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	189 for spec in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	190 if spec.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	191 start, end = spec.split(revrangesep, 1)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	192 start = fix(start, 0)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	193 end = fix(end, revcount - 1)
1066 ea878688221e Shortened commands.revrange() a little bit, added docstring. Thomas Arendsen Hein <thomas@intevation.de> parents: 1065 diff changeset	194 step = start > end and -1 or 1
ea878688221e Shortened commands.revrange() a little bit, added docstring. Thomas Arendsen Hein <thomas@intevation.de> parents: 1065 diff changeset	195 for rev in xrange(start, end+step, step):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	196 if rev in seen:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	197 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	198 seen[rev] = 1
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	199 yield str(rev)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	200 else:
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	201 rev = fix(spec, None)
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	202 if rev in seen:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	203 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	204 seen[rev] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	205 yield str(rev)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	206
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	207 def make_filename(repo, r, pat, node=None,
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	208 total=None, seqno=None, revwidth=None, pathname=None):
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	209 node_expander = {
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	210 'H': lambda: hex(node),
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	211 'R': lambda: str(r.rev(node)),
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	212 'h': lambda: short(node),
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	213 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	214 expander = {
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	215 '%': lambda: '%',
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	216 'b': lambda: os.path.basename(repo.root),
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	217 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	218
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	219 try:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	220 if node:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	221 expander.update(node_expander)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	222 if node and revwidth is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	223 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	224 if total is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	225 expander['N'] = lambda: str(total)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	226 if seqno is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	227 expander['n'] = lambda: str(seqno)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	228 if total is not None and seqno is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	229 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	230 if pathname is not None:
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	231 expander['s'] = lambda: os.path.basename(pathname)
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	232 expander['d'] = lambda: os.path.dirname(pathname) or '.'
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	233 expander['p'] = lambda: pathname
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	234
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	235 newname = []
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	236 patlen = len(pat)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	237 i = 0
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	238 while i < patlen:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	239 c = pat[i]
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	240 if c == '%':
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	241 i += 1
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	242 c = pat[i]
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	243 c = expander[c]()
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	244 newname.append(c)
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	245 i += 1
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	246 return ''.join(newname)
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	247 except KeyError, inst:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	248 raise util.Abort(_("invalid format spec '%%%s' in output file name"),
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	249 inst.args[0])
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	250
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	251 def make_file(repo, r, pat, node=None,
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	252 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	253 if not pat or pat == '-':
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	254 return 'w' in mode and sys.stdout or sys.stdin
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	255 if hasattr(pat, 'write') and 'w' in mode:
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	256 return pat
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	257 if hasattr(pat, 'read') and 'r' in mode:
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	258 return pat
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	259 return open(make_filename(repo, r, pat, node, total, seqno, revwidth,
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	260 pathname),
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	261 mode)
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	262
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	263 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	264 changes=None, text=False):
904 969647d5100a Add optional parameter for changed/added/del/unknown files to commands.dodiff mason@suse.com parents: 899 diff changeset	265 if not changes:
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	266 changes = repo.changes(node1, node2, files, match=match)
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	267 modified, added, removed, deleted, unknown = changes
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	268 if files:
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	269 modified, added, removed = map(lambda x: filterfiles(x, files),
ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	270 (modified, added, removed))
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	271
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	272 if not modified and not added and not removed:
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	273 return
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	274
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	275 if node2:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	276 change = repo.changelog.read(node2)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	277 mmap2 = repo.manifest.read(change[0])
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	278 date2 = util.datestr(change[2])
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	279 def read(f):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	280 return repo.file(f).read(mmap2[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	281 else:
1320 5f277e73778f Fix up representation of dates in hgweb. Bryan O'Sullivan <bos@serpentine.com> parents: 1319 diff changeset	282 date2 = util.datestr()
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	283 if not node1:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	284 node1 = repo.dirstate.parents()[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	285 def read(f):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	286 return repo.wfile(f).read()
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	287
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	288 if ui.quiet:
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	289 r = None
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	290 else:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	291 hexfunc = ui.verbose and hex or short
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	292 r = [hexfunc(node) for node in [node1, node2] if node]
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	293
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	294 change = repo.changelog.read(node1)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	295 mmap = repo.manifest.read(change[0])
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	296 date1 = util.datestr(change[2])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	297
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	298 for f in modified:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	299 to = None
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	300 if f in mmap:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	301 to = repo.file(f).read(mmap[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	302 tn = read(f)
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	303 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	304 for f in added:
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	305 to = None
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	306 tn = read(f)
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	307 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	308 for f in removed:
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	309 to = repo.file(f).read(mmap[f])
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	310 tn = None
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	311 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	312
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	313 def trimuser(ui, name, rev, revcache):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	314 """trim the name of the user who committed a change"""
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	315 user = revcache.get(rev)
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	316 if user is None:
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	317 user = revcache[rev] = ui.shortuser(name)
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	318 return user
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	319
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	320 def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	321 """show a single changeset or file revision"""
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	322 log = repo.changelog
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	323 if changenode is None:
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	324 changenode = log.node(rev)
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	325 elif not rev:
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	326 rev = log.rev(changenode)
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	327
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	328 if ui.quiet:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	329 ui.write("%d:%s\n" % (rev, short(changenode)))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	330 return
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	331
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	332 changes = log.read(changenode)
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	333 date = util.datestr(changes[2])
967 1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 966 diff changeset	334
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	335 parents = [(log.rev(p), ui.verbose and hex(p) or short(p))
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	336 for p in log.parents(changenode)
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	337 if ui.debugflag or p != nullid]
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	338 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	339 parents = []
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	340
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	341 if ui.verbose:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	342 ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	343 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	344 ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	345
687 44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	346 for tag in repo.nodetags(changenode):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	347 ui.status(_("tag: %s\n") % tag)
687 44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	348 for parent in parents:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	349 ui.write(_("parent: %d:%s\n") % parent)
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	350
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	351 if brinfo and changenode in brinfo:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	352 br = brinfo[changenode]
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	353 ui.write(_("branch: %s\n") % " ".join(br))
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	354
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	355 ui.debug(_("manifest: %d:%s\n") % (repo.manifest.rev(changes[0]),
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	356 hex(changes[0])))
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	357 ui.status(_("user: %s\n") % changes[1])
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	358 ui.status(_("date: %s\n") % date)
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	359
493 30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	360 if ui.debugflag:
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	361 files = repo.changes(log.parents(changenode)[0], changenode)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	362 for key, value in zip([_("files:"), _("files+:"), _("files-:")], files):
490 df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	363 if value:
df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	364 ui.note("%-12s %s\n" % (key, " ".join(value)))
493 30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	365 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	366 ui.note(_("files: %s\n") % " ".join(changes[3]))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	367
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	368 description = changes[4].strip()
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	369 if description:
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	370 if ui.verbose:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	371 ui.status(_("description:\n"))
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	372 ui.status(description)
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 542 diff changeset	373 ui.status("\n\n")
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	374 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	375 ui.status(_("summary: %s\n") % description.splitlines()[0])
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	376 ui.status("\n")
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	377
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	378 def show_version(ui):
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	379 """output version and copyright information"""
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	380 ui.write(_("Mercurial Distributed SCM (version %s)\n")
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	381 % version.get_version())
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	382 ui.status(_(
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	383 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	384 "This is free software; see the source for copying conditions. "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	385 "There is NO\nwarranty; "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	386 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	387 ))
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	388
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	389 def help_(ui, cmd=None, with_version=False):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	390 """show help for a given command or all commands"""
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	391 option_lists = []
846 a30f7ee30914 When hg is invoked without parameters, the short list help is displayed. kreijack@inwind.REMOVEME.it parents: 845 diff changeset	392 if cmd and cmd != 'shortlist':
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	393 if with_version:
160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	394 show_version(ui)
160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	395 ui.write('\n')
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	396 aliases, i = find(cmd)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	397 # synopsis
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	398 ui.write("%s\n\n" % i[2])
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	399
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	400 # description
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	401 doc = i[0].__doc__
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	402 if ui.quiet:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	403 doc = doc.splitlines(0)[0]
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	404 ui.write("%s\n" % doc.rstrip())
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	405
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	406 if not ui.quiet:
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	407 # aliases
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	408 if len(aliases) > 1:
b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	409 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	410
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	411 # options
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	412 if i[1]:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	413 option_lists.append(("options", i[1]))
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	414
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	415 else:
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	416 # program name
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	417 if ui.verbose or with_version:
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	418 show_version(ui)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	419 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	420 ui.status(_("Mercurial Distributed SCM\n"))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	421 ui.status('\n')
843 859e7ea530bd 'hg help -v' shows global options kreijack@inwind.REMOVEME.it parents: 842 diff changeset	422
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	423 # list of commands
846 a30f7ee30914 When hg is invoked without parameters, the short list help is displayed. kreijack@inwind.REMOVEME.it parents: 845 diff changeset	424 if cmd == "shortlist":
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	425 ui.status(_('basic commands (use "hg help" '
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	426 'for the full list or option "-v" for details):\n\n'))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	427 elif ui.verbose:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	428 ui.status(_('list of commands:\n\n'))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	429 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	430 ui.status(_('list of commands (use "hg help -v" '
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	431 'to show aliases and global options):\n\n'))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	432
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	433 h = {}
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	434 cmds = {}
479 7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	435 for c, e in table.items():
7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	436 f = c.split("\|")[0]
846 a30f7ee30914 When hg is invoked without parameters, the short list help is displayed. kreijack@inwind.REMOVEME.it parents: 845 diff changeset	437 if cmd == "shortlist" and not f.startswith("^"):
479 7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	438 continue
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	439 f = f.lstrip("^")
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	440 if not ui.debugflag and f.startswith("debug"):
ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	441 continue
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	442 d = ""
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	443 if e[0].__doc__:
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	444 d = e[0].__doc__.splitlines(0)[0].rstrip()
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	445 h[f] = d
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	446 cmds[f] = c.lstrip("^")
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	447
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	448 fns = h.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	449 fns.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	450 m = max(map(len, fns))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	451 for f in fns:
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	452 if ui.verbose:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	453 commands = cmds[f].replace("\|",", ")
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	454 ui.write(" %s:\n %s\n"%(commands, h[f]))
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	455 else:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	456 ui.write(' %-*s %s\n' % (m, f, h[f]))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	457
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	458 # global options
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	459 if ui.verbose:
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	460 option_lists.append(("global options", globalopts))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	461
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	462 # list all option lists
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	463 opt_output = []
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	464 for title, options in option_lists:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	465 opt_output.append(("\n%s:\n" % title, None))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	466 for shortopt, longopt, default, desc in options:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	467 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	468 longopt and " --%s" % longopt),
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	469 "%s%s" % (desc,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	470 default
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	471 and _(" (default: %s)") % default
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	472 or "")))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	473
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	474 if opt_output:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	475 opts_len = max([len(line[0]) for line in opt_output if line[1]])
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	476 for first, second in opt_output:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	477 if second:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	478 ui.write(" %-*s %s\n" % (opts_len, first, second))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	479 else:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	480 ui.write("%s\n" % first)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	481
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	482 # Commands start here, listed alphabetically
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	483
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	484 def add(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	485 """add the specified files on the next commit
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	486
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	487 Schedule files to be version controlled and added to the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	488
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	489 The files will be added to the repository at the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	490
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	491 If no names are given, add all files in the repository.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	492 """
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	493
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	494 names = []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	495 for src, abs, rel, exact in walk(repo, pats, opts):
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	496 if exact:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	497 if ui.verbose:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	498 ui.status(_('adding %s\n') % rel)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	499 names.append(abs)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	500 elif repo.dirstate.state(abs) == '?':
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	501 ui.status(_('adding %s\n') % rel)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	502 names.append(abs)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	503 repo.add(names)
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	504
766 b444a7e053f1 Get addremove to use new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 764 diff changeset	505 def addremove(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	506 """add all new files, delete all missing files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	507
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	508 Add all new files and remove all missing files from the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	509
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	510 New files are ignored if they match any of the patterns in .hgignore. As
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	511 with add, these changes take effect at the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	512 """
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	513 add, remove = [], []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	514 for src, abs, rel, exact in walk(repo, pats, opts):
880 409a9a7b0da2 addremove was not correctly finding removed files when given mason@suse.com parents: 879 diff changeset	515 if src == 'f' and repo.dirstate.state(abs) == '?':
409a9a7b0da2 addremove was not correctly finding removed files when given mason@suse.com parents: 879 diff changeset	516 add.append(abs)
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	517 if ui.verbose or not exact:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	518 ui.status(_('adding %s\n') % rel)
880 409a9a7b0da2 addremove was not correctly finding removed files when given mason@suse.com parents: 879 diff changeset	519 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	520 remove.append(abs)
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	521 if ui.verbose or not exact:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	522 ui.status(_('removing %s\n') % rel)
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	523 repo.add(add)
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	524 repo.remove(remove)
219 8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes mpm@selenic.com parents: 214 diff changeset	525
733 1966c553f652 Convert annotate over to walk interface. Bryan O'Sullivan <bos@serpentine.com> parents: 732 diff changeset	526 def annotate(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	527 """show changeset information per file line
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	528
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	529 List changes in files, showing the revision id responsible for each line
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	530
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	531 This command is useful to discover who did a change or when a change took
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	532 place.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	533
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	534 Without the -a option, annotate will avoid processing files it
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	535 detects as binary. With -a, annotate will generate an annotation
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	536 anyway, probably with undesirable results.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	537 """
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	538 def getnode(rev):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	539 return short(repo.changelog.node(rev))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	540
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	541 ucache = {}
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	542 def getname(rev):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	543 cl = repo.changelog.read(repo.changelog.node(rev))
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	544 return trimuser(ui, cl[1], rev, ucache)
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	545
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	546 dcache = {}
d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	547 def getdate(rev):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	548 datestr = dcache.get(rev)
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	549 if datestr is None:
d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	550 cl = repo.changelog.read(repo.changelog.node(rev))
d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	551 datestr = dcache[rev] = util.datestr(cl[2])
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	552 return datestr
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	553
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	554 if not pats:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	555 raise util.Abort(_('at least one file name or pattern required'))
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	556
1523 fdda77dcf601 Fix line wrapping Matt Mackall <mpm@selenic.com> parents: 1522 diff changeset	557 opmap = [['user', getname], ['number', str], ['changeset', getnode],
fdda77dcf601 Fix line wrapping Matt Mackall <mpm@selenic.com> parents: 1522 diff changeset	558 ['date', getdate]]
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	559 if not opts['user'] and not opts['changeset'] and not opts['date']:
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	560 opts['number'] = 1
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	561
715 938dd667ca21 Make annotate use option --rev instead od --revision like other commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 714 diff changeset	562 if opts['rev']:
938dd667ca21 Make annotate use option --rev instead od --revision like other commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 714 diff changeset	563 node = repo.changelog.lookup(opts['rev'])
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	564 else:
29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	565 node = repo.dirstate.parents()[0]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	566 change = repo.changelog.read(node)
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	567 mmap = repo.manifest.read(change[0])
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	568
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	569 for src, abs, rel, exact in walk(repo, pats, opts):
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	570 if abs not in mmap:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	571 ui.warn(_("warning: %s is not in the repository!\n") % rel)
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	572 continue
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	573
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	574 f = repo.file(abs)
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	575 if not opts['text'] and util.binary(f.read(mmap[abs])):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	576 ui.write(_("%s: binary file\n") % rel)
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	577 continue
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	578
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	579 lines = f.annotate(mmap[abs])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	580 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	581
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	582 for o, f in opmap:
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	583 if opts[o]:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	584 l = [f(n) for n, dummy in lines]
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	585 if l:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	586 m = max(map(len, l))
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	587 pieces.append(["%*s" % (m, x) for x in l])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	588
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	589 if pieces:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	590 for p, l in zip(zip(*pieces), lines):
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	591 ui.write("%s: %s" % (" ".join(p), l[1]))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	592
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	593 def bundle(ui, repo, fname, dest="default-push", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	594 """create a changegroup file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	595
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	596 Generate a compressed changegroup file collecting all changesets
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	597 not found in the other repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	598
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	599 This file can then be transferred using conventional means and
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	600 applied to another repository with the unbundle command. This is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	601 useful when native push and pull are not available or when
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	602 exporting an entire repository is undesirable. The standard file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	603 extension is ".hg".
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	604
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	605 Unlike import/export, this exactly preserves all changeset
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	606 contents including permissions, rename data, and revision history.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	607 """
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	608 f = open(fname, "wb")
1440 bf109779f48b Fix relative pull in a subdir tonfa@arakou.lan parents: 1439 diff changeset	609 dest = ui.expandpath(dest, repo.root)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	610 other = hg.repository(ui, dest)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	611 o = repo.findoutgoing(other)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	612 cg = repo.changegroup(o)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	613
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	614 try:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	615 f.write("HG10")
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	616 z = bz2.BZ2Compressor(9)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	617 while 1:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	618 chunk = cg.read(4096)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	619 if not chunk:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	620 break
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	621 f.write(z.compress(chunk))
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	622 f.write(z.flush())
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	623 except:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	624 os.unlink(fname)
1366 136920d13fc2 Fixed an exception that was caught and improperly forgotten. Eric Hopper <hopper@omnifarious.org> parents: 1354 diff changeset	625 raise
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	626
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	627 def cat(ui, repo, file1, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	628 """output the latest or given revisions of files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	629
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	630 Print the specified files as they were at the given revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	631 If no revision is given then the tip is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	632
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	633 Output may be to a file, in which case the name of the file is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	634 given using a format string. The formatting rules are the same as
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	635 for the export command, with the following additions:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	636
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	637 %s basename of file being printed
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	638 %d dirname of file being printed, or '.' if in repo root
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	639 %p root-relative path name of file being printed
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	640 """
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	641 mf = {}
1545 d69070c2547a fix errors found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1543 diff changeset	642 rev = opts['rev']
d69070c2547a fix errors found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1543 diff changeset	643 if rev:
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	644 node = repo.lookup(rev)
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	645 else:
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	646 node = repo.changelog.tip()
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	647 change = repo.changelog.read(node)
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	648 mf = repo.manifest.read(change[0])
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	649 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, node):
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	650 r = repo.file(abs)
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	651 n = mf[abs]
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	652 fp = make_file(repo, r, opts['output'], node=n, pathname=abs)
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	653 fp.write(r.read(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	654
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	655 def clone(ui, source, dest=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	656 """make a copy of an existing repository
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	657
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	658 Create a copy of an existing repository in a new directory.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	659
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	660 If no destination directory name is specified, it defaults to the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	661 basename of the source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	662
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	663 The location of the source is added to the new repository's
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	664 .hg/hgrc file, as the default to be used for future pulls.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	665
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	666 For efficiency, hardlinks are used for cloning whenever the source
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	667 and destination are on the same filesystem. Some filesystems,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	668 such as AFS, implement hardlinking incorrectly, but do not report
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	669 errors. In these cases, use the --pull option to avoid
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	670 hardlinking.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	671 """
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	672 if dest is None:
528 648386fabf9c Fix clone bug wth trailing slash mpm@selenic.com parents: 527 diff changeset	673 dest = os.path.basename(os.path.normpath(source))
532 2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	674
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	675 if os.path.exists(dest):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	676 raise util.Abort(_("destination '%s' already exists"), dest)
523 003df62ae39f [PATCH] Force "hg clone" to always create a new directory mpm@selenic.com parents: 522 diff changeset	677
891 a9b843b114f9 Fix clone when target directory is relative. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	678 dest = os.path.realpath(dest)
a9b843b114f9 Fix clone when target directory is relative. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	679
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	680 class Dircleanup(object):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	681 def __init__(self, dir_):
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	682 self.rmtree = shutil.rmtree
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	683 self.dir_ = dir_
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	684 os.mkdir(dir_)
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	685 def close(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	686 self.dir_ = None
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	687 def __del__(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	688 if self.dir_:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	689 self.rmtree(self.dir_, True)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	690
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	691 if opts['ssh']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	692 ui.setconfig("ui", "ssh", opts['ssh'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	693 if opts['remotecmd']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	694 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	695
1221 89f899caecb5 clone: directory names take precedence over symbolic names TK Soh <teekaysoh@yahoo.com> parents: 1220 diff changeset	696 if not os.path.exists(source):
89f899caecb5 clone: directory names take precedence over symbolic names TK Soh <teekaysoh@yahoo.com> parents: 1220 diff changeset	697 source = ui.expandpath(source)
1314 d37a46859acd Fix default clone destination mpm@selenic.com parents: 1313 diff changeset	698
d37a46859acd Fix default clone destination mpm@selenic.com parents: 1313 diff changeset	699 d = Dircleanup(dest)
562 be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc mpm@selenic.com parents: 561 diff changeset	700 abspath = source
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 632 diff changeset	701 other = hg.repository(ui, source)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	702
1244 937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	703 copy = False
1315 32f6cae83db7 Fix setting of hg default when using --pull on clone of local repository. Lee Cantey <lcantey@gmail.com> parents: 1314 diff changeset	704 if other.dev() != -1:
675 49de76abc4da hg clone stored path fix Mikael Berthe <mikael@lilotux.net> parents: 674 diff changeset	705 abspath = os.path.abspath(source)
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	706 if not opts['pull'] and not opts['rev']:
1315 32f6cae83db7 Fix setting of hg default when using --pull on clone of local repository. Lee Cantey <lcantey@gmail.com> parents: 1314 diff changeset	707 copy = True
1331 cfae1ed2d61f Write hgrc file in text mode, even on Windows. Bryan O'Sullivan <bos@serpentine.com> parents: 1325 diff changeset	708
1244 937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	709 if copy:
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	710 try:
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	711 # we use a lock here because if we race with commit, we
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	712 # can end up with extra data in the cloned revlogs that's
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	713 # not pointed to by changesets, thus causing verify to
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	714 # fail
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	715 l1 = lock.lock(os.path.join(source, ".hg", "lock"))
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	716 except OSError:
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	717 copy = False
917 7f3f55903496 Fix hg clone race with writer mpm@selenic.com parents: 915 diff changeset	718
1244 937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	719 if copy:
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	720 # we lock here to avoid premature writing to the target
1208 4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	721 os.mkdir(os.path.join(dest, ".hg"))
1209 920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	722 l2 = lock.lock(os.path.join(dest, ".hg", "lock"))
1114 58371c4c2c8f Remove the lock file copied during clone (was the source lock file) Stephen Darnell parents: 1113 diff changeset	723
1208 4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	724 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	725 for f in files.split():
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	726 src = os.path.join(source, ".hg", f)
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	727 dst = os.path.join(dest, ".hg", f)
1444 f84ed9c6131d fix for cloning empty repo (.hg is still empty) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1443 diff changeset	728 try:
f84ed9c6131d fix for cloning empty repo (.hg is still empty) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1443 diff changeset	729 util.copyfiles(src, dst)
f84ed9c6131d fix for cloning empty repo (.hg is still empty) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1443 diff changeset	730 except OSError, inst:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	731 if inst.errno != errno.ENOENT:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	732 raise
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	733
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	734 repo = hg.repository(ui, dest)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	735
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	736 else:
1467 06d5d8794e5f Stupid spelling mistake in a variable name. Eric Hopper <hopper@omnifarious.org> parents: 1465 diff changeset	737 revs = None
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	738 if opts['rev']:
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	739 if not other.local():
1607 d72d27ee72b9 add '_' to several strings Muli Ben-Yehuda <mulix@mulix.org> parents: 1602 diff changeset	740 error = _("clone -r not supported yet for remote repositories.")
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	741 raise util.Abort(error)
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	742 else:
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	743 revs = [other.lookup(rev) for rev in opts['rev']]
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	744 repo = hg.repository(ui, dest, create=1)
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	745 repo.pull(other, heads = revs)
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	746
1331 cfae1ed2d61f Write hgrc file in text mode, even on Windows. Bryan O'Sullivan <bos@serpentine.com> parents: 1325 diff changeset	747 f = repo.opener("hgrc", "w", text=True)
1206 6512d352d6c1 Redo local clone hgrc fix mpm@selenic.com parents: 1205 diff changeset	748 f.write("[paths]\n")
6512d352d6c1 Redo local clone hgrc fix mpm@selenic.com parents: 1205 diff changeset	749 f.write("default = %s\n" % abspath)
1547 4dea10839201 close .hg/hgrc after writing the default values on clone TK Soh <teekaysoh@yahoo.com> parents: 1545 diff changeset	750 f.close()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	751
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	752 if not opts['noupdate']:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	753 update(ui, repo)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	754
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	755 d.close()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	756
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	757 def commit(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	758 """commit the specified files or all outstanding changes
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	759
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	760 Commit changes to the given files into the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	761
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	762 If a list of files is omitted, all changes reported by "hg status"
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	763 will be commited.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	764
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	765 The HGEDITOR or EDITOR environment variables are used to start an
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	766 editor to add a commit comment.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	767 """
1443 3a0b69ea5708 Remove deprecated commit -t option Matt Mackall <mpm@selenic.com> parents: 1440 diff changeset	768 message = opts['message']
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	769 logfile = opts['logfile']
1319 5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	770
5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	771 if message and logfile:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	772 raise util.Abort(_('options --message and --logfile are mutually '
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	773 'exclusive'))
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	774 if not message and logfile:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	775 try:
899 aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	776 if logfile == '-':
aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	777 message = sys.stdin.read()
aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	778 else:
aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	779 message = open(logfile).read()
1319 5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	780 except IOError, inst:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	781 raise util.Abort(_("can't read commit message '%s': %s") %
1319 5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	782 (logfile, inst.strerror))
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	783
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	784 if opts['addremove']:
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	785 addremove(ui, repo, pats, *opts)
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	786 fns, match, anypats, cwd = matchpats(repo, pats, opts)
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	787 if pats:
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	788 modified, added, removed, deleted, unknown = (
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	789 repo.changes(files=fns, match=match))
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	790 files = modified + added + removed
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	791 else:
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	792 files = []
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	793 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	794 repo.commit(files, message, opts['user'], opts['date'], match)
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	795 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	796 raise util.Abort(str(inst))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	797
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	798 def docopy(ui, repo, pats, opts):
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	799 cwd = repo.getcwd()
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	800 errors = 0
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	801 copied = []
1514 faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	802 targets = {}
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	803
a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	804 def okaytocopy(abs, rel, exact):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	805 reasons = {'?': _('is not managed'),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	806 'a': _('has been marked for add')}
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	807 reason = reasons.get(repo.dirstate.state(abs))
a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	808 if reason:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	809 if exact:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	810 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	811 else:
a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	812 return True
a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	813
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	814 def copy(abssrc, relsrc, target, exact):
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	815 abstarget = util.canonpath(repo.root, cwd, target)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	816 reltarget = util.pathto(cwd, abstarget)
1514 faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	817 prevsrc = targets.get(abstarget)
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	818 if prevsrc is not None:
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	819 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	820 (reltarget, abssrc, prevsrc))
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	821 return
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	822 if (not opts['after'] and os.path.exists(reltarget) or
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	823 opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	824 if not opts['force']:
1513 5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	825 ui.warn(_('%s: not overwriting - file exists\n') %
5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	826 reltarget)
5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	827 return
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	828 if not opts['after']:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	829 os.unlink(reltarget)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	830 if opts['after']:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	831 if not os.path.exists(reltarget):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	832 return
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	833 else:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	834 targetdir = os.path.dirname(reltarget) or '.'
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	835 if not os.path.isdir(targetdir):
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	836 os.makedirs(targetdir)
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	837 try:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	838 shutil.copyfile(relsrc, reltarget)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	839 shutil.copymode(relsrc, reltarget)
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	840 except shutil.Error, inst:
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	841 raise util.Abort(str(inst))
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	842 except IOError, inst:
a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	843 if inst.errno == errno.ENOENT:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	844 ui.warn(_('%s: deleted in working copy\n') % relsrc)
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	845 else:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	846 ui.warn(_('%s: cannot copy - %s\n') %
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	847 (relsrc, inst.strerror))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	848 errors += 1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	849 return
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	850 if ui.verbose or not exact:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	851 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1514 faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	852 targets[abstarget] = abssrc
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	853 repo.copy(abssrc, abstarget)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	854 copied.append((abssrc, relsrc, exact))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	855
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	856 def targetpathfn(pat, dest, srcs):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	857 if os.path.isdir(pat):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	858 if pat.endswith(os.sep):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	859 pat = pat[:-len(os.sep)]
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	860 if destdirexists:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	861 striplen = len(os.path.split(pat)[0])
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	862 else:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	863 striplen = len(pat)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	864 if striplen:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	865 striplen += len(os.sep)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	866 res = lambda p: os.path.join(dest, p[striplen:])
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	867 elif destdirexists:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	868 res = lambda p: os.path.join(dest, os.path.basename(p))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	869 else:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	870 res = lambda p: dest
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	871 return res
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	872
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	873 def targetpathafterfn(pat, dest, srcs):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	874 if util.patkind(pat, None)[0]:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	875 # a mercurial pattern
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	876 res = lambda p: os.path.join(dest, os.path.basename(p))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	877 elif len(util.canonpath(repo.root, cwd, pat)) < len(srcs[0][0]):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	878 # A directory. Either the target path contains the last
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	879 # component of the source path or it does not.
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	880 def evalpath(striplen):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	881 score = 0
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	882 for s in srcs:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	883 t = os.path.join(dest, s[1][striplen:])
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	884 if os.path.exists(t):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	885 score += 1
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	886 return score
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	887
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	888 if pat.endswith(os.sep):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	889 pat = pat[:-len(os.sep)]
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	890 striplen = len(pat) + len(os.sep)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	891 if os.path.isdir(os.path.join(dest, os.path.split(pat)[1])):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	892 score = evalpath(striplen)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	893 striplen1 = len(os.path.split(pat)[0])
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	894 if striplen1:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	895 striplen1 += len(os.sep)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	896 if evalpath(striplen1) > score:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	897 striplen = striplen1
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	898 res = lambda p: os.path.join(dest, p[striplen:])
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	899 else:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	900 # a file
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	901 if destdirexists:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	902 res = lambda p: os.path.join(dest, os.path.basename(p))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	903 else:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	904 res = lambda p: dest
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	905 return res
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	906
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	907
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	908 pats = list(pats)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	909 if not pats:
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	910 raise util.Abort(_('no source or destination specified'))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	911 if len(pats) == 1:
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	912 raise util.Abort(_('no destination specified'))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	913 dest = pats.pop()
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	914 destdirexists = os.path.isdir(dest)
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	915 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	916 raise util.Abort(_('with multiple sources, destination must be an '
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	917 'existing directory'))
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	918 if opts['after']:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	919 tfn = targetpathafterfn
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	920 else:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	921 tfn = targetpathfn
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	922 copylist = []
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	923 for pat in pats:
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	924 srcs = []
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	925 for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	926 if okaytocopy(abssrc, relsrc, exact):
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	927 srcs.append((abssrc, relsrc, exact))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	928 if not srcs:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	929 continue
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	930 copylist.append((tfn(pat, dest, srcs), srcs))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	931 if not copylist:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	932 raise util.Abort(_('no files to copy'))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	933
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	934 for targetpath, srcs in copylist:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	935 for abssrc, relsrc, exact in srcs:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	936 copy(abssrc, relsrc, targetpath(relsrc), exact)
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	937
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	938 if errors:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	939 ui.warn(_('(consider using --after)\n'))
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	940 return errors, copied
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	941
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	942 def copy(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	943 """mark files as copied for the next commit
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	944
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	945 Mark dest as having copies of source files. If dest is a
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	946 directory, copies are put in that directory. If dest is a file,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	947 there can only be one source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	948
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	949 By default, this command copies the contents of files as they
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	950 stand in the working directory. If invoked with --after, the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	951 operation is recorded, but no copying is performed.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	952
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	953 This command takes effect in the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	954
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	955 NOTE: This command should be treated as experimental. While it
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	956 should properly record copied files, this information is not yet
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	957 fully used by merge, nor fully reported by log.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	958 """
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	959 errs, copied = docopy(ui, repo, pats, opts)
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	960 return errs
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	961
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	962 def debugancestor(ui, index, rev1, rev2):
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	963 """find the ancestor revision of two revisions in a given index"""
1504 0fcdd126642d fix file opening for some commands on Windows Christian Boos <cboos@neuf.fr> parents: 1496 diff changeset	964 r = revlog.revlog(util.opener(os.getcwd()), index, "")
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	965 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	966 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	967
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	968 def debugcheckstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	969 """validate the correctness of the current dirstate"""
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	970 parent1, parent2 = repo.dirstate.parents()
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	971 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	972 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	973 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	974 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	975 m1n = repo.changelog.read(parent1)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	976 m2n = repo.changelog.read(parent2)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	977 m1 = repo.manifest.read(m1n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	978 m2 = repo.manifest.read(m2n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	979 errors = 0
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	980 for f in dc:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	981 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	982 if state in "nr" and f not in m1:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	983 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	984 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	985 if state in "a" and f in m1:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	986 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	987 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	988 if state in "m" and f not in m1 and f not in m2:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	989 ui.warn(_("%s in state %s, but not in either manifest\n") %
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	990 (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	991 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	992 for f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	993 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	994 if state not in "nrm":
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	995 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	996 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	997 if errors:
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	998 error = _(".hg/dirstate inconsistent with current parent's manifest")
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	999 raise util.Abort(error)
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1000
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1001 def debugconfig(ui):
1053 1539ca091d86 Added missing doc strings for two new debug commmands. Thomas Arendsen Hein <thomas@intevation.de> parents: 1052 diff changeset	1002 """show combined config settings from all hgrc files"""
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1003 try:
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1004 repo = hg.repository(ui)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1005 except hg.RepoError:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1006 pass
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1007 for section, name, value in ui.walkconfig():
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1008 ui.write('%s.%s=%s\n' % (section, name, value))
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1009
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1010 def debugsetparents(ui, repo, rev1, rev2=None):
1470 fb9b84c91222 minor fix on command help docstrings TK Soh <teekaysoh@yahoo.com> parents: 1469 diff changeset	1011 """manually set the parents of the current working directory
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1012
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1013 This is useful for writing repository conversion tools, but should
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1014 be used with care.
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1015 """
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1016
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1017 if not rev2:
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1018 rev2 = hex(nullid)
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1019
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1020 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1021
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1022 def debugstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1023 """show the contents of the current dirstate"""
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	1024 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	1025 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1026 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1027 keys.sort()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1028 for file_ in keys:
791 040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1029 ui.write("%c %3o %10d %s %s\n"
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1030 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1031 time.strftime("%x %X",
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1032 time.localtime(dc[file_][3])), file_))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1033 for f in repo.dirstate.copies:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1034 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1035
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1036 def debugdata(ui, file_, rev):
4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1037 """dump the contents of an data file revision"""
1504 0fcdd126642d fix file opening for some commands on Windows Christian Boos <cboos@neuf.fr> parents: 1496 diff changeset	1038 r = revlog.revlog(util.opener(os.getcwd()), file_[:-2] + ".i", file_)
1313 1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1039 try:
1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1040 ui.write(r.revision(r.lookup(rev)))
1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1041 except KeyError:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1042 raise util.Abort(_('invalid revision identifier %s'), rev)
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1043
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1044 def debugindex(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1045 """dump the contents of an index file"""
1504 0fcdd126642d fix file opening for some commands on Windows Christian Boos <cboos@neuf.fr> parents: 1496 diff changeset	1046 r = revlog.revlog(util.opener(os.getcwd()), file_, "")
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1047 ui.write(" rev offset length base linkrev" +
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	1048 " nodeid p1 p2\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1049 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1050 e = r.index[i]
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	1051 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1052 i, e[0], e[1], e[2], e[3],
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1053 short(e[6]), short(e[4]), short(e[5])))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1054
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1055 def debugindexdot(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1056 """dump an index DAG as a .dot file"""
1504 0fcdd126642d fix file opening for some commands on Windows Christian Boos <cboos@neuf.fr> parents: 1496 diff changeset	1057 r = revlog.revlog(util.opener(os.getcwd()), file_, "")
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1058 ui.write("digraph G {\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1059 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1060 e = r.index[i]
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1061 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1062 if e[5] != nullid:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1063 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1064 ui.write("}\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1065
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1066 def debugrename(ui, repo, file, rev=None):
1194 c165cbf56bb1 Add doc string for debugrename. bos@serpentine.internal.keyresearch.com parents: 1193 diff changeset	1067 """dump rename information"""
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1068 r = repo.file(relpath(repo, [file])[0])
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1069 if rev:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1070 try:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1071 # assume all revision numbers are for changesets
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1072 n = repo.lookup(rev)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1073 change = repo.changelog.read(n)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1074 m = repo.manifest.read(change[0])
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1075 n = m[relpath(repo, [file])[0]]
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1526 diff changeset	1076 except (hg.RepoError, KeyError):
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1077 n = r.lookup(rev)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1078 else:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1079 n = r.tip()
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1080 m = r.renamed(n)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1081 if m:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1082 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1083 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1084 ui.write(_("not renamed\n"))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1085
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1086 def debugwalk(ui, repo, pats, *opts):
1053 1539ca091d86 Added missing doc strings for two new debug commmands. Thomas Arendsen Hein <thomas@intevation.de> parents: 1052 diff changeset	1087 """show how files match on given patterns"""
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1088 items = list(walk(repo, pats, opts))
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1089 if not items:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1090 return
1309 332f225b835c Make debugwalk strip trailing spaces and remove these from test-walk.out Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	1091 fmt = '%%s %%-%ds %%-%ds %%s' % (
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1092 max([len(abs) for (src, abs, rel, exact) in items]),
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1093 max([len(rel) for (src, abs, rel, exact) in items]))
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1094 for src, abs, rel, exact in items:
1309 332f225b835c Make debugwalk strip trailing spaces and remove these from test-walk.out Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	1095 line = fmt % (src, abs, rel, exact and 'exact' or '')
332f225b835c Make debugwalk strip trailing spaces and remove these from test-walk.out Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	1096 ui.write("%s\n" % line.rstrip())
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1097
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	1098 def diff(ui, repo, pats, *opts):
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	1099 """diff repository (or selected files)
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1100
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1101 Show differences between revisions for the specified files.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1102
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1103 Differences between files are shown using the unified diff format.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1104
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1105 When two revision arguments are given, then changes are shown
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1106 between those revisions. If only one revision is specified then
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1107 that revision is compared to the working directory, and, when no
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1108 revisions are specified, the working directory files are compared
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1109 to its parent.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1110
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1111 Without the -a option, diff will avoid generating diffs of files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1112 it detects as binary. With -a, diff will generate a diff anyway,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1113 probably with undesirable results.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1114 """
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1115 node1, node2 = None, None
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1116 revs = [repo.lookup(x) for x in opts['rev']]
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	1117
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1118 if len(revs) > 0:
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1119 node1 = revs[0]
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1120 if len(revs) > 1:
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1121 node2 = revs[1]
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1122 if len(revs) > 2:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1123 raise util.Abort(_("too many revisions to diff"))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1124
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	1125 fns, matchfn, anypats, cwd = matchpats(repo, pats, opts)
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1126
1267 b0633406c07a Fix diff command so it doesn't walk the dirstate unnecessarily. Bryan O'Sullivan <bos@serpentine.com> parents: 1262 diff changeset	1127 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1128 text=opts['text'])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1129
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1130 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1131 node = repo.lookup(changeset)
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1132 parents = [p for p in repo.changelog.parents(node) if p != nullid]
1589 fce5292866c6 fix a bug in hg export --switch-parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1586 diff changeset	1133 if opts['switch_parent']:
fce5292866c6 fix a bug in hg export --switch-parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1586 diff changeset	1134 parents.reverse()
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1135 prev = (parents and parents[0]) or nullid
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1136 change = repo.changelog.read(node)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1137
729 626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1138 fp = make_file(repo, repo.changelog, opts['output'],
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1139 node=node, total=total, seqno=seqno,
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1140 revwidth=revwidth)
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1141 if fp != sys.stdout:
755 87e2b094ab86 Show filenames for hg export in verbose mode on a separate lines. Thomas Arendsen Hein <thomas@intevation.de> parents: 750 diff changeset	1142 ui.note("%s\n" % fp.name)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1143
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1144 fp.write("# HG changeset patch\n")
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1145 fp.write("# User %s\n" % change[1])
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1146 fp.write("# Node ID %s\n" % hex(node))
0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1147 fp.write("# Parent %s\n" % hex(prev))
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1148 if len(parents) > 1:
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1149 fp.write("# Parent %s\n" % hex(parents[1]))
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1150 fp.write(change[4].rstrip())
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1151 fp.write("\n\n")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1152
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1153 dodiff(fp, ui, repo, prev, node, text=opts['text'])
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1154 if fp != sys.stdout:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1155 fp.close()
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	1156
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1157 def export(ui, repo, changesets, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1158 """dump the header and diffs for one or more changesets
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1159
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1160 Print the changeset header and diffs for one or more revisions.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1161
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1162 The information shown in the changeset header is: author,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1163 changeset hash, parent and commit comment.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1164
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1165 Output may be to a file, in which case the name of the file is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1166 given using a format string. The formatting rules are as follows:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1167
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1168 %% literal "%" character
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1169 %H changeset hash (40 bytes of hexadecimal)
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1170 %N number of patches being generated
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1171 %R changeset revision number
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1172 %b basename of the exporting repository
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1173 %h short-form changeset hash (12 bytes of hexadecimal)
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1174 %n zero-padded sequence number, starting at 1
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1175 %r zero-padded changeset revision number
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1176
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1177 Without the -a option, export will avoid generating diffs of files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1178 it detects as binary. With -a, export will generate a diff anyway,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1179 probably with undesirable results.
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1180
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1181 With the --switch-parent option, the diff will be against the second
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1182 parent. It can be useful to review a merge.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1183 """
610 4c02464cb9f0 check export options for changeset before running shaleh@speakeasy.net parents: 609 diff changeset	1184 if not changesets:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1185 raise util.Abort(_("export requires at least one changeset"))
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1186 seqno = 0
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1187 revs = list(revrange(ui, repo, changesets))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1188 total = len(revs)
1067 fae1204603dc Fixed zero-padded filenames with %r if there is a longer number in the middle. Thomas Arendsen Hein <thomas@intevation.de> parents: 1066 diff changeset	1189 revwidth = max(map(len, revs))
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1190 msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1191 ui.note(msg)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1192 for cset in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1193 seqno += 1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1194 doexport(ui, repo, cset, seqno, total, revwidth, opts)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1195
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1196 def forget(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1197 """don't add the specified files on the next commit
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1198
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1199 Undo an 'hg add' scheduled for the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1200 """
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1201 forget = []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1202 for src, abs, rel, exact in walk(repo, pats, opts):
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1203 if repo.dirstate.state(abs) == 'a':
790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1204 forget.append(abs)
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	1205 if ui.verbose or not exact:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1206 ui.status(_('forgetting %s\n') % rel)
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1207 repo.forget(forget)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1208
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	1209 def grep(ui, repo, pattern, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1210 """search for a pattern in specified files and revisions
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1211
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1212 Search revisions of files for a regular expression.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1213
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1214 This command behaves differently than Unix grep. It only accepts
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1215 Python/Perl regexps. It searches repository history, not the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1216 working directory. It always prints the revision number in which
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1217 a match appears.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1218
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1219 By default, grep only prints output for the first revision of a
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1220 file in which it finds a match. To get it to print every revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1221 that contains a change in match status ("-" for a match that
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1222 becomes a non-match, or "+" for a non-match that becomes a match),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1223 use the --all flag.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1224 """
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1225 reflags = 0
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1226 if opts['ignore_case']:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1227 reflags \|= re.I
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1228 regexp = re.compile(pattern, reflags)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1229 sep, eol = ':', '\n'
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	1230 if opts['print0']:
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1231 sep = eol = '\0'
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1232
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1233 fcache = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1234 def getfile(fn):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1235 if fn not in fcache:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1236 fcache[fn] = repo.file(fn)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1237 return fcache[fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1238
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1239 def matchlines(body):
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1240 begin = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1241 linenum = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1242 while True:
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1243 match = regexp.search(body, begin)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1244 if not match:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1245 break
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1246 mstart, mend = match.span()
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1247 linenum += body.count('\n', begin, mstart) + 1
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1248 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1249 lend = body.find('\n', mend)
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1250 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1251 begin = lend + 1
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1252
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	1253 class linestate(object):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1254 def __init__(self, line, linenum, colstart, colend):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1255 self.line = line
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1256 self.linenum = linenum
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1257 self.colstart = colstart
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1258 self.colend = colend
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1259 def __eq__(self, other):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1260 return self.line == other.line
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1261 def __hash__(self):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1262 return hash(self.line)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1263
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1264 matches = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1265 def grepbody(fn, rev, body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1266 matches[rev].setdefault(fn, {})
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1267 m = matches[rev][fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1268 for lnum, cstart, cend, line in matchlines(body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1269 s = linestate(line, lnum, cstart, cend)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1270 m[s] = s
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1271
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1272 prev = {}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1273 ucache = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1274 def display(fn, rev, states, prevstates):
1061 fed8d078840b Fix set type usage for Python 2.3 mpm@selenic.com parents: 1060 diff changeset	1275 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1276 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1277 counts = {'-': 0, '+': 0}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1278 filerevmatches = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1279 for l in diff:
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	1280 if incrementing or not opts['all']:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1281 change = ((l in prevstates) and '-') or '+'
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1282 r = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1283 else:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1284 change = ((l in states) and '-') or '+'
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1285 r = prev[fn]
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1286 cols = [fn, str(rev)]
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1287 if opts['line_number']:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1288 cols.append(str(l.linenum))
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1289 if opts['all']:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1290 cols.append(change)
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1291 if opts['user']:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1292 cols.append(trimuser(ui, getchange(rev)[1], rev,
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1293 ucache))
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1294 if opts['files_with_matches']:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1295 c = (fn, rev)
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1296 if c in filerevmatches:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1297 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1298 filerevmatches[c] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1299 else:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1300 cols.append(l.line)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1301 ui.write(sep.join(cols), eol)
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1302 counts[change] += 1
bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1303 return counts['+'], counts['-']
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1304
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1305 fstate = {}
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1306 skip = {}
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	1307 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1308 count = 0
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	1309 incrementing = False
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1310 for st, rev, fns in changeiter:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1311 if st == 'window':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1312 incrementing = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1313 matches.clear()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1314 elif st == 'add':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1315 change = repo.changelog.read(repo.lookup(str(rev)))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1316 mf = repo.manifest.read(change[0])
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1317 matches[rev] = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1318 for fn in fns:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1319 if fn in skip:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1320 continue
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1321 fstate.setdefault(fn, {})
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1322 try:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1323 grepbody(fn, rev, getfile(fn).read(mf[fn]))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1324 except KeyError:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1325 pass
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1326 elif st == 'iter':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1327 states = matches[rev].items()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1328 states.sort()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1329 for fn, m in states:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1330 if fn in skip:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1331 continue
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	1332 if incrementing or not opts['all'] or fstate[fn]:
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1333 pos, neg = display(fn, rev, m, fstate[fn])
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1334 count += pos + neg
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	1335 if pos and not opts['all']:
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1336 skip[fn] = True
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1337 fstate[fn] = m
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1338 prev[fn] = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1339
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1340 if not incrementing:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1341 fstate = fstate.items()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1342 fstate.sort()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1343 for fn, state in fstate:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1344 if fn in skip:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1345 continue
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1346 display(fn, rev, {}, state)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1347 return (count == 0 and 1) or 0
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1348
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1349 def heads(ui, repo, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1350 """show current repository heads
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1351
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1352 Show all repository head changesets.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1353
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1354 Repository "heads" are changesets that don't have children
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1355 changesets. They are where development generally takes place and
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1356 are the usual targets for update and merge operations.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1357 """
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1547 diff changeset	1358 if opts['rev']:
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	1359 heads = repo.heads(repo.lookup(opts['rev']))
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1547 diff changeset	1360 else:
ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1547 diff changeset	1361 heads = repo.heads()
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1362 br = None
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1363 if opts['branches']:
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	1364 br = repo.branchlookup(heads)
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1547 diff changeset	1365 for n in heads:
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1366 show_changeset(ui, repo, changenode=n, brinfo=br)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	1367
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1368 def identify(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1369 """print information about the working copy
1470 fb9b84c91222 minor fix on command help docstrings TK Soh <teekaysoh@yahoo.com> parents: 1469 diff changeset	1370
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1371 Print a short summary of the current state of the repo.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1372
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1373 This summary identifies the repository state using one or two parent
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1374 hash identifiers, followed by a "+" if there are uncommitted changes
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1375 in the working directory, followed by a list of tags for this revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1376 """
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1377 parents = [p for p in repo.dirstate.parents() if p != nullid]
340 97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	1378 if not parents:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1379 ui.write(_("unknown\n"))
340 97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	1380 return
97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	1381
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1382 hexfunc = ui.verbose and hex or short
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1383 modified, added, removed, deleted, unknown = repo.changes()
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1384 output = ["%s%s" %
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1385 ('+'.join([hexfunc(parent) for parent in parents]),
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1386 (modified or added or removed or deleted) and "+" or "")]
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1387
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1388 if not ui.quiet:
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1389 # multiple tags for a single parent separated by '/'
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1390 parenttags = ['/'.join(tags)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1391 for tags in map(repo.nodetags, parents) if tags]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1392 # tags for multiple parents separated by ' + '
758 c5db9581bfa6 There was an extra space after 'hg id' when there are no tags. Thomas Arendsen Hein <thomas@intevation.de> parents: 757 diff changeset	1393 if parenttags:
c5db9581bfa6 There was an extra space after 'hg id' when there are no tags. Thomas Arendsen Hein <thomas@intevation.de> parents: 757 diff changeset	1394 output.append(' + '.join(parenttags))
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1395
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1396 ui.write("%s\n" % ' '.join(output))
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1397
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1398 def import_(ui, repo, patch1, patches, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1399 """import an ordered set of patches
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1400
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1401 Import a list of patches and commit them individually.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1402
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1403 If there are outstanding changes in the working directory, import
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1404 will abort unless given the -f flag.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1405
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1406 If a patch looks like a mail message (its first line starts with
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1407 "From " or looks like an RFC822 header), it will not be applied
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1408 unless the -f option is used. The importer neither parses nor
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1409 discards mail headers, so use -f only to override the "mailness"
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1410 safety check, not to import a real mail message.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1411 """
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1412 patches = (patch1,) + patches
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1413
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1414 if not opts['force']:
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1415 modified, added, removed, deleted, unknown = repo.changes()
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1416 if modified or added or removed or deleted:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1417 raise util.Abort(_("outstanding uncommitted changes"))
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1418
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1419 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1420 strip = opts["strip"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1421
1193 04d1ca8ae9ec Fortify the recognition of a diff header. bos@serpentine.internal.keyresearch.com parents: 1192 diff changeset	1422 mailre = re.compile(r'(?:From \|[\w-]+:)')
1390 ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1423
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1424 # attempt to detect the start of a patch
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1425 # (this heuristic is borrowed from quilt)
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1426 diffre = re.compile(r'(?:Index:[ \t]\|diff[ \t]\|RCS file: \|' +
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1427 'retrieving revision [0-9]+(\.[0-9]+)*$\|' +
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1428 '(---\|\\\*)[ \t])')
1190 737f9b90c571 Make import command reject patches that resemble email messages. bos@serpentine.internal.keyresearch.com parents: 1189 diff changeset	1429
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1430 for patch in patches:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1431 ui.status(_("applying %s\n") % patch)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1432 pf = os.path.join(d, patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1433
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1434 message = []
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1435 user = None
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1436 hgpatch = False
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1437 for line in file(pf):
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1438 line = line.rstrip()
1220 8baa29e36b14 import: fix bug in mail-format detection mpm@selenic.com parents: 1218 diff changeset	1439 if (not message and not hgpatch and
8baa29e36b14 import: fix bug in mail-format detection mpm@selenic.com parents: 1218 diff changeset	1440 mailre.match(line) and not opts['force']):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1441 if len(line) > 35:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1442 line = line[:32] + '...'
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1443 raise util.Abort(_('first line looks like a '
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1444 'mail header: ') + line)
1193 04d1ca8ae9ec Fortify the recognition of a diff header. bos@serpentine.internal.keyresearch.com parents: 1192 diff changeset	1445 if diffre.match(line):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1446 break
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1447 elif hgpatch:
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1448 # parse values when importing the result of an hg export
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1449 if line.startswith("# User "):
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1450 user = line[7:]
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1451 ui.debug(_('User: %s\n') % user)
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1452 elif not line.startswith("# ") and line:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1453 message.append(line)
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1454 hgpatch = False
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1455 elif line == '# HG changeset patch':
607 94744f6fe0e7 [PATCH] Parse and use header data from an hg export'ed changeset mpm@selenic.com parents: 605 diff changeset	1456 hgpatch = True
852 1df0983eb589 Allow HG patch to appear late in the input stream Samuel Tardieu <sam@rfc1149.net> parents: 849 diff changeset	1457 message = [] # We may have collected garbage
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1458 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1459 message.append(line)
607 94744f6fe0e7 [PATCH] Parse and use header data from an hg export'ed changeset mpm@selenic.com parents: 605 diff changeset	1460
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1461 # make sure message isn't empty
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1462 if not message:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1463 message = _("imported patch %s\n") % patch
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1464 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1465 message = "%s\n" % '\n'.join(message)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1466 ui.debug(_('message:\n%s\n') % message)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1467
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1281 diff changeset	1468 files = util.patch(strip, pf, ui)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1469
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1470 if len(files) > 0:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1471 addremove(ui, repo, *files)
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1472 repo.commit(files, message, user)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1473
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1474 def incoming(ui, repo, source="default", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1475 """show new changesets found in source
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1476
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1477 Show new changesets found in the specified repo or the default
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1478 pull repo. These are the changesets that would be pulled if a pull
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1479 was requested.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1480
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1481 Currently only local repositories are supported.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1482 """
1440 bf109779f48b Fix relative pull in a subdir tonfa@arakou.lan parents: 1439 diff changeset	1483 source = ui.expandpath(source, repo.root)
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1484 other = hg.repository(ui, source)
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1485 if not other.local():
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1486 raise util.Abort(_("incoming doesn't work for remote repositories yet"))
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1487 o = repo.findincoming(other)
931 32e8f64b25b0 Fix incoming for empty set mpm@selenic.com parents: 928 diff changeset	1488 if not o:
32e8f64b25b0 Fix incoming for empty set mpm@selenic.com parents: 928 diff changeset	1489 return
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1381 diff changeset	1490 o = other.changelog.nodesbetween(o)[0]
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	1491 if opts['newest_first']:
65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	1492 o.reverse()
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1493 for n in o:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1494 parents = [p for p in other.changelog.parents(n) if p != nullid]
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1495 if opts['no_merges'] and len(parents) == 2:
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1496 continue
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1497 show_changeset(ui, other, changenode=n)
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1498 if opts['patch']:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1499 prev = (parents and parents[0]) or nullid
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1500 dodiff(ui, ui, other, prev, n)
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1501 ui.write("\n")
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1502
907 652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1503 def init(ui, dest="."):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1504 """create a new repository in the given directory
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1505
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1506 Initialize a new repository in the given directory. If the given
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1507 directory does not exist, it is created.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1508
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1509 If no directory is given, the current directory is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1510 """
907 652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1511 if not os.path.exists(dest):
652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1512 os.mkdir(dest)
652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1513 hg.repository(ui, dest, create=1)
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	1514
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	1515 def locate(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1516 """locate files matching specific patterns
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1517
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1518 Print all files under Mercurial control whose names match the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1519 given patterns.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1520
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1521 This command searches the current directory and its
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1522 subdirectories. To search an entire repository, move to the root
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1523 of the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1524
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1525 If no patterns are given to match, this command prints all file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1526 names.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1527
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1528 If you want to feed the output of this command into the "xargs"
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1529 command, use the "-0" option to both this command and "xargs".
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1530 This will avoid the problem of "xargs" treating single filenames
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1531 that contain white space as multiple filenames.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1532 """
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1533 end = opts['print0'] and '\0' or '\n'
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	1534
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1535 for src, abs, rel, exact in walk(repo, pats, opts, '(?:.*/\|)'):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1536 if repo.dirstate.state(abs) == '?':
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1537 continue
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1538 if opts['fullpath']:
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1539 ui.write(os.path.join(repo.root, abs), end)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1540 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1541 ui.write(rel, end)
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	1542
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1543 def log(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1544 """show revision history of entire repository or files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1545
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1546 Print the revision history of the specified files or the entire project.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1547
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1548 By default this command outputs: changeset id and hash, tags,
1557 f7d9823e65df Updated help text for 'hg log'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1552 diff changeset	1549 non-trivial parents, user, date and time, and a summary for each
f7d9823e65df Updated help text for 'hg log'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1552 diff changeset	1550 commit. When the -v/--verbose switch is used, the list of changed
f7d9823e65df Updated help text for 'hg log'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1552 diff changeset	1551 files and full commit message is shown.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1552 """
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	1553 class dui(object):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1554 # Implement and delegate some ui protocol. Save hunks of
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1555 # output for later display in the desired order.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1556 def __init__(self, ui):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1557 self.ui = ui
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1558 self.hunk = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1559 def bump(self, rev):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1560 self.rev = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1561 self.hunk[rev] = []
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1562 def note(self, *args):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1563 if self.verbose:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1564 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1565 def status(self, *args):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1566 if not self.quiet:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1567 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1568 def write(self, *args):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1569 self.hunk[self.rev].append(args)
1381 c29c36745c6e log --debug: fix misplaced manifest field TK Soh <teekaysoh@yahoo.com> parents: 1380 diff changeset	1570 def debug(self, *args):
c29c36745c6e log --debug: fix misplaced manifest field TK Soh <teekaysoh@yahoo.com> parents: 1380 diff changeset	1571 if self.debugflag:
c29c36745c6e log --debug: fix misplaced manifest field TK Soh <teekaysoh@yahoo.com> parents: 1380 diff changeset	1572 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1573 def __getattr__(self, key):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1574 return getattr(self.ui, key)
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	1575 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1576 for st, rev, fns in changeiter:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1577 if st == 'window':
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1578 du = dui(ui)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1579 elif st == 'add':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1580 du.bump(rev)
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1581 changenode = repo.changelog.node(rev)
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1582 parents = [p for p in repo.changelog.parents(changenode)
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1583 if p != nullid]
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1584 if opts['no_merges'] and len(parents) == 2:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1585 continue
1436 db6d7b4005ba add --only-merges (-m) log Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1435 diff changeset	1586 if opts['only_merges'] and len(parents) != 2:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1587 continue
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1588
1238 6a4f181497c9 Add log -b to show the branch a specific revision lives in mason@suse.com parents: 1233 diff changeset	1589 br = None
1373 965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1590 if opts['keyword']:
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	1591 changes = getchange(rev)
1373 965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1592 miss = 0
1404 67e20e27d8df log: make keyword search truly case-insensitive TK Soh <teekaysoh@yahoo.com> parents: 1402 diff changeset	1593 for k in [kw.lower() for kw in opts['keyword']]:
1373 965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1594 if not (k in changes[1].lower() or
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1595 k in changes[4].lower() or
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1596 k in " ".join(changes[3][:20]).lower()):
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1597 miss = 1
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1598 break
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1599 if miss:
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1600 continue
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1601
1405 6fd6527f95eb log: speedup keyword search when used with --branch TK Soh <teekaysoh@yahoo.com> parents: 1404 diff changeset	1602 if opts['branch']:
6fd6527f95eb log: speedup keyword search when used with --branch TK Soh <teekaysoh@yahoo.com> parents: 1404 diff changeset	1603 br = repo.branchlookup([repo.changelog.node(rev)])
6fd6527f95eb log: speedup keyword search when used with --branch TK Soh <teekaysoh@yahoo.com> parents: 1404 diff changeset	1604
1238 6a4f181497c9 Add log -b to show the branch a specific revision lives in mason@suse.com parents: 1233 diff changeset	1605 show_changeset(du, repo, rev, brinfo=br)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1606 if opts['patch']:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1607 prev = (parents and parents[0]) or nullid
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	1608 dodiff(du, du, repo, prev, changenode, match=matchfn)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1609 du.write("\n\n")
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1610 elif st == 'iter':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1611 for args in du.hunk[rev]:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1612 ui.write(*args)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1613
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1614 def manifest(ui, repo, rev=None):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1615 """output the latest or given revision of the project manifest
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1616
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1617 Print a list of version controlled files for the given revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1618
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1619 The manifest is the list of files being version controlled. If no revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1620 is given then the tip is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1621 """
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1622 if rev:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1623 try:
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1624 # assume all revision numbers are for changesets
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1625 n = repo.lookup(rev)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1626 change = repo.changelog.read(n)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1627 n = change[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1628 except hg.RepoError:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1629 n = repo.manifest.lookup(rev)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1630 else:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1631 n = repo.manifest.tip()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1632 m = repo.manifest.read(n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1633 mf = repo.manifest.readflags(n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1634 files = m.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1635 files.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1636
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1637 for f in files:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1638 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1639
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1640 def outgoing(ui, repo, dest="default-push", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1641 """show changesets not found in destination
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1642
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1643 Show changesets not found in the specified destination repo or the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1644 default push repo. These are the changesets that would be pushed
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1645 if a push was requested.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1646 """
1440 bf109779f48b Fix relative pull in a subdir tonfa@arakou.lan parents: 1439 diff changeset	1647 dest = ui.expandpath(dest, repo.root)
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1648 other = hg.repository(ui, dest)
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1649 o = repo.findoutgoing(other)
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1381 diff changeset	1650 o = repo.changelog.nodesbetween(o)[0]
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	1651 if opts['newest_first']:
65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	1652 o.reverse()
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1653 for n in o:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1654 parents = [p for p in repo.changelog.parents(n) if p != nullid]
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1655 if opts['no_merges'] and len(parents) == 2:
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1656 continue
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1657 show_changeset(ui, repo, changenode=n)
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1658 if opts['patch']:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1659 prev = (parents and parents[0]) or nullid
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1660 dodiff(ui, ui, repo, prev, n)
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1661 ui.write("\n")
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1662
706 5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	1663 def parents(ui, repo, rev=None):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1664 """show the parents of the working dir or revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1665
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1666 Print the working directory's parent revisions.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1667 """
706 5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	1668 if rev:
5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	1669 p = repo.changelog.parents(repo.lookup(rev))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1670 else:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1671 p = repo.dirstate.parents()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1672
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1673 for n in p:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1674 if n != nullid:
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	1675 show_changeset(ui, repo, changenode=n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1676
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	1677 def paths(ui, search=None):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1678 """show definition of symbolic path names
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1679
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1680 Show definition of symbolic path name NAME. If no name is given, show
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1681 definition of available names.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1682
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1683 Path names are defined in the [paths] section of /etc/mercurial/hgrc
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1684 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1685 """
915 24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1686 try:
24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1687 repo = hg.repository(ui=ui)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1688 except hg.RepoError:
915 24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1689 pass
24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1690
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1691 if search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1692 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1693 if name == search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1694 ui.write("%s\n" % path)
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1695 return
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1696 ui.warn(_("not found!\n"))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1697 return 1
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1698 else:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1699 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1700 ui.write("%s = %s\n" % (name, path))
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1701
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1702 def pull(ui, repo, source="default", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1703 """pull changes from the specified source
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1704
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1705 Pull changes from a remote repository to a local one.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1706
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1707 This finds all changes from the repository at the specified path
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1708 or URL and adds them to the local repository. By default, this
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1709 does not update the copy of the project in the working directory.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1710
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1711 Valid URLs are of the form:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1712
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1713 local/filesystem/path
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1714 http://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1715 https://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1716 ssh://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1717
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1718 SSH requires an accessible shell account on the destination machine
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1719 and a copy of hg in the remote path. With SSH, paths are relative
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1720 to the remote user's home directory by default; use two slashes at
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1721 the start of a path to specify it as relative to the filesystem root.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1722 """
1440 bf109779f48b Fix relative pull in a subdir tonfa@arakou.lan parents: 1439 diff changeset	1723 source = ui.expandpath(source, repo.root)
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1724 ui.status(_('pulling from %s\n') % (source))
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1725
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1726 if opts['ssh']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1727 ui.setconfig("ui", "ssh", opts['ssh'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1728 if opts['remotecmd']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1729 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1730
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1731 other = hg.repository(ui, source)
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1732 revs = None
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1733 if opts['rev'] and not other.local():
1607 d72d27ee72b9 add '_' to several strings Muli Ben-Yehuda <mulix@mulix.org> parents: 1602 diff changeset	1734 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1735 elif opts['rev']:
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1736 revs = [other.lookup(rev) for rev in opts['rev']]
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1737 r = repo.pull(other, heads=revs)
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	1738 if not r:
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1739 if opts['update']:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1740 return update(ui, repo)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1741 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1742 ui.status(_("(run 'hg update' to get a working copy)\n"))
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1743
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1744 return r
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1745
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1746 def push(ui, repo, dest="default-push", force=False, ssh=None, remotecmd=None):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1747 """push changes to the specified destination
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1748
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1749 Push changes from the local repository to the given destination.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1750
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1751 This is the symmetrical operation for pull. It helps to move
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1752 changes from the current repository to a different one. If the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1753 destination is local this is identical to a pull in that directory
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1754 from the current one.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1755
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1756 By default, push will refuse to run if it detects the result would
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1757 increase the number of remote heads. This generally indicates the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1758 the client has forgotten to sync and merge before pushing.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1759
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1760 Valid URLs are of the form:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1761
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1762 local/filesystem/path
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1763 ssh://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1764
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1765 SSH requires an accessible shell account on the destination
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1766 machine and a copy of hg in the remote path.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1767 """
1440 bf109779f48b Fix relative pull in a subdir tonfa@arakou.lan parents: 1439 diff changeset	1768 dest = ui.expandpath(dest, repo.root)
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	1769 ui.status('pushing to %s\n' % (dest))
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	1770
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1771 if ssh:
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1772 ui.setconfig("ui", "ssh", ssh)
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1773 if remotecmd:
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1774 ui.setconfig("ui", "remotecmd", remotecmd)
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1775
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	1776 other = hg.repository(ui, dest)
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1777 r = repo.push(other, force)
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	1778 return r
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	1779
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	1780 def rawcommit(ui, repo, flist, *rc):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1781 """raw commit interface
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1782
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1783 Lowlevel commit, for use in helper scripts.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1784
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1785 This command is not intended to be used by normal users, as it is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1786 primarily useful for importing from other SCMs.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1787 """
1496 3cf287a03664 remove the deprecated --text (t) option to rawcommit and tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1490 diff changeset	1788 message = rc['message']
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1789 if not message and rc['logfile']:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1790 try:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1791 message = open(rc['logfile']).read()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1792 except IOError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1793 pass
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1794 if not message and not rc['logfile']:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1795 raise util.Abort(_("missing commit message"))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1796
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	1797 files = relpath(repo, list(flist))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1798 if rc['files']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1799 files += open(rc['files']).read().splitlines()
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	1800
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	1801 rc['parent'] = map(repo.lookup, rc['parent'])
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1802
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1803 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1804 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1805 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1806 raise util.Abort(str(inst))
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1807
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1808 def recover(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1809 """roll back an interrupted transaction
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1810
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1811 Recover from an interrupted commit or pull.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1812
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1813 This command tries to fix the repository status after an interrupted
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1814 operation. It should only be necessary when Mercurial suggests it.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1815 """
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	1816 if repo.recover():
0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	1817 return repo.verify()
0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	1818 return False
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1819
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1820 def remove(ui, repo, pat, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1821 """remove the specified files on the next commit
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1822
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1823 Schedule the indicated files for removal from the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1824
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1825 This command schedules the files to be removed at the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1826 This only removes files from the current branch, not from the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1827 entire project history. If the files still exist in the working
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1828 directory, they will be deleted from it.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1829 """
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1830 names = []
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1831 def okaytoremove(abs, rel, exact):
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1832 modified, added, removed, deleted, unknown = repo.changes(files=[abs])
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1833 reason = None
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1834 if modified:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1835 reason = _('is modified')
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1836 elif added:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1837 reason = _('has been marked for add')
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1838 elif unknown:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1839 reason = _('is not managed')
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	1840 if reason:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1841 if exact:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1842 ui.warn(_('not removing %s: file %s\n') % (rel, reason))
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1843 else:
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1844 return True
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1845 for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1846 if okaytoremove(abs, rel, exact):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1847 if ui.verbose or not exact:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1848 ui.status(_('removing %s\n') % rel)
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1849 names.append(abs)
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	1850 repo.remove(names, unlink=True)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1851
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1852 def rename(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1853 """rename files; equivalent of copy + remove
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1854
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1855 Mark dest as copies of sources; mark sources for deletion. If
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1856 dest is a directory, copies are put in that directory. If dest is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1857 a file, there can only be one source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1858
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1859 By default, this command copies the contents of files as they
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1860 stand in the working directory. If invoked with --after, the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1861 operation is recorded, but no copying is performed.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1862
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1863 This command takes effect in the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1864
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1865 NOTE: This command should be treated as experimental. While it
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1866 should properly record rename files, this information is not yet
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1867 fully used by merge, nor fully reported by log.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1868 """
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1869 errs, copied = docopy(ui, repo, pats, opts)
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1870 names = []
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1871 for abs, rel, exact in copied:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1872 if ui.verbose or not exact:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1873 ui.status(_('removing %s\n') % rel)
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1874 names.append(abs)
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	1875 repo.remove(names, unlink=True)
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1876 return errs
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1877
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	1878 def revert(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1879 """revert modified files or dirs back to their unmodified states
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1880
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1881 Revert any uncommitted modifications made to the named files or
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1882 directories. This restores the contents of the affected files to
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1883 an unmodified state.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1884
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1885 If a file has been deleted, it is recreated. If the executable
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1886 mode of a file was changed, it is reset.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1887
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	1888 If names are given, all files matching the names are reverted.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1889
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	1890 If no arguments are given, all files in the repository are reverted.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1891 """
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1892 node = opts['rev'] and repo.lookup(opts['rev']) or \
38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1893 repo.dirstate.parents()[0]
38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1894
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	1895 files, choose, anypats, cwd = matchpats(repo, pats, opts)
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1896 modified, added, removed, deleted, unknown = repo.changes(match=choose)
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1897 repo.forget(added)
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1898 repo.undelete(removed + deleted)
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1899
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	1900 return repo.update(node, False, True, choose, False)
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1901
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1902 def root(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1903 """print the root (top) of the current working dir
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1904
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1905 Print the root directory of the current repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1906 """
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1907 ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1908
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1909 def serve(ui, repo, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1910 """export the repository via HTTP
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1911
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1912 Start a local HTTP repository browser and pull server.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1913
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1914 By default, the server logs accesses to stdout and errors to
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1915 stderr. Use the "-A" and "-E" options to log to files.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1916 """
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1917
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1918 if opts["stdio"]:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1919 fin, fout = sys.stdin, sys.stdout
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1920 sys.stdout = sys.stderr
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1921
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	1922 # Prevent insertion/deletion of CRs
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	1923 util.set_binary(fin)
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	1924 util.set_binary(fout)
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	1925
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1926 def getarg():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1927 argline = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1928 arg, l = argline.split()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1929 val = fin.read(int(l))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1930 return arg, val
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1931 def respond(v):
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1932 fout.write("%d\n" % len(v))
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1933 fout.write(v)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1934 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1935
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1936 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1937
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1938 while 1:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1939 cmd = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1940 if cmd == '':
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1941 return
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1942 if cmd == "heads":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1943 h = repo.heads()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1944 respond(" ".join(map(hex, h)) + "\n")
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1945 if cmd == "lock":
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1946 lock = repo.lock()
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1947 respond("")
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1948 if cmd == "unlock":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1949 if lock:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1950 lock.release()
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1951 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1952 respond("")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1953 elif cmd == "branches":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1954 arg, nodes = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1955 nodes = map(bin, nodes.split(" "))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1956 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1957 for b in repo.branches(nodes):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1958 r.append(" ".join(map(hex, b)) + "\n")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1959 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1960 elif cmd == "between":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1961 arg, pairs = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1962 pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1963 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1964 for b in repo.between(pairs):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1965 r.append(" ".join(map(hex, b)) + "\n")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1966 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1967 elif cmd == "changegroup":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1968 nodes = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1969 arg, roots = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1970 nodes = map(bin, roots.split(" "))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1971
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1972 cg = repo.changegroup(nodes)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1973 while 1:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1974 d = cg.read(4096)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1975 if not d:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1976 break
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1977 fout.write(d)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1978
667 31a9aa890016 A number of minor fixes to problems that pychecker found. mark.williamson@cl.cam.ac.uk parents: 654 diff changeset	1979 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1980
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1981 elif cmd == "addchangegroup":
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1982 if not lock:
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1983 respond("not locked")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1984 continue
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1985 respond("")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1986
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1987 r = repo.addchangegroup(fin)
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1988 respond("")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1989
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1990 optlist = "name templates style address port ipv6 accesslog errorlog"
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1991 for o in optlist.split():
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1992 if opts[o]:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1993 ui.setconfig("web", o, opts[o])
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1994
1177 862f53c1d0f9 hg serve: print a more useful error message if server can't start. Bryan O'Sullivan <bos@serpentine.com> parents: 1147 diff changeset	1995 try:
862f53c1d0f9 hg serve: print a more useful error message if server can't start. Bryan O'Sullivan <bos@serpentine.com> parents: 1147 diff changeset	1996 httpd = hgweb.create_server(repo)
862f53c1d0f9 hg serve: print a more useful error message if server can't start. Bryan O'Sullivan <bos@serpentine.com> parents: 1147 diff changeset	1997 except socket.error, inst:
1607 d72d27ee72b9 add '_' to several strings Muli Ben-Yehuda <mulix@mulix.org> parents: 1602 diff changeset	1998 raise util.Abort(_('cannot start server: ') + inst.args[1])
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1999
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2000 if ui.verbose:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2001 addr, port = httpd.socket.getsockname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2002 if addr == '0.0.0.0':
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2003 addr = socket.gethostname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2004 else:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2005 try:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2006 addr = socket.gethostbyaddr(addr)[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2007 except socket.error:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2008 pass
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2009 if port != 80:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2010 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2011 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2012 ui.status(_('listening at http://%s/\n') % addr)
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2013 httpd.serve_forever()
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	2014
731 91ca3afab8e8 Add name matching to status command. Bryan O'Sullivan <bos@serpentine.com> parents: 729 diff changeset	2015 def status(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2016 """show changed files in the working directory
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	2017
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	2018 Show changed files in the repository. If names are
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	2019 given, only files that match are shown.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2020
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2021 The codes used to show the status of files are:
746 9095e3456ea7 Change C to M in status mpm@selenic.com parents: 745 diff changeset	2022 M = modified
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2023 A = added
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2024 R = removed
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	2025 ! = deleted, but still tracked
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2026 ? = not tracked
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2027 """
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	2028
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	2029 files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	2030 modified, added, removed, deleted, unknown = [
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2031 [util.pathto(cwd, x) for x in n]
ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2032 for n in repo.changes(files=files, match=matchfn)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	2033
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2034 changetypes = [(_('modified'), 'M', modified),
ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2035 (_('added'), 'A', added),
ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2036 (_('removed'), 'R', removed),
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	2037 (_('deleted'), '!', deleted),
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2038 (_('unknown'), '?', unknown)]
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2039
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2040 end = opts['print0'] and '\0' or '\n'
1106 95a044b73bd5 Whitespace cleanup. Thomas Arendsen Hein <thomas@intevation.de> parents: 1105 diff changeset	2041
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2042 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2043 or changetypes):
1105 a906b018eaef Replaced hg status -p/--strip with -n/--no-status to not confuse with patch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1085 diff changeset	2044 if opts['no_status']:
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2045 format = "%%s%s" % end
6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2046 else:
6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2047 format = "%s %%s%s" % (char, end);
1106 95a044b73bd5 Whitespace cleanup. Thomas Arendsen Hein <thomas@intevation.de> parents: 1105 diff changeset	2048
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2049 for f in changes:
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2050 ui.write(format % f)
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	2051
1596 41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2052 def tag(ui, repo, name, rev_=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2053 """add a tag for the current tip or a given revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2054
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2055 Name a particular revision using <name>.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2056
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2057 Tags are used to name particular revisions of the repository and are
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2058 very useful to compare different revision, to go back to significant
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2059 earlier versions or to mark branch points as releases, etc.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2060
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2061 If no revision is given, the tip is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2062
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2063 To facilitate version control, distribution, and merging of tags,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2064 they are stored as a file named ".hgtags" which is managed
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2065 similarly to other project files and can be hand-edited if
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2066 necessary.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2067 """
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2068 if name == "tip":
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2069 raise util.Abort(_("the name 'tip' is reserved"))
1596 41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2070 if opts['rev']:
41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2071 rev_ = opts['rev']
41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2072 if rev_:
41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2073 r = hex(repo.lookup(rev_))
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2074 else:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2075 r = hex(repo.changelog.tip())
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2076
1561 9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2077 disallowed = (revrangesep, '\r', '\n')
9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2078 for c in disallowed:
9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2079 if name.find(c) >= 0:
9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2080 raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2081
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2082 if opts['local']:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2083 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2084 return
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2085
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2086 for x in repo.changes():
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	2087 if ".hgtags" in x:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2088 raise util.Abort(_("working copy of .hgtags is changed "
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2089 "(please commit .hgtags manually)"))
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2090
617 285965ddca41 open .hgtags as binary thananck@yahoo.com parents: 615 diff changeset	2091 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
710 ca9353f43345 Use dirstate to check if .hgtags needs to be added. Thomas Arendsen Hein <thomas@intevation.de> parents: 709 diff changeset	2092 if repo.dirstate.state(".hgtags") == '?':
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2093 repo.add([".hgtags"])
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2094
1496 3cf287a03664 remove the deprecated --text (t) option to rawcommit and tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1490 diff changeset	2095 message = (opts['message'] or
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2096 _("Added tag %s for changeset %s") % (name, r))
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2097 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2098 repo.commit([".hgtags"], message, opts['user'], opts['date'])
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2099 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2100 raise util.Abort(str(inst))
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2101
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2102 def tags(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2103 """list repository tags
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2104
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2105 List the repository tags.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2106
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2107 This lists both regular and local tags.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2108 """
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	2109
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	2110 l = repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	2111 l.reverse()
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	2112 for t, n in l:
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2113 try:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2114 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2115 except KeyError:
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	2116 r = " ?:?"
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	2117 ui.write("%-30s %s\n" % (t, r))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2118
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2119 def tip(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2120 """show the tip revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2121
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2122 Show the tip revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2123 """
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2124 n = repo.changelog.tip()
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	2125 show_changeset(ui, repo, changenode=n)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2126
1600 728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	2127 def unbundle(ui, repo, fname, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2128 """apply a changegroup file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2129
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2130 Apply a compressed changegroup file generated by the bundle
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2131 command.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2132 """
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2133 f = urllib.urlopen(fname)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2134
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2135 if f.read(4) != "HG10":
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2136 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2137
1374 c3654cfaa77d Fix hg unbundle chunking performance bug Eric Hopper <hopper@omnifarious.org> parents: 1373 diff changeset	2138 def bzgenerator(f):
c3654cfaa77d Fix hg unbundle chunking performance bug Eric Hopper <hopper@omnifarious.org> parents: 1373 diff changeset	2139 zd = bz2.BZ2Decompressor()
c3654cfaa77d Fix hg unbundle chunking performance bug Eric Hopper <hopper@omnifarious.org> parents: 1373 diff changeset	2140 for chunk in f:
c3654cfaa77d Fix hg unbundle chunking performance bug Eric Hopper <hopper@omnifarious.org> parents: 1373 diff changeset	2141 yield zd.decompress(chunk)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2142
1374 c3654cfaa77d Fix hg unbundle chunking performance bug Eric Hopper <hopper@omnifarious.org> parents: 1373 diff changeset	2143 bzgen = bzgenerator(util.filechunkiter(f, 4096))
1601 a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	2144 if repo.addchangegroup(util.chunkbuffer(bzgen)):
a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	2145 return 1
a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	2146
1600 728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	2147 if opts['update']:
728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	2148 return update(ui, repo)
728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	2149 else:
728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	2150 ui.status(_("(run 'hg update' to get a working copy)\n"))
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2151
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2152 def undo(ui, repo):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2153 """undo the last commit or pull
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2154
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2155 Roll back the last pull or commit transaction on the
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2156 repository, restoring the project to its earlier state.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2157
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2158 This command should be used with care. There is only one level of
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2159 undo and there is no redo.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2160
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2161 This command is not intended for use on public repositories. Once
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2162 a change is visible for pull by other users, undoing it locally is
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2163 ineffective.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2164 """
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	2165 repo.undo()
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	2166
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2167 def update(ui, repo, node=None, merge=False, clean=False, force=None,
db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2168 branch=None):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2169 """update or merge working directory
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2170
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2171 Update the working directory to the specified revision.
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2172
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2173 If there are no outstanding changes in the working directory and
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2174 there is a linear relationship between the current version and the
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2175 requested version, the result is the requested version.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2176
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2177 Otherwise the result is a merge between the contents of the
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2178 current working directory and the requested version. Files that
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2179 changed between either parent are marked as changed for the next
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2180 commit and a commit must be performed before any further updates
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2181 are allowed.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2182
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2183 By default, update will refuse to run if doing so would require
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2184 merging or discarding local changes.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2185 """
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2186 if branch:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2187 br = repo.branchlookup(branch=branch)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2188 found = []
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2189 for x in br:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2190 if branch in br[x]:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2191 found.append(x)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2192 if len(found) > 1:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2193 ui.warn(_("Found multiple heads for %s\n") % branch)
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2194 for x in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2195 show_changeset(ui, repo, changenode=x, brinfo=br)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2196 return 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2197 if len(found) == 1:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2198 node = found[0]
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2199 ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2200 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2201 ui.warn(_("branch %s not found\n") % (branch))
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2202 return 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2203 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2204 node = node and repo.lookup(node) or repo.changelog.tip()
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2205 return repo.update(node, allow=merge, force=clean, forcemerge=force)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2206
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	2207 def verify(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2208 """verify the integrity of the repository
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2209
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2210 Verify the integrity of the current repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2211
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2212 This will perform an extensive check of the repository's
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2213 integrity, validating the hashes and checksums of each entry in
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2214 the changelog, manifest, and tracked files, as well as the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2215 integrity of their crosslinks and indices.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2216 """
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	2217 return repo.verify()
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	2218
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2219 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2220
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2221 table = {
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2222 "^add":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2223 (add,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2224 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2225 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2226 _('hg add [OPTION]... [FILE]...')),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2227 "addremove":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2228 (addremove,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2229 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2230 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2231 _('hg addremove [OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2232 "^annotate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2233 (annotate,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2234 [('r', 'rev', '', _('annotate the specified revision')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2235 ('a', 'text', None, _('treat all files as text')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2236 ('u', 'user', None, _('list the author')),
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	2237 ('d', 'date', None, _('list the date')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2238 ('n', 'number', None, _('list the revision number (default)')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2239 ('c', 'changeset', None, _('list the changeset')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2240 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2241 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2242 _('hg annotate [OPTION]... FILE...')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2243 "bundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2244 (bundle,
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2245 [],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2246 _('hg bundle FILE DEST')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2247 "cat":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2248 (cat,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2249 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2250 ('X', 'exclude', [], _('exclude names matching the given patterns')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2251 ('o', 'output', '', _('print output to file with formatted name')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2252 ('r', 'rev', '', _('print the given revision'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2253 _('hg cat [OPTION]... FILE...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2254 "^clone":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2255 (clone,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2256 [('U', 'noupdate', None, _('do not update the new working directory')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2257 ('e', 'ssh', '', _('specify ssh command to use')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2258 ('', 'pull', None, _('use pull protocol to copy metadata')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2259 ('r', 'rev', [],
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2260 _('a changeset you would like to have after cloning')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2261 ('', 'remotecmd', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2262 _('specify hg command to run on the remote side'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2263 _('hg clone [OPTION]... SOURCE [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2264 "^commit\|ci":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2265 (commit,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2266 [('A', 'addremove', None, _('run addremove during commit')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2267 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2268 ('X', 'exclude', [], _('exclude names matching the given patterns')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2269 ('m', 'message', '', _('use <text> as commit message')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2270 ('l', 'logfile', '', _('read the commit message from <file>')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2271 ('d', 'date', '', _('record datecode as commit date')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2272 ('u', 'user', '', _('record user as commiter'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2273 _('hg commit [OPTION]... [FILE]...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2274 "copy\|cp":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2275 (copy,
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2276 [('I', 'include', [], _('include names matching the given patterns')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2277 ('X', 'exclude', [], _('exclude names matching the given patterns')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2278 ('A', 'after', None, _('record a copy that has already occurred')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2279 ('f', 'force', None,
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2280 _('forcibly copy over an existing managed file'))],
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2281 _('hg copy [OPTION]... [SOURCE]... DEST')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2282 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2283 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2284 "debugconfig": (debugconfig, [], _('debugconfig')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2285 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2286 "debugstate": (debugstate, [], _('debugstate')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2287 "debugdata": (debugdata, [], _('debugdata FILE REV')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2288 "debugindex": (debugindex, [], _('debugindex FILE')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2289 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2290 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2291 "debugwalk":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2292 (debugwalk,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2293 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2294 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2295 _('debugwalk [OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2296 "^diff":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2297 (diff,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2298 [('r', 'rev', [], _('revision')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2299 ('a', 'text', None, _('treat all files as text')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2300 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2301 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2302 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2303 "^export":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2304 (export,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2305 [('o', 'output', '', _('print output to file with formatted name')),
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	2306 ('a', 'text', None, _('treat all files as text')),
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	2307 ('', 'switch-parent', None, _('diff against the second parent'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2308 _('hg export [-a] [-o OUTFILE] REV...')),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2309 "forget":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2310 (forget,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2311 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2312 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2313 _('hg forget [OPTION]... FILE...')),
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	2314 "grep":
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	2315 (grep,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2316 [('0', 'print0', None, _('end fields with NUL')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2317 ('I', 'include', [], _('include names matching the given patterns')),
1490 c3ffdb2c4091 minor doc fix Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1483 diff changeset	2318 ('X', 'exclude', [], _('exclude names matching the given patterns')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2319 ('', 'all', None, _('print all revisions that match')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2320 ('i', 'ignore-case', None, _('ignore case when matching')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2321 ('l', 'files-with-matches', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2322 _('print only filenames and revs that match')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2323 ('n', 'line-number', None, _('print matching line numbers')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2324 ('r', 'rev', [], _('search in given revision range')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2325 ('u', 'user', None, _('print user who committed change'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2326 _('hg grep [OPTION]... PATTERN [FILE]...')),
905 65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	2327 "heads":
65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	2328 (heads,
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1547 diff changeset	2329 [('b', 'branches', None, _('find branch info')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2330 ('r', 'rev', '', _('show only heads which are descendants of rev'))],
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1547 diff changeset	2331 _('hg heads [-b] [-r <rev>]')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2332 "help": (help_, [], _('hg help [COMMAND]')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2333 "identify\|id": (identify, [], _('hg identify')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2334 "import\|patch":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2335 (import_,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2336 [('p', 'strip', 1,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2337 _('directory strip option for patch. This has the same\n') +
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2338 _('meaning as the corresponding patch option')),
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2339 ('f', 'force', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2340 _('skip check for outstanding uncommitted changes')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2341 ('b', 'base', '', _('base path'))],
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2342 _('hg import [-f] [-p NUM] [-b BASE] PATCH...')),
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2343 "incoming\|in": (incoming,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2344 [('M', 'no-merges', None, _('do not show merges')),
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2345 ('p', 'patch', None, _('show patch')),
65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2346 ('n', 'newest-first', None, _('show newest record first'))],
65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2347 _('hg incoming [-p] [-n] [-M] [SOURCE]')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2348 "^init": (init, [], _('hg init [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2349 "locate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2350 (locate,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2351 [('r', 'rev', '', _('search the repository as it stood at rev')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2352 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2353 _('end filenames with NUL, for use with xargs')),
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2354 ('f', 'fullpath', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2355 _('print complete paths from the filesystem root')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2356 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2357 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2358 _('hg locate [OPTION]... [PATTERN]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2359 "^log\|history":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2360 (log,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2361 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2362 ('X', 'exclude', [], _('exclude names matching the given patterns')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2363 ('b', 'branch', None, _('show branches')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2364 ('k', 'keyword', [], _('search for a keyword')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2365 ('r', 'rev', [], _('show the specified revision or range')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2366 ('M', 'no-merges', None, _('do not show merges')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2367 ('m', 'only-merges', None, _('show only merges')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2368 ('p', 'patch', None, _('show patch'))],
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2369 _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2370 "manifest": (manifest, [], _('hg manifest [REV]')),
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2371 "outgoing\|out": (outgoing,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2372 [('M', 'no-merges', None, _('do not show merges')),
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2373 ('p', 'patch', None, _('show patch')),
65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2374 ('n', 'newest-first', None, _('show newest record first'))],
65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2375 _('hg outgoing [-p] [-n] [-M] [DEST]')),
1475 d791c335fb7b Elevate parents to a "common" command in help Matt Mackall <mpm@selenic.com> parents: 1472 diff changeset	2376 "^parents": (parents, [], _('hg parents [REV]')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2377 "paths": (paths, [], _('hg paths [NAME]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2378 "^pull":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2379 (pull,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2380 [('u', 'update', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2381 _('update the working directory to tip after pull')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2382 ('e', 'ssh', '', _('specify ssh command to use')),
1469 0847c45ffee6 Merge bundle -r work from Eric Hopper Matt Mackall <mpm@selenic.com> parents: 1456 1467 diff changeset	2383 ('r', 'rev', [], _('a specific revision you would like to pull')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2384 ('', 'remotecmd', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2385 _('specify hg command to run on the remote side'))],
1469 0847c45ffee6 Merge bundle -r work from Eric Hopper Matt Mackall <mpm@selenic.com> parents: 1456 1467 diff changeset	2386 _('hg pull [-u] [-e FILE] [-r rev] [--remotecmd FILE] [SOURCE]')),
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	2387 "^push":
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	2388 (push,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2389 [('f', 'force', None, _('force push')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2390 ('e', 'ssh', '', _('specify ssh command to use')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2391 ('', 'remotecmd', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2392 _('specify hg command to run on the remote side'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2393 _('hg push [-f] [-e FILE] [--remotecmd FILE] [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2394 "rawcommit":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2395 (rawcommit,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2396 [('p', 'parent', [], _('parent')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2397 ('d', 'date', '', _('date code')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2398 ('u', 'user', '', _('user')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2399 ('F', 'files', '', _('file list')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2400 ('m', 'message', '', _('commit message')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2401 ('l', 'logfile', '', _('commit message file'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2402 _('hg rawcommit [OPTION]... [FILE]...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2403 "recover": (recover, [], _('hg recover')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2404 "^remove\|rm":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2405 (remove,
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2406 [('I', 'include', [], _('include names matching the given patterns')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2407 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2408 _('hg remove [OPTION]... FILE...')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2409 "rename\|mv":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2410 (rename,
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2411 [('I', 'include', [], _('include names matching the given patterns')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2412 ('X', 'exclude', [], _('exclude names matching the given patterns')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2413 ('A', 'after', None, _('record a rename that has already occurred')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2414 ('f', 'force', None,
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2415 _('forcibly copy over an existing managed file'))],
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2416 _('hg rename [OPTION]... [SOURCE]... DEST')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2417 "^revert":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2418 (revert,
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	2419 [('I', 'include', [], _('include names matching the given patterns')),
3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	2420 ('X', 'exclude', [], _('exclude names matching the given patterns')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2421 ('r', 'rev', '', _('revision to revert to'))],
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2422 _('hg revert [-n] [-r REV] [NAME]...')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2423 "root": (root, [], _('hg root')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2424 "^serve":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2425 (serve,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2426 [('A', 'accesslog', '', _('name of access log file to write to')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2427 ('E', 'errorlog', '', _('name of error log file to write to')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2428 ('p', 'port', 0, _('port to use (default: 8000)')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2429 ('a', 'address', '', _('address to use')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2430 ('n', 'name', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2431 _('name to show in web pages (default: working dir)')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2432 ('', 'stdio', None, _('for remote clients')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2433 ('t', 'templates', '', _('web templates to use')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2434 ('', 'style', '', _('template style to use')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2435 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2436 _('hg serve [OPTION]...')),
1507 cd8fadd8c689 Add explicit 'st' alias for status Matt Mackall <mpm@selenic.com> parents: 1506 diff changeset	2437 "^status\|st":
840 141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	2438 (status,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2439 [('m', 'modified', None, _('show only modified files')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2440 ('a', 'added', None, _('show only added files')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2441 ('r', 'removed', None, _('show only removed files')),
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	2442 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2443 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2444 ('n', 'no-status', None, _('hide status prefix')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2445 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2446 _('end filenames with NUL, for use with xargs')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2447 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2448 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2449 _('hg status [OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2450 "tag":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2451 (tag,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2452 [('l', 'local', None, _('make the tag local')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2453 ('m', 'message', '', _('message for tag commit log entry')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2454 ('d', 'date', '', _('record datecode as commit date')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2455 ('u', 'user', '', _('record user as commiter')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2456 ('r', 'rev', '', _('revision to tag'))],
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2457 _('hg tag [OPTION]... NAME [REV]')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2458 "tags": (tags, [], _('hg tags')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2459 "tip": (tip, [], _('hg tip')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2460 "unbundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2461 (unbundle,
1601 a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	2462 [('u', 'update', None,
a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	2463 _('update the working directory to tip after unbundle'))],
1600 728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	2464 _('hg unbundle [-u] FILE')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2465 "undo": (undo, [], _('hg undo')),
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	2466 "^update\|up\|checkout\|co":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2467 (update,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2468 [('b', 'branch', '', _('checkout the head of a specific branch')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2469 ('m', 'merge', None, _('allow merging of branches')),
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2470 ('C', 'clean', None, _('overwrite locally modified files')),
db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2471 ('f', 'force', None, _('force a merge with outstanding changes'))],
db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2472 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2473 "verify": (verify, [], _('hg verify')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2474 "version": (show_version, [], _('hg version')),
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	2475 }
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2476
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	2477 globalopts = [
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2478 ('R', 'repository', '', _('repository root directory')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2479 ('', 'cwd', '', _('change working directory')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2480 ('y', 'noninteractive', None,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2481 _('do not prompt, assume \'yes\' for any required answers')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2482 ('q', 'quiet', None, _('suppress output')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2483 ('v', 'verbose', None, _('enable additional output')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2484 ('', 'debug', None, _('enable debugging output')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2485 ('', 'debugger', None, _('start debugger')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2486 ('', 'traceback', None, _('print traceback on exception')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2487 ('', 'time', None, _('time how long the command takes')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2488 ('', 'profile', None, _('print command execution profile')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2489 ('', 'version', None, _('output version information and exit')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2490 ('h', 'help', None, _('display help and exit')),
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	2491 ]
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2492
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	2493 norepo = ("clone init version help debugancestor debugconfig debugdata"
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	2494 " debugindex debugindexdot paths")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2495
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2496 def find(cmd):
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2497 """Return (aliases, command table entry) for command string."""
b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2498 choice = None
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2499 for e in table.keys():
1506 11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	2500 aliases = e.lstrip("^").split("\|")
11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	2501 if cmd in aliases:
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2502 return aliases, table[e]
1506 11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	2503 for a in aliases:
11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	2504 if a.startswith(cmd):
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2505 if choice:
1518 ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	2506 raise AmbiguousCommand(cmd)
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2507 else:
b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2508 choice = aliases, table[e]
1520 95ee4f12fbd9 Allow ambiguous command shortcut if only an alias for the same command. Thomas Arendsen Hein <thomas@intevation.de> parents: 1519 diff changeset	2509 break
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2510 if choice:
b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	2511 return choice
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2512
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2513 raise UnknownCommand(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2514
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2515 class SignalInterrupt(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2516 """Exception raised on SIGTERM and SIGHUP."""
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2517
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2518 def catchterm(*args):
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2519 raise SignalInterrupt
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2520
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	2521 def run():
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	2522 sys.exit(dispatch(sys.argv[1:]))
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	2523
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2524 class ParseError(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2525 """Exception raised on errors in parsing the command line."""
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2526
1453 6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	2527 def parse(ui, args):
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2528 options = {}
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2529 cmdoptions = {}
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2530
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2531 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2532 args = fancyopts.fancyopts(args, globalopts, options)
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2533 except fancyopts.getopt.GetoptError, inst:
618 4051b78c53c7 Handle unrecognised options correctly. Bryan O'Sullivan <bos@serpentine.com> parents: 617 diff changeset	2534 raise ParseError(None, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2535
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2536 if args:
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2537 cmd, args = args[0], args[1:]
1567 b4956bbbadc9 make command defaults works for aliases TK Soh <teekaysoh@yahoo.com> parents: 1565 diff changeset	2538 aliases, i = find(cmd)
b4956bbbadc9 make command defaults works for aliases TK Soh <teekaysoh@yahoo.com> parents: 1565 diff changeset	2539 cmd = aliases[0]
1453 6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	2540 defaults = ui.config("defaults", cmd)
6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	2541 if defaults:
1526 c230939283c3 fix a bug where command defaults suppress global options TK Soh <teekaysoh@yahoo.com> parents: 1525 diff changeset	2542 args = defaults.split() + args
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2543 c = list(i[1])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2544 else:
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2545 cmd = None
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2546 c = []
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2547
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2548 # combine global options into local
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2549 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2550 c.append((o[0], o[1], options[o[1]], o[3]))
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2551
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	2552 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2553 args = fancyopts.fancyopts(args, c, cmdoptions)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	2554 except fancyopts.getopt.GetoptError, inst:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2555 raise ParseError(cmd, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2556
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2557 # separate global options back out
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2558 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2559 n = o[1]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2560 options[n] = cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2561 del cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2562
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2563 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2564
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2565 def dispatch(args):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2566 signal.signal(signal.SIGTERM, catchterm)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2567 try:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2568 signal.signal(signal.SIGHUP, catchterm)
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2569 except AttributeError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2570 pass
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2571
1483 a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	2572 try:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	2573 u = ui.ui()
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	2574 except util.Abort, inst:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	2575 sys.stderr.write(_("abort: %s\n") % inst)
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	2576 sys.exit(1)
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	2577
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2578 external = []
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2579 for x in u.extensions():
1545 d69070c2547a fix errors found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1543 diff changeset	2580 def on_exception(exc, inst):
1424 918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2581 u.warn(_("*** failed to import extension %s\n") % x[1])
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2582 u.warn("%s\n" % inst)
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2583 if "--traceback" in sys.argv[1:]:
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2584 traceback.print_exc()
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2585 if x[1]:
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	2586 try:
5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	2587 mod = imp.load_source(x[0], x[1])
1424 918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2588 except Exception, inst:
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2589 on_exception(Exception, inst)
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	2590 continue
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2591 else:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2592 def importh(name):
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2593 mod = __import__(name)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2594 components = name.split('.')
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2595 for comp in components[1:]:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2596 mod = getattr(mod, comp)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2597 return mod
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	2598 try:
5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	2599 mod = importh(x[0])
1424 918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2600 except Exception, inst:
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	2601 on_exception(Exception, inst)
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	2602 continue
5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	2603
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2604 external.append(mod)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2605 for x in external:
1295 abcdf14449ea Make contract with extensions optional. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	2606 cmdtable = getattr(x, 'cmdtable', {})
abcdf14449ea Make contract with extensions optional. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	2607 for t in cmdtable:
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2608 if t in table:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2609 u.warn(_("module %s overrides %s\n") % (x.__name__, t))
1295 abcdf14449ea Make contract with extensions optional. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	2610 table.update(cmdtable)
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2611
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2612 try:
1453 6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	2613 cmd, func, args, options, cmdoptions = parse(u, args)
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2614 except ParseError, inst:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2615 if inst.args[0]:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2616 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2617 help_(u, inst.args[0])
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2618 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2619 u.warn(_("hg: %s\n") % inst.args[1])
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	2620 help_(u, 'shortlist')
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2621 sys.exit(-1)
1518 ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	2622 except AmbiguousCommand, inst:
ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	2623 u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])
ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	2624 sys.exit(1)
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2625 except UnknownCommand, inst:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2626 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	2627 help_(u, 'shortlist')
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2628 sys.exit(1)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2629
783 4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2630 if options["time"]:
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2631 def get_times():
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2632 t = os.times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2633 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2634 t = (t[0], t[1], t[2], t[3], time.clock())
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2635 return t
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2636 s = get_times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2637 def print_time():
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2638 t = get_times()
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2639 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
783 4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2640 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2641 atexit.register(print_time)
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	2642
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2643 u.updateopts(options["verbose"], options["debug"], options["quiet"],
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2644 not options["noninteractive"])
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	2645
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2646 # enter the debugger before command execution
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2647 if options['debugger']:
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2648 pdb.set_trace()
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2649
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	2650 try:
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2651 try:
1048 7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	2652 if options['help']:
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	2653 help_(u, cmd, options['version'])
1048 7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	2654 sys.exit(0)
7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	2655 elif options['version']:
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2656 show_version(u)
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2657 sys.exit(0)
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2658 elif not cmd:
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2659 help_(u, 'shortlist')
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2660 sys.exit(0)
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	2661
1050 9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	2662 if options['cwd']:
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	2663 try:
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	2664 os.chdir(options['cwd'])
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	2665 except OSError, inst:
1227 e3ea354d99b2 Replace sequences of {ui.warn, return 1} with raise of util.Abort. Bryan O'Sullivan <bos@serpentine.com> parents: 1225 diff changeset	2666 raise util.Abort('%s: %s' %
e3ea354d99b2 Replace sequences of {ui.warn, return 1} with raise of util.Abort. Bryan O'Sullivan <bos@serpentine.com> parents: 1225 diff changeset	2667 (options['cwd'], inst.strerror))
1050 9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	2668
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2669 if cmd not in norepo.split():
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2670 path = options["repository"] or ""
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2671 repo = hg.repository(ui=u, path=path)
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2672 for x in external:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2673 if hasattr(x, 'reposetup'):
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2674 x.reposetup(u, repo)
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2675 d = lambda: func(u, repo, args, *cmdoptions)
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2676 else:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2677 d = lambda: func(u, args, *cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2678
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2679 if options['profile']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2680 import hotshot, hotshot.stats
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2681 prof = hotshot.Profile("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2682 r = prof.runcall(d)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2683 prof.close()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2684 stats = hotshot.stats.load("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2685 stats.strip_dirs()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2686 stats.sort_stats('time', 'calls')
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2687 stats.print_stats(40)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2688 return r
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2689 else:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2690 return d()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2691 except:
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2692 # enter the debugger when we hit an exception
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2693 if options['debugger']:
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2694 pdb.post_mortem(sys.exc_info()[2])
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2695 if options['traceback']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2696 traceback.print_exc()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2697 raise
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	2698 except hg.RepoError, inst:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2699 u.warn(_("abort: "), inst, "!\n")
1214 34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1212 diff changeset	2700 except revlog.RevlogError, inst:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2701 u.warn(_("abort: "), inst, "!\n")
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2702 except SignalInterrupt:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2703 u.warn(_("killed!\n"))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2704 except KeyboardInterrupt:
832 b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	2705 try:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2706 u.warn(_("interrupted!\n"))
832 b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	2707 except IOError, inst:
b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	2708 if inst.errno == errno.EPIPE:
b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	2709 if u.debugflag:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2710 u.warn(_("\nbroken pipe\n"))
832 b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	2711 else:
b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	2712 raise
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	2713 except IOError, inst:
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	2714 if hasattr(inst, "code"):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2715 u.warn(_("abort: %s\n") % inst)
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	2716 elif hasattr(inst, "reason"):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2717 u.warn(_("abort: error: %s\n") % inst.reason[1])
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	2718 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	2719 if u.debugflag:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2720 u.warn(_("broken pipe\n"))
1350 3729e2773cca Fix pipe error regression Matt Mackall <mpm@selenic.com> parents: 1342 diff changeset	2721 elif getattr(inst, "strerror", None):
1354 8cf364c65425 Made the abort message for IOError nicer when the filename is known. Eric Hopper <hopper@omnifarious.org> parents: 1350 diff changeset	2722 if getattr(inst, "filename", None):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2723 u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
1354 8cf364c65425 Made the abort message for IOError nicer when the filename is known. Eric Hopper <hopper@omnifarious.org> parents: 1350 diff changeset	2724 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2725 u.warn(_("abort: %s\n") % inst.strerror)
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	2726 else:
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	2727 raise
549 92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2728 except OSError, inst:
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2729 if hasattr(inst, "filename"):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2730 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
549 92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2731 else:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2732 u.warn(_("abort: %s\n") % inst.strerror)
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	2733 except util.Abort, inst:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2734 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	2735 sys.exit(1)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2736 except TypeError, inst:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2737 # was this an argument error?
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2738 tb = traceback.extract_tb(sys.exc_info()[2])
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2739 if len(tb) > 2: # no
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2740 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	2741 u.debug(inst, "\n")
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2742 u.warn(_("%s: invalid arguments\n") % cmd)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2743 help_(u, cmd)
1536 b4ed825282fe Catch the exception raised with 'hg help <somethingambiguous>'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1525 diff changeset	2744 except AmbiguousCommand, inst:
b4ed825282fe Catch the exception raised with 'hg help <somethingambiguous>'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1525 diff changeset	2745 u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])
b4ed825282fe Catch the exception raised with 'hg help <somethingambiguous>'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1525 diff changeset	2746 help_(u, 'shortlist')
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	2747 except UnknownCommand, inst:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2748 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	2749 help_(u, 'shortlist')
1215 8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2750 except SystemExit:
1229 2eb1cd695dd2 Fix comment typo mpm@selenic.com parents: 1227 diff changeset	2751 # don't catch this in the catch-all below
1215 8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2752 raise
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2753 except:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2754 u.warn(_("** unknown exception encountered, details follow\n"))
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2755 u.warn(_("** report bug details to mercurial@selenic.com\n"))
1552 7509fa02437f Added version information to "report bug" message for unknown exceptions. Thomas Arendsen Hein <thomas@intevation.de> parents: 1551 diff changeset	2756 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
7509fa02437f Added version information to "report bug" message for unknown exceptions. Thomas Arendsen Hein <thomas@intevation.de> parents: 1551 diff changeset	2757 % version.get_version())
1215 8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2758 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	2759
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	2760 sys.exit(-1)

Mercurial > hg > pyhgsh

annotate mercurial/commands.py @ 1619:1ba0d7041ac4