Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/commands.py @ 1598:14d1f1868bf6
cleanup of revlog.group when repository is local
revlog.group cached every chunk from the revlog, the behaviour was
needed to minimize the roundtrip with old-http.
We now cache the revlog data ~4MB at a time.
The memory used server side when pulling goes down to 35Mo maximum
whereas without the patch more than 160Mo was used when cloning the linux kernel
repository.
The time used by cloning is higher mainly because of the check in revlog.revision.
before
110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+708707minor)pagefaults 0swaps
after
117.56user 18.86system 2:50.43elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+748366minor)pagefaults 0swaps
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 27 Dec 2005 13:09:49 -0600 |
| parents | 41366b7d6709 |
| children | 728fd9584993 |
| rev | line source |
|---|---|
| 249 | 1 # commands.py - command processing for mercurial |
| 2 # | |
| 3 # Copyright 2005 Matt Mackall <mpm@selenic.com> | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms | |
| 6 # of the GNU General Public License, incorporated herein by reference. | |
| 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 | 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 | 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 | 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 | 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 | 20 |
| 245 | 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 | 23 |
| 245 | 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 | 28 return l |
| 29 | |
| 209 | 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 | 34 return args |
| 245 | 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 | 90 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0'])) |
| 91 wanted = {} | |
| 92 slowpath = anypats | |
| 93 window = 300 | |
| 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 | 103 if not slowpath and not files: |
| 104 # No files, no patterns. Display all revs. | |
| 105 wanted = dict(zip(revs, revs)) | |
| 106 if not slowpath: | |
| 107 # Only files, no patterns. Check the history of each file. | |
| 108 def filerevgen(filelog): | |
| 109 for i in xrange(filelog.count() - 1, -1, -window): | |
| 110 revs = [] | |
| 111 for j in xrange(max(0, i - window), i + 1): | |
| 112 revs.append(filelog.linkrev(filelog.node(j))) | |
| 113 revs.reverse() | |
| 114 for rev in revs: | |
| 115 yield rev | |
| 116 | |
| 117 minrev, maxrev = min(revs), max(revs) | |
| 118 for file in files: | |
| 119 filelog = repo.file(file) | |
| 120 # A zero count may be a directory or deleted file, so | |
| 121 # try to find matching entries on the slow path. | |
| 122 if filelog.count() == 0: | |
| 123 slowpath = True | |
| 124 break | |
| 125 for rev in filerevgen(filelog): | |
| 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 | 129 fncache.setdefault(rev, []) |
| 130 fncache[rev].append(file) | |
| 131 wanted[rev] = 1 | |
| 132 if slowpath: | |
| 133 # The slow path checks files modified in every changeset. | |
| 134 def changerevgen(): | |
| 135 for i in xrange(repo.changelog.count() - 1, -1, -window): | |
| 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 | 138 |
| 139 for rev, changefiles in changerevgen(): | |
| 140 matches = filter(matchfn, changefiles) | |
| 141 if matches: | |
| 142 fncache[rev] = matches | |
| 143 wanted[rev] = 1 | |
| 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 | 158 |
| 580 | 159 revrangesep = ':' |
| 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 | 163 if revlog is None: |
| 164 revlog = repo.changelog | |
| 165 revcount = revlog.count() | |
| 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 | 169 try: |
| 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 |
|
1257
fe7fbfdb066d
Clamp negative rev numbers at zero.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1255
diff
changeset
|
173 if num < 0: num += revcount |
|
fe7fbfdb066d
Clamp negative rev numbers at zero.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1255
diff
changeset
|
174 if num < 0: num = 0 |
|
fe7fbfdb066d
Clamp negative rev numbers at zero.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1255
diff
changeset
|
175 elif num >= revcount: |
| 580 | 176 raise ValueError |
| 177 except ValueError: | |
| 178 try: | |
| 179 num = repo.changelog.rev(repo.lookup(val)) | |
| 180 except KeyError: | |
| 181 try: | |
| 182 num = revlog.rev(revlog.lookup(val)) | |
| 183 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
|
184 raise util.Abort(_('invalid revision identifier %s'), val) |
| 580 | 185 return num |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
186 seen = {} |
| 580 | 187 for spec in revs: |
| 188 if spec.find(revrangesep) >= 0: | |
| 189 start, end = spec.split(revrangesep, 1) | |
| 190 start = fix(start, 0) | |
| 191 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
|
192 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
|
193 for rev in xrange(start, end+step, step): |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
194 if rev in seen: continue |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
195 seen[rev] = 1 |
| 580 | 196 yield str(rev) |
| 197 else: | |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
198 rev = fix(spec, None) |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
199 if rev in seen: continue |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
200 seen[rev] = 1 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
201 yield str(rev) |
| 580 | 202 |
|
739
36edb39e8e8c
Split make_file back out into make_filename and make_file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
738
diff
changeset
|
203 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
|
204 total=None, seqno=None, revwidth=None, pathname=None): |
| 632 | 205 node_expander = { |
| 1092 | 206 'H': lambda: hex(node), |
| 632 | 207 'R': lambda: str(r.rev(node)), |
| 1092 | 208 'h': lambda: short(node), |
| 632 | 209 } |
| 210 expander = { | |
| 211 '%': lambda: '%', | |
| 212 'b': lambda: os.path.basename(repo.root), | |
| 213 } | |
| 214 | |
|
727
acee766fcb79
Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
Bryan O'Sullivan <bos@serpentine.com>
parents:
726
diff
changeset
|
215 try: |
|
acee766fcb79
Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
Bryan O'Sullivan <bos@serpentine.com>
parents:
726
diff
changeset
|
216 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
|
217 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
|
218 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
|
219 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
|
220 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
|
221 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
|
222 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
|
223 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
|
224 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
|
225 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
|
226 if pathname is not None: |
|
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
227 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
|
228 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
|
229 expander['p'] = lambda: pathname |
| 632 | 230 |
|
727
acee766fcb79
Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
Bryan O'Sullivan <bos@serpentine.com>
parents:
726
diff
changeset
|
231 newname = [] |
|
acee766fcb79
Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
Bryan O'Sullivan <bos@serpentine.com>
parents:
726
diff
changeset
|
232 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
|
233 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
|
234 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
|
235 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
|
236 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
|
237 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
|
238 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
|
239 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
|
240 newname.append(c) |
| 632 | 241 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
|
242 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
|
243 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
|
244 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
|
245 inst.args[0]) |
| 632 | 246 |
|
739
36edb39e8e8c
Split make_file back out into make_filename and make_file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
738
diff
changeset
|
247 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
|
248 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
|
249 if not pat or pat == '-': |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
250 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
|
251 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
|
252 return pat |
|
36edb39e8e8c
Split make_file back out into make_filename and make_file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
738
diff
changeset
|
253 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
|
254 return pat |
|
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
255 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
|
256 pathname), |
|
739
36edb39e8e8c
Split make_file back out into make_filename and make_file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
738
diff
changeset
|
257 mode) |
|
36edb39e8e8c
Split make_file back out into make_filename and make_file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
738
diff
changeset
|
258 |
| 1014 | 259 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
|
260 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
|
261 if not changes: |
| 1062 | 262 (c, a, d, u) = repo.changes(node1, node2, files, match=match) |
|
904
969647d5100a
Add optional parameter for changed/added/del/unknown files to commands.dodiff
mason@suse.com
parents:
899
diff
changeset
|
263 else: |
|
969647d5100a
Add optional parameter for changed/added/del/unknown files to commands.dodiff
mason@suse.com
parents:
899
diff
changeset
|
264 (c, a, d, u) = changes |
| 537 | 265 if files: |
| 266 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | |
| 267 | |
| 268 if not c and not a and not d: | |
| 269 return | |
| 270 | |
| 245 | 271 if node2: |
| 272 change = repo.changelog.read(node2) | |
| 273 mmap2 = repo.manifest.read(change[0]) | |
|
1321
b47f96a178a3
Clean up date and timezone handling.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1320
diff
changeset
|
274 date2 = util.datestr(change[2]) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
275 def read(f): |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
276 return repo.file(f).read(mmap2[f]) |
| 245 | 277 else: |
|
1320
5f277e73778f
Fix up representation of dates in hgweb.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1319
diff
changeset
|
278 date2 = util.datestr() |
| 245 | 279 if not node1: |
| 280 node1 = repo.dirstate.parents()[0] | |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
281 def read(f): |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
282 return repo.wfile(f).read() |
| 245 | 283 |
|
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
|
284 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
|
285 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
|
286 else: |
| 1092 | 287 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
|
288 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
|
289 |
| 245 | 290 change = repo.changelog.read(node1) |
| 291 mmap = repo.manifest.read(change[0]) | |
|
1321
b47f96a178a3
Clean up date and timezone handling.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1320
diff
changeset
|
292 date1 = util.datestr(change[2]) |
| 245 | 293 |
| 294 for f in c: | |
| 275 | 295 to = None |
| 296 if f in mmap: | |
| 297 to = repo.file(f).read(mmap[f]) | |
| 245 | 298 tn = read(f) |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
1014
diff
changeset
|
299 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text)) |
| 245 | 300 for f in a: |
|
264
4c1d7072d5cd
Attempt to make diff deal with null sources properly
mpm@selenic.com
parents:
262
diff
changeset
|
301 to = None |
| 245 | 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)) |
| 245 | 304 for f in d: |
| 305 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
|
306 tn = None |
|
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)) |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
308 |
| 1147 | 309 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
|
310 """trim the name of the user who committed a change""" |
| 1147 | 311 user = revcache.get(rev) |
| 312 if user is None: | |
| 313 user = revcache[rev] = ui.shortuser(name) | |
| 314 return user | |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
315 |
|
1031
503aaf19a040
Rewrite log command. New version is faster and more featureful.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1030
diff
changeset
|
316 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
|
317 """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
|
318 log = repo.changelog |
|
503aaf19a040
Rewrite log command. New version is faster and more featureful.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1030
diff
changeset
|
319 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
|
320 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
|
321 elif not rev: |
|
503aaf19a040
Rewrite log command. New version is faster and more featureful.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1030
diff
changeset
|
322 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
|
323 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
324 if ui.quiet: |
| 1092 | 325 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
|
326 return |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
327 |
|
1031
503aaf19a040
Rewrite log command. New version is faster and more featureful.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1030
diff
changeset
|
328 changes = log.read(changenode) |
|
1321
b47f96a178a3
Clean up date and timezone handling.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1320
diff
changeset
|
329 date = util.datestr(changes[2]) |
|
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
966
diff
changeset
|
330 |
| 1092 | 331 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
|
332 for p in log.parents(changenode) |
| 1092 | 333 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
|
334 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
|
335 parents = [] |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
336 |
| 778 | 337 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
|
338 ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode))) |
| 778 | 339 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
|
340 ui.write(_("changeset: %d:%s\n") % (rev, short(changenode))) |
| 778 | 341 |
| 687 | 342 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
|
343 ui.status(_("tag: %s\n") % tag) |
| 687 | 344 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
|
345 ui.write(_("parent: %d:%s\n") % parent) |
| 778 | 346 |
| 898 | 347 if brinfo and changenode in brinfo: |
| 348 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
|
349 ui.write(_("branch: %s\n") % " ".join(br)) |
| 898 | 350 |
|
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
|
351 ui.debug(_("manifest: %d:%s\n") % (repo.manifest.rev(changes[0]), |
| 1092 | 352 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
|
353 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
|
354 ui.status(_("date: %s\n") % date) |
| 778 | 355 |
|
493
30752b14f759
Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
356 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
|
357 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
|
358 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
|
359 if value: |
|
df9b77f67998
Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
360 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
|
361 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
|
362 ui.note(_("files: %s\n") % " ".join(changes[3])) |
| 778 | 363 |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
364 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
|
365 if description: |
| 330 | 366 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
|
367 ui.status(_("description:\n")) |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
368 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
|
369 ui.status("\n\n") |
| 330 | 370 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
|
371 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
|
372 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
|
373 |
|
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
374 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
|
375 """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
|
376 ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
377 % 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
|
378 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
|
379 "\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
|
380 "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
|
381 "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
|
382 "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
|
383 )) |
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
384 |
|
1049
160a68cd393f
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
385 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
|
386 """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
|
387 option_lists = [] |
|
846
a30f7ee30914
When hg is invoked without parameters, the short list help is displayed.
kreijack@inwind.REMOVEME.it
parents:
845
diff
changeset
|
388 if cmd and cmd != 'shortlist': |
|
1049
160a68cd393f
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
389 if with_version: |
|
160a68cd393f
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
390 show_version(ui) |
|
160a68cd393f
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
391 ui.write('\n') |
|
1517
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
392 aliases, i = find(cmd) |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
393 # synopsis |
|
848
221628fe9b62
Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
846
diff
changeset
|
394 ui.write("%s\n\n" % i[2]) |
| 293 | 395 |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
396 # description |
|
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
397 doc = i[0].__doc__ |
|
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
398 if ui.quiet: |
|
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
399 doc = doc.splitlines(0)[0] |
|
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
400 ui.write("%s\n" % doc.rstrip()) |
|
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
401 |
|
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
402 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
|
403 # aliases |
|
1517
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
404 if len(aliases) > 1: |
|
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
405 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
406 |
|
1052
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
407 # options |
|
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
408 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
|
409 option_lists.append(("options", i[1])) |
| 293 | 410 |
| 255 | 411 else: |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
412 # program name |
|
1049
160a68cd393f
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
413 if ui.verbose or with_version: |
|
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
414 show_version(ui) |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
415 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
|
416 ui.status(_("Mercurial Distributed SCM\n")) |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
417 ui.status('\n') |
|
843
859e7ea530bd
'hg help -v' shows global options
kreijack@inwind.REMOVEME.it
parents:
842
diff
changeset
|
418 |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
419 # 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
|
420 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
|
421 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
|
422 '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
|
423 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
|
424 ui.status(_('list of commands:\n\n')) |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
425 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
|
426 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
|
427 'to show aliases and global options):\n\n')) |
| 209 | 428 |
| 255 | 429 h = {} |
|
844
5a717cfa7406
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it
parents:
843
diff
changeset
|
430 cmds = {} |
|
479
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
431 for c, e in table.items(): |
|
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
432 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
|
433 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
|
434 continue |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
435 f = f.lstrip("^") |
| 593 | 436 if not ui.debugflag and f.startswith("debug"): |
| 437 continue | |
| 255 | 438 d = "" |
|
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
439 if e[0].__doc__: |
|
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
440 d = e[0].__doc__.splitlines(0)[0].rstrip() |
|
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
441 h[f] = d |
|
844
5a717cfa7406
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it
parents:
843
diff
changeset
|
442 cmds[f]=c.lstrip("^") |
| 255 | 443 |
| 444 fns = h.keys() | |
| 445 fns.sort() | |
| 446 m = max(map(len, fns)) | |
| 447 for f in fns: | |
|
844
5a717cfa7406
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it
parents:
843
diff
changeset
|
448 if ui.verbose: |
|
5a717cfa7406
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it
parents:
843
diff
changeset
|
449 commands = cmds[f].replace("|",", ") |
|
5a717cfa7406
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it
parents:
843
diff
changeset
|
450 ui.write(" %s:\n %s\n"%(commands,h[f])) |
|
5a717cfa7406
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it
parents:
843
diff
changeset
|
451 else: |
|
5a717cfa7406
'hg help -v' mentions the alias of the commands
kreijack@inwind.REMOVEME.it
parents:
843
diff
changeset
|
452 ui.write(' %-*s %s\n' % (m, f, h[f])) |
| 255 | 453 |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
454 # global options |
|
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
455 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
|
456 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
|
457 |
|
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
458 # 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
|
459 opt_output = [] |
|
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
460 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
|
461 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
|
462 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
|
463 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
|
464 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
|
465 "%s%s" % (desc, |
|
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
|
466 default 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
|
467 or ""))) |
|
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
468 |
|
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
469 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
|
470 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
|
471 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
|
472 if second: |
|
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
473 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
|
474 else: |
|
d8279ca39dc7
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1051
diff
changeset
|
475 ui.write("%s\n" % first) |
|
849
8933ef744325
Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
848
diff
changeset
|
476 |
| 255 | 477 # Commands start here, listed alphabetically |
| 209 | 478 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
723
diff
changeset
|
479 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
|
480 """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
|
481 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
482 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
|
483 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
484 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
|
485 |
|
1568
1d7d0c07e8f3
make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1567
diff
changeset
|
486 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
|
487 """ |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
488 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
723
diff
changeset
|
489 names = [] |
|
942
7eb8cbcca7c4
Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents:
940
diff
changeset
|
490 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
|
491 if 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
|
492 if ui.verbose: 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
|
493 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
|
494 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
|
495 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
|
496 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
|
497 repo.add(names) |
| 213 | 498 |
|
766
b444a7e053f1
Get addremove to use new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
764
diff
changeset
|
499 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
|
500 """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
|
501 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
502 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
|
503 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
504 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
|
505 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
|
506 """ |
|
809
d0fb9efa2b2d
Fix performance regression in addremove command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
783
diff
changeset
|
507 add, remove = [], [] |
|
942
7eb8cbcca7c4
Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents:
940
diff
changeset
|
508 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
|
509 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
|
510 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
|
511 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
|
512 ui.status(_('adding %s\n') % rel) |
|
880
409a9a7b0da2
addremove was not correctly finding removed files when given
mason@suse.com
parents:
879
diff
changeset
|
513 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
|
514 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
|
515 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
|
516 ui.status(_('removing %s\n') % rel) |
|
809
d0fb9efa2b2d
Fix performance regression in addremove command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
783
diff
changeset
|
517 repo.add(add) |
|
d0fb9efa2b2d
Fix performance regression in addremove command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
783
diff
changeset
|
518 repo.remove(remove) |
|
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
519 |
|
733
1966c553f652
Convert annotate over to walk interface.
Bryan O'Sullivan <bos@serpentine.com>
parents:
732
diff
changeset
|
520 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
|
521 """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
|
522 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
523 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
|
524 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
525 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
|
526 place. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
527 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
528 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
|
529 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
|
530 anyway, probably with undesirable results. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
531 """ |
| 209 | 532 def getnode(rev): |
| 1092 | 533 return short(repo.changelog.node(rev)) |
| 209 | 534 |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
535 ucache = {} |
| 209 | 536 def getname(rev): |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
537 cl = repo.changelog.read(repo.changelog.node(rev)) |
| 1147 | 538 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
|
539 |
| 1522 | 540 dcache = {} |
| 541 def getdate(rev): | |
| 542 datestr = dcache.get(rev) | |
| 543 if datestr is None: | |
| 544 cl = repo.changelog.read(repo.changelog.node(rev)) | |
| 545 datestr = dcache[rev] = util.datestr(cl[2]) | |
| 546 return datestr | |
| 547 | |
| 744 | 548 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
|
549 raise util.Abort(_('at least one file name or pattern required')) |
| 744 | 550 |
| 1523 | 551 opmap = [['user', getname], ['number', str], ['changeset', getnode], |
| 552 ['date', getdate]] | |
| 1522 | 553 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
|
554 opts['number'] = 1 |
| 209 | 555 |
|
715
938dd667ca21
Make annotate use option --rev instead od --revision like other commands.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
714
diff
changeset
|
556 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
|
557 node = repo.changelog.lookup(opts['rev']) |
|
714
29fcd195e056
Some cleanups in commands.annotate().
Thomas Arendsen Hein <thomas@intevation.de>
parents:
712
diff
changeset
|
558 else: |
|
29fcd195e056
Some cleanups in commands.annotate().
Thomas Arendsen Hein <thomas@intevation.de>
parents:
712
diff
changeset
|
559 node = repo.dirstate.parents()[0] |
| 209 | 560 change = repo.changelog.read(node) |
| 561 mmap = repo.manifest.read(change[0]) | |
| 1016 | 562 |
|
942
7eb8cbcca7c4
Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents:
940
diff
changeset
|
563 for src, abs, rel, exact in walk(repo, pats, opts): |
| 771 | 564 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
|
565 ui.warn(_("warning: %s is not in the repository!\n") % rel) |
| 771 | 566 continue |
| 567 | |
| 1016 | 568 f = repo.file(abs) |
| 569 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
|
570 ui.write(_("%s: binary file\n") % rel) |
| 1016 | 571 continue |
| 572 | |
| 573 lines = f.annotate(mmap[abs]) | |
| 209 | 574 pieces = [] |
| 575 | |
| 576 for o, f in opmap: | |
|
714
29fcd195e056
Some cleanups in commands.annotate().
Thomas Arendsen Hein <thomas@intevation.de>
parents:
712
diff
changeset
|
577 if opts[o]: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
578 l = [f(n) for n, dummy in lines] |
| 771 | 579 if l: |
| 580 m = max(map(len, l)) | |
| 581 pieces.append(["%*s" % (m, x) for x in l]) | |
| 209 | 582 |
| 771 | 583 if pieces: |
| 584 for p, l in zip(zip(*pieces), lines): | |
| 585 ui.write("%s: %s" % (" ".join(p), l[1])) | |
| 209 | 586 |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
587 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
|
588 """create a changegroup file |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
589 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
590 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
|
591 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
|
592 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
593 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
|
594 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
|
595 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
|
596 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
|
597 extension is ".hg". |
|
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 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
|
600 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
|
601 """ |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
602 f = open(fname, "wb") |
| 1440 | 603 dest = ui.expandpath(dest, repo.root) |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
604 other = hg.repository(ui, dest) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
605 o = repo.findoutgoing(other) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
606 cg = repo.changegroup(o) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
607 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
608 try: |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
609 f.write("HG10") |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
610 z = bz2.BZ2Compressor(9) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
611 while 1: |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
612 chunk = cg.read(4096) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
613 if not chunk: |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
614 break |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
615 f.write(z.compress(chunk)) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
616 f.write(z.flush()) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
617 except: |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
618 os.unlink(fname) |
|
1366
136920d13fc2
Fixed an exception that was caught and improperly forgotten.
Eric Hopper <hopper@omnifarious.org>
parents:
1354
diff
changeset
|
619 raise |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
620 |
|
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
621 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
|
622 """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
|
623 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
624 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
|
625 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
|
626 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
627 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
|
628 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
|
629 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
|
630 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
631 %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
|
632 %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
|
633 %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
|
634 """ |
|
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
635 mf = {} |
|
1545
d69070c2547a
fix errors found by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1543
diff
changeset
|
636 rev = opts['rev'] |
|
d69070c2547a
fix errors found by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1543
diff
changeset
|
637 if rev: |
|
1582
63799b01985c
fix the cat command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
638 node = repo.lookup(rev) |
|
63799b01985c
fix the cat command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
639 else: |
|
63799b01985c
fix the cat command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
640 node = repo.changelog.tip() |
|
63799b01985c
fix the cat command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
641 change = repo.changelog.read(node) |
|
63799b01985c
fix the cat command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
642 mf = repo.manifest.read(change[0]) |
|
63799b01985c
fix the cat command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
643 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
|
644 r = repo.file(abs) |
|
1582
63799b01985c
fix the cat command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
645 n = mf[abs] |
|
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
646 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
|
647 fp.write(r.read(n)) |
| 248 | 648 |
|
698
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
649 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
|
650 """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
|
651 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
652 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
|
653 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
654 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
|
655 basename of the source. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
656 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
657 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
|
658 .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
|
659 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
660 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
|
661 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
|
662 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
|
663 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
|
664 hardlinking. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
665 """ |
| 485 | 666 if dest is None: |
| 528 | 667 dest = os.path.basename(os.path.normpath(source)) |
|
532
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
668 |
|
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
669 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
|
670 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
|
671 |
|
891
a9b843b114f9
Fix clone when target directory is relative.
Bryan O'Sullivan <bos@serpentine.com>
parents:
886
diff
changeset
|
672 dest = os.path.realpath(dest) |
|
a9b843b114f9
Fix clone when target directory is relative.
Bryan O'Sullivan <bos@serpentine.com>
parents:
886
diff
changeset
|
673 |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1552
diff
changeset
|
674 class Dircleanup(object): |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
675 def __init__(self, dir_): |
| 625 | 676 self.rmtree = shutil.rmtree |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
677 self.dir_ = dir_ |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
678 os.mkdir(dir_) |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
679 def close(self): |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
680 self.dir_ = None |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
681 def __del__(self): |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
682 if self.dir_: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
683 self.rmtree(self.dir_, True) |
| 485 | 684 |
|
963
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
685 if opts['ssh']: |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
686 ui.setconfig("ui", "ssh", opts['ssh']) |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
687 if opts['remotecmd']: |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
688 ui.setconfig("ui", "remotecmd", opts['remotecmd']) |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
689 |
|
1221
89f899caecb5
clone: directory names take precedence over symbolic names
TK Soh <teekaysoh@yahoo.com>
parents:
1220
diff
changeset
|
690 if not os.path.exists(source): |
|
89f899caecb5
clone: directory names take precedence over symbolic names
TK Soh <teekaysoh@yahoo.com>
parents:
1220
diff
changeset
|
691 source = ui.expandpath(source) |
| 1314 | 692 |
| 693 d = Dircleanup(dest) | |
|
562
be6233a2bfdd
hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents:
561
diff
changeset
|
694 abspath = source |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
632
diff
changeset
|
695 other = hg.repository(ui, source) |
| 485 | 696 |
|
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
1242
diff
changeset
|
697 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
|
698 if other.dev() != -1: |
|
675
49de76abc4da
hg clone stored path fix
Mikael Berthe <mikael@lilotux.net>
parents:
674
diff
changeset
|
699 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
|
700 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
|
701 copy = True |
|
1331
cfae1ed2d61f
Write hgrc file in text mode, even on Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1325
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 if copy: |
|
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
1242
diff
changeset
|
704 try: |
|
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
1242
diff
changeset
|
705 # 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
|
706 # 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
|
707 # 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
|
708 # fail |
|
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
1242
diff
changeset
|
709 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
|
710 except OSError: |
|
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
1242
diff
changeset
|
711 copy = False |
| 917 | 712 |
|
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
1242
diff
changeset
|
713 if copy: |
|
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
1242
diff
changeset
|
714 # we lock here to avoid premature writing to the target |
| 1208 | 715 os.mkdir(os.path.join(dest, ".hg")) |
| 1209 | 716 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
|
717 |
| 1208 | 718 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i" |
| 719 for f in files.split(): | |
| 720 src = os.path.join(source, ".hg", f) | |
| 721 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
|
722 try: |
|
f84ed9c6131d
fix for cloning empty repo (.hg is still empty)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1443
diff
changeset
|
723 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
|
724 except OSError, inst: |
|
f84ed9c6131d
fix for cloning empty repo (.hg is still empty)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1443
diff
changeset
|
725 if inst.errno != errno.ENOENT: raise |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
726 |
|
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
727 repo = hg.repository(ui, dest) |
| 485 | 728 |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
729 else: |
|
1467
06d5d8794e5f
Stupid spelling mistake in a variable name.
Eric Hopper <hopper@omnifarious.org>
parents:
1465
diff
changeset
|
730 revs = None |
|
1461
02099220ad49
Implementing clone -r, which clones all changesets needed to reach a
Eric Hopper <hopper@omnifarious.org>
parents:
1457
diff
changeset
|
731 if opts['rev']: |
|
1465
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
732 if not other.local(): |
|
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
733 raise util.Abort("clone -r not supported yet for remote repositories.") |
|
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
734 else: |
|
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
735 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
|
736 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
|
737 repo.pull(other, heads = revs) |
|
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
500
diff
changeset
|
738 |
|
1331
cfae1ed2d61f
Write hgrc file in text mode, even on Windows.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1325
diff
changeset
|
739 f = repo.opener("hgrc", "w", text=True) |
| 1206 | 740 f.write("[paths]\n") |
| 741 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
|
742 f.close() |
| 515 | 743 |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
744 if not opts['noupdate']: |
|
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
745 update(ui, repo) |
|
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
746 |
|
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
747 d.close() |
| 515 | 748 |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
812
diff
changeset
|
749 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
|
750 """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
|
751 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
752 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
|
753 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
754 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
|
755 will be commited. |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
756 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
757 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
|
758 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
|
759 """ |
|
1443
3a0b69ea5708
Remove deprecated commit -t option
Matt Mackall <mpm@selenic.com>
parents:
1440
diff
changeset
|
760 message = opts['message'] |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
761 logfile = opts['logfile'] |
|
1319
5a15df632e6a
Fix behaviour of commit.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1318
diff
changeset
|
762 |
|
5a15df632e6a
Fix behaviour of commit.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1318
diff
changeset
|
763 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
|
764 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
|
765 'exclusive')) |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
766 if not message and logfile: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
767 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
|
768 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
|
769 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
|
770 else: |
|
aa5b726e9619
Add '-' support to the commit logfile option to read message from stdin.
mark.williamson@cl.cam.ac.uk
parents:
898
diff
changeset
|
771 message = open(logfile).read() |
|
1319
5a15df632e6a
Fix behaviour of commit.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1318
diff
changeset
|
772 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
|
773 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
|
774 (logfile, inst.strerror)) |
| 289 | 775 |
| 354 | 776 if opts['addremove']: |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
812
diff
changeset
|
777 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
|
778 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
|
779 if pats: |
| 1062 | 780 c, a, d, u = repo.changes(files=fns, match=match) |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
812
diff
changeset
|
781 files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r'] |
|
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
812
diff
changeset
|
782 else: |
|
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
812
diff
changeset
|
783 files = [] |
|
1202
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
784 try: |
|
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
785 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
|
786 except ValueError, inst: |
|
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
787 raise util.Abort(str(inst)) |
| 245 | 788 |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
789 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
|
790 cwd = repo.getcwd() |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
791 errors = 0 |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
792 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
|
793 targets = {} |
|
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
794 |
|
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
795 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
|
796 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
|
797 '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
|
798 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
|
799 if 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
|
800 if exact: 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
|
801 else: |
|
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
802 return True |
|
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
803 |
|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
804 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
|
805 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
|
806 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
|
807 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
|
808 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
|
809 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
|
810 (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
|
811 return |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
812 if (not opts['after'] and os.path.exists(reltarget) or |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
813 opts['after'] and repo.dirstate.state(abstarget) not in '?r'): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
814 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
|
815 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
|
816 reltarget) |
|
5c3b93b244aa
copy & rename don't overwrite unless --force is specified
Robin Farine <robin.farine@terminus.org>
parents:
1512
diff
changeset
|
817 return |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
818 if not opts['after']: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
819 os.unlink(reltarget) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
820 if opts['after']: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
821 if not os.path.exists(reltarget): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
822 return |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
823 else: |
|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
824 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
|
825 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
|
826 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
|
827 try: |
|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
828 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
|
829 shutil.copymode(relsrc, reltarget) |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
830 except shutil.Error, inst: |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
831 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
|
832 except IOError, inst: |
|
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
833 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
|
834 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
|
835 else: |
|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
836 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
|
837 (relsrc, inst.strerror)) |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
838 errors += 1 |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
839 return |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
840 if ui.verbose or not exact: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
841 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
|
842 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
|
843 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
|
844 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
|
845 |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
846 def targetpathfn(pat, dest, srcs): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
847 if os.path.isdir(pat): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
848 if pat.endswith(os.sep): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
849 pat = pat[:-len(os.sep)] |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
850 if destdirexists: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
851 striplen = len(os.path.split(pat)[0]) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
852 else: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
853 striplen = len(pat) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
854 if striplen: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
855 striplen += len(os.sep) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
856 res = lambda p: os.path.join(dest, p[striplen:]) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
857 elif destdirexists: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
858 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
|
859 else: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
860 res = lambda p: dest |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
861 return res |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
862 |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
863 def targetpathafterfn(pat, dest, srcs): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
864 if util.patkind(pat, None)[0]: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
865 # a mercurial pattern |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
866 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
|
867 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
|
868 # A directory. Either the target path contains the last |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
869 # component of the source path or it does not. |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
870 def evalpath(striplen): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
871 score = 0 |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
872 for s in srcs: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
873 t = os.path.join(dest, s[1][striplen:]) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
874 if os.path.exists(t): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
875 score += 1 |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
876 return score |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
877 |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
878 if pat.endswith(os.sep): |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
879 pat = pat[:-len(os.sep)] |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
880 striplen = len(pat) + len(os.sep) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
881 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
|
882 score = evalpath(striplen) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
883 striplen1 = len(os.path.split(pat)[0]) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
884 if striplen1: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
885 striplen1 += len(os.sep) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
886 if evalpath(striplen1) > score: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
887 striplen = striplen1 |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
888 res = lambda p: os.path.join(dest, p[striplen:]) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
889 else: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
890 # a file |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
891 if destdirexists: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
892 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
|
893 else: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
894 res = lambda p: dest |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
895 return res |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
896 |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
897 |
|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
898 pats = list(pats) |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
899 if not pats: |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
900 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
|
901 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
|
902 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
|
903 dest = pats.pop() |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
904 destdirexists = os.path.isdir(dest) |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
905 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
|
906 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
|
907 'existing directory')) |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
908 if opts['after']: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
909 tfn = targetpathafterfn |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
910 else: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
911 tfn = targetpathfn |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
912 copylist = [] |
|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
913 for pat in pats: |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
914 srcs = [] |
|
1512
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
915 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
|
916 if okaytocopy(abssrc, relsrc, exact): |
|
1565
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
917 srcs.append((abssrc, relsrc, exact)) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
918 if not srcs: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
919 continue |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
920 copylist.append((tfn(pat, dest, srcs), srcs)) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
921 if not copylist: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
922 raise util.Abort(_('no files to copy')) |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
923 |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
924 for targetpath, srcs in copylist: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
925 for abssrc, relsrc, exact in srcs: |
|
4bcbc126b80b
fix rename --after
Robin Farine <robin.farine@terminus.org>
parents:
1561
diff
changeset
|
926 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
|
927 |
|
53ad6ee6ede4
generalize copy/rename to handle more than one source directory
Robin Farine <robin.farine@terminus.org>
parents:
1507
diff
changeset
|
928 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
|
929 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
|
930 return errors, copied |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
931 |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
932 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
|
933 """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
|
934 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
935 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
|
936 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
|
937 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
|
938 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
939 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
|
940 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
|
941 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
|
942 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
943 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
|
944 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
945 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
|
946 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
|
947 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
|
948 """ |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
949 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
|
950 return errs |
| 363 | 951 |
| 1262 | 952 def debugancestor(ui, index, rev1, rev2): |
| 953 """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
|
954 r = revlog.revlog(util.opener(os.getcwd()), index, "") |
| 1262 | 955 a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) |
| 956 ui.write("%d:%s\n" % (r.rev(a), hex(a))) | |
| 957 | |
| 596 | 958 def debugcheckstate(ui, repo): |
| 959 """validate the correctness of the current dirstate""" | |
| 460 | 960 parent1, parent2 = repo.dirstate.parents() |
| 555 | 961 repo.dirstate.read() |
| 962 dc = repo.dirstate.map | |
| 460 | 963 keys = dc.keys() |
| 964 keys.sort() | |
| 965 m1n = repo.changelog.read(parent1)[0] | |
| 966 m2n = repo.changelog.read(parent2)[0] | |
| 967 m1 = repo.manifest.read(m1n) | |
| 968 m2 = repo.manifest.read(m2n) | |
| 969 errors = 0 | |
| 970 for f in dc: | |
| 971 state = repo.dirstate.state(f) | |
| 972 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
|
973 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
| 460 | 974 errors += 1 |
| 975 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
|
976 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
| 460 | 977 errors += 1 |
| 978 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
|
979 ui.warn(_("%s in state %s, but not in either manifest\n") % |
| 582 | 980 (f, state)) |
| 460 | 981 errors += 1 |
| 982 for f in m1: | |
| 983 state = repo.dirstate.state(f) | |
| 984 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
|
985 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
| 460 | 986 errors += 1 |
| 987 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
|
988 raise util.Abort(_(".hg/dirstate inconsistent with current parent's manifest")) |
| 460 | 989 |
|
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
989
diff
changeset
|
990 def debugconfig(ui): |
|
1053
1539ca091d86
Added missing doc strings for two new debug commmands.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1052
diff
changeset
|
991 """show combined config settings from all hgrc files""" |
|
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
989
diff
changeset
|
992 try: |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
989
diff
changeset
|
993 repo = hg.repository(ui) |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
994 except hg.RepoError: |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
995 pass |
|
1028
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
989
diff
changeset
|
996 for section, name, value in ui.walkconfig(): |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
989
diff
changeset
|
997 ui.write('%s.%s=%s\n' % (section, name, value)) |
|
25e7ea0f2cff
Add commands.debugconfig.
Bryan O'Sullivan <bos@serpentine.com>
parents:
989
diff
changeset
|
998 |
|
1395
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
999 def debugsetparents(ui, repo, rev1, rev2=None): |
|
1470
fb9b84c91222
minor fix on command help docstrings
TK Soh <teekaysoh@yahoo.com>
parents:
1469
diff
changeset
|
1000 """manually set the parents of the current working directory |
|
1395
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1001 |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1002 This is useful for writing repository conversion tools, but should |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1003 be used with care. |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1004 """ |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1005 |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1006 if not rev2: |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1007 rev2 = hex(nullid) |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1008 |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1009 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) |
|
c2eb204917f8
Add debugsetparents command
Matt Mackall <mpm@selenic.com>
parents:
1390
diff
changeset
|
1010 |
| 596 | 1011 def debugstate(ui, repo): |
| 1012 """show the contents of the current dirstate""" | |
| 555 | 1013 repo.dirstate.read() |
| 1014 dc = repo.dirstate.map | |
| 460 | 1015 keys = dc.keys() |
| 1016 keys.sort() | |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1017 for file_ in keys: |
|
791
040655ea0cc4
Show all dirstate info for 'hg debugstate'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
770
diff
changeset
|
1018 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
|
1019 % (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
|
1020 time.strftime("%x %X", |
|
040655ea0cc4
Show all dirstate info for 'hg debugstate'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
770
diff
changeset
|
1021 time.localtime(dc[file_][3])), file_)) |
| 1116 | 1022 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
|
1023 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f)) |
| 460 | 1024 |
|
1039
4296754ba7b4
Add debugdata for dumping revlog revision data
mpm@selenic.com
parents:
1037
diff
changeset
|
1025 def debugdata(ui, file_, rev): |
|
4296754ba7b4
Add debugdata for dumping revlog revision data
mpm@selenic.com
parents:
1037
diff
changeset
|
1026 """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
|
1027 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
|
1028 try: |
|
1cc7c0cbc30b
Fix traceback during invalid rev identifier for debugdata
Anupam Kapoor<anupam.kapoor@gmail.com>
parents:
1312
diff
changeset
|
1029 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
|
1030 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
|
1031 raise util.Abort(_('invalid revision identifier %s'), rev) |
|
1039
4296754ba7b4
Add debugdata for dumping revlog revision data
mpm@selenic.com
parents:
1037
diff
changeset
|
1032 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1033 def debugindex(ui, file_): |
| 596 | 1034 """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
|
1035 r = revlog.revlog(util.opener(os.getcwd()), file_, "") |
| 582 | 1036 ui.write(" rev offset length base linkrev" + |
| 989 | 1037 " nodeid p1 p2\n") |
| 248 | 1038 for i in range(r.count()): |
| 1039 e = r.index[i] | |
| 989 | 1040 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
| 582 | 1041 i, e[0], e[1], e[2], e[3], |
| 1092 | 1042 short(e[6]), short(e[4]), short(e[5]))) |
| 248 | 1043 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1044 def debugindexdot(ui, file_): |
| 596 | 1045 """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
|
1046 r = revlog.revlog(util.opener(os.getcwd()), file_, "") |
| 582 | 1047 ui.write("digraph G {\n") |
| 248 | 1048 for i in range(r.count()): |
| 1049 e = r.index[i] | |
| 582 | 1050 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i)) |
| 1092 | 1051 if e[5] != nullid: |
| 582 | 1052 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i)) |
| 1053 ui.write("}\n") | |
| 248 | 1054 |
| 1116 | 1055 def debugrename(ui, repo, file, rev=None): |
|
1194
c165cbf56bb1
Add doc string for debugrename.
bos@serpentine.internal.keyresearch.com
parents:
1193
diff
changeset
|
1056 """dump rename information""" |
| 1116 | 1057 r = repo.file(relpath(repo, [file])[0]) |
| 1058 if rev: | |
| 1059 try: | |
| 1060 # assume all revision numbers are for changesets | |
| 1061 n = repo.lookup(rev) | |
| 1062 change = repo.changelog.read(n) | |
| 1063 m = repo.manifest.read(change[0]) | |
| 1064 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
|
1065 except (hg.RepoError, KeyError): |
| 1116 | 1066 n = r.lookup(rev) |
| 1067 else: | |
| 1068 n = r.tip() | |
| 1069 m = r.renamed(n) | |
| 1070 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
|
1071 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1]))) |
| 1116 | 1072 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
|
1073 ui.write(_("not renamed\n")) |
| 1116 | 1074 |
|
820
89985a1b3427
Clean up walk and changes code to use normalised names properly.
Bryan O'Sullivan <bos@serpentine.com>
parents:
815
diff
changeset
|
1075 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
|
1076 """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
|
1077 items = list(walk(repo, pats, opts)) |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1078 if not items: |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1079 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
|
1080 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
|
1081 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
|
1082 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
|
1083 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
|
1084 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
|
1085 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
|
1086 |
|
732
ba0b6d17a6de
Convert diff command over to using walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
1087 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
|
1088 """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
|
1089 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1090 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
|
1091 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1092 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
|
1093 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1094 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
|
1095 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
|
1096 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
|
1097 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
|
1098 to its parent. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1099 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1100 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
|
1101 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
|
1102 probably with undesirable results. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1103 """ |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
1014
diff
changeset
|
1104 node1, node2 = None, None |
|
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
1014
diff
changeset
|
1105 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
|
1106 |
| 1014 | 1107 if len(revs) > 0: |
| 1108 node1 = revs[0] | |
| 1109 if len(revs) > 1: | |
| 1110 node2 = revs[1] | |
| 245 | 1111 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
|
1112 raise util.Abort(_("too many revisions to diff")) |
| 245 | 1113 |
|
1568
1d7d0c07e8f3
make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1567
diff
changeset
|
1114 fns, matchfn, anypats, cwd = matchpats(repo, pats, opts) |
| 1014 | 1115 |
|
1267
b0633406c07a
Fix diff command so it doesn't walk the dirstate unnecessarily.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1262
diff
changeset
|
1116 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
|
1117 text=opts['text']) |
| 245 | 1118 |
| 580 | 1119 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
|
1120 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
|
1121 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
|
1122 if opts['switch_parent']: |
|
fce5292866c6
fix a bug in hg export --switch-parent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1586
diff
changeset
|
1123 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
|
1124 prev = (parents and parents[0]) or nullid |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
1125 change = repo.changelog.read(node) |
| 580 | 1126 |
|
729
626aa658e2a9
Turn make_filename into make_file, which returns a file handle.
Bryan O'Sullivan <bos@serpentine.com>
parents:
727
diff
changeset
|
1127 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
|
1128 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
|
1129 revwidth=revwidth) |
|
626aa658e2a9
Turn make_filename into make_file, which returns a file handle.
Bryan O'Sullivan <bos@serpentine.com>
parents:
727
diff
changeset
|
1130 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
|
1131 ui.note("%s\n" % fp.name) |
| 580 | 1132 |
| 582 | 1133 fp.write("# HG changeset patch\n") |
| 1134 fp.write("# User %s\n" % change[1]) | |
| 1092 | 1135 fp.write("# Node ID %s\n" % hex(node)) |
| 1136 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
|
1137 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
|
1138 fp.write("# Parent %s\n" % hex(parents[1])) |
| 582 | 1139 fp.write(change[4].rstrip()) |
| 1140 fp.write("\n\n") | |
| 580 | 1141 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
1014
diff
changeset
|
1142 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
|
1143 if fp != sys.stdout: |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1144 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
|
1145 |
| 580 | 1146 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
|
1147 """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
|
1148 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1149 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
|
1150 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1151 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
|
1152 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
|
1153 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1154 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
|
1155 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
|
1156 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1157 %% literal "%" character |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1158 %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
|
1159 %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
|
1160 %R changeset revision number |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1161 %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
|
1162 %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
|
1163 %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
|
1164 %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
|
1165 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1166 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
|
1167 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
|
1168 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
|
1169 |
|
bcdc030c59f8
add a --switch-parent option to export against the other parent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1570
diff
changeset
|
1170 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
|
1171 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
|
1172 """ |
|
610
4c02464cb9f0
check export options for changeset before running
shaleh@speakeasy.net
parents:
609
diff
changeset
|
1173 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
|
1174 raise util.Abort(_("export requires at least one changeset")) |
| 580 | 1175 seqno = 0 |
| 1176 revs = list(revrange(ui, repo, changesets)) | |
| 1177 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
|
1178 revwidth = max(map(len, revs)) |
|
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
|
1179 ui.note(len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")) |
| 580 | 1180 for cset in revs: |
| 1181 seqno += 1 | |
| 1182 doexport(ui, repo, cset, seqno, total, revwidth, opts) | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
1183 |
|
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
809
diff
changeset
|
1184 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
|
1185 """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
|
1186 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1187 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
|
1188 """ |
|
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
809
diff
changeset
|
1189 forget = [] |
|
942
7eb8cbcca7c4
Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents:
940
diff
changeset
|
1190 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
|
1191 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
|
1192 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
|
1193 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
|
1194 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
|
1195 repo.forget(forget) |
| 245 | 1196 |
|
1108
7a75d8fbbdaf
Remove some options from 'hg grep':
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1106
diff
changeset
|
1197 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
|
1198 """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
|
1199 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1200 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
|
1201 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1202 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
|
1203 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
|
1204 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
|
1205 a match appears. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1206 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1207 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
|
1208 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
|
1209 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
|
1210 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
|
1211 use the --all flag. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1212 """ |
| 1057 | 1213 reflags = 0 |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1214 if opts['ignore_case']: |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1215 reflags |= re.I |
| 1057 | 1216 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
|
1217 sep, eol = ':', '\n' |
|
1108
7a75d8fbbdaf
Remove some options from 'hg grep':
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1106
diff
changeset
|
1218 if opts['print0']: |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1219 sep = eol = '\0' |
| 1057 | 1220 |
| 1221 fcache = {} | |
| 1222 def getfile(fn): | |
| 1223 if fn not in fcache: | |
| 1224 fcache[fn] = repo.file(fn) | |
| 1225 return fcache[fn] | |
| 1226 | |
| 1227 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
|
1228 begin = 0 |
|
4eab07ef66e2
grep: speed up matching, and only return one match per line.
bos@serpentine.internal.keyresearch.com
parents:
1058
diff
changeset
|
1229 linenum = 0 |
|
4eab07ef66e2
grep: speed up matching, and only return one match per line.
bos@serpentine.internal.keyresearch.com
parents:
1058
diff
changeset
|
1230 while True: |
|
4eab07ef66e2
grep: speed up matching, and only return one match per line.
bos@serpentine.internal.keyresearch.com
parents:
1058
diff
changeset
|
1231 match = regexp.search(body, begin) |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1232 if not match: |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1233 break |
|
1059
4eab07ef66e2
grep: speed up matching, and only return one match per line.
bos@serpentine.internal.keyresearch.com
parents:
1058
diff
changeset
|
1234 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
|
1235 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
|
1236 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
|
1237 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
|
1238 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
|
1239 begin = lend + 1 |
| 1057 | 1240 |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1552
diff
changeset
|
1241 class linestate(object): |
| 1057 | 1242 def __init__(self, line, linenum, colstart, colend): |
| 1243 self.line = line | |
| 1244 self.linenum = linenum | |
| 1245 self.colstart = colstart | |
| 1246 self.colend = colend | |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1247 def __eq__(self, other): |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1248 return self.line == other.line |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1249 def __hash__(self): |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1250 return hash(self.line) |
| 1057 | 1251 |
| 1252 matches = {} | |
| 1253 def grepbody(fn, rev, body): | |
| 1254 matches[rev].setdefault(fn, {}) | |
| 1255 m = matches[rev][fn] | |
| 1256 for lnum, cstart, cend, line in matchlines(body): | |
| 1257 s = linestate(line, lnum, cstart, cend) | |
| 1258 m[s] = s | |
| 1259 | |
| 1260 prev = {} | |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1261 ucache = {} |
| 1057 | 1262 def display(fn, rev, states, prevstates): |
| 1061 | 1263 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates))) |
| 1057 | 1264 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
|
1265 counts = {'-': 0, '+': 0} |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1266 filerevmatches = {} |
| 1057 | 1267 for l in diff: |
| 1212 | 1268 if incrementing or not opts['all']: |
| 1057 | 1269 change = ((l in prevstates) and '-') or '+' |
| 1270 r = rev | |
| 1271 else: | |
| 1272 change = ((l in states) and '-') or '+' | |
| 1273 r = prev[fn] | |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1274 cols = [fn, str(rev)] |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1275 if opts['line_number']: cols.append(str(l.linenum)) |
| 1212 | 1276 if opts['all']: cols.append(change) |
| 1147 | 1277 if opts['user']: 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
|
1278 ucache)) |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1279 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
|
1280 c = (fn, rev) |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1281 if c in filerevmatches: continue |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1282 filerevmatches[c] = 1 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1283 else: |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1284 cols.append(l.line) |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1285 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
|
1286 counts[change] += 1 |
|
bd917e1a26dd
grep: change default to printing first matching rev.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1116
diff
changeset
|
1287 return counts['+'], counts['-'] |
| 1057 | 1288 |
| 1289 fstate = {} | |
|
1145
bd917e1a26dd
grep: change default to printing first matching rev.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1116
diff
changeset
|
1290 skip = {} |
|
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
1291 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
|
1292 count = 0 |
|
1337
d4b25df77a9e
Fix up some bugs for log and grep with empty repo
mpm@selenic.com
parents:
1331
diff
changeset
|
1293 incrementing = False |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1145
diff
changeset
|
1294 for st, rev, fns in changeiter: |
| 1057 | 1295 if st == 'window': |
| 1296 incrementing = rev | |
| 1297 matches.clear() | |
| 1298 elif st == 'add': | |
| 1299 change = repo.changelog.read(repo.lookup(str(rev))) | |
| 1300 mf = repo.manifest.read(change[0]) | |
| 1301 matches[rev] = {} | |
| 1302 for fn in fns: | |
|
1145
bd917e1a26dd
grep: change default to printing first matching rev.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1116
diff
changeset
|
1303 if fn in skip: continue |
| 1057 | 1304 fstate.setdefault(fn, {}) |
| 1305 try: | |
| 1306 grepbody(fn, rev, getfile(fn).read(mf[fn])) | |
| 1307 except KeyError: | |
| 1308 pass | |
| 1309 elif st == 'iter': | |
| 1310 states = matches[rev].items() | |
| 1311 states.sort() | |
| 1312 for fn, m in states: | |
|
1145
bd917e1a26dd
grep: change default to printing first matching rev.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1116
diff
changeset
|
1313 if fn in skip: continue |
| 1212 | 1314 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
|
1315 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
|
1316 count += pos + neg |
| 1212 | 1317 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
|
1318 skip[fn] = True |
| 1057 | 1319 fstate[fn] = m |
| 1320 prev[fn] = rev | |
| 1321 | |
| 1322 if not incrementing: | |
| 1323 fstate = fstate.items() | |
| 1324 fstate.sort() | |
| 1325 for fn, state in fstate: | |
|
1145
bd917e1a26dd
grep: change default to printing first matching rev.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1116
diff
changeset
|
1326 if fn in skip: continue |
| 1057 | 1327 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
|
1328 return (count == 0 and 1) or 0 |
| 1057 | 1329 |
| 898 | 1330 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
|
1331 """show current repository heads |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1332 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1333 Show all repository head changesets. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1334 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1335 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
|
1336 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
|
1337 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
|
1338 """ |
|
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
|
1339 if opts['rev']: |
|
1551
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
1340 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
|
1341 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
|
1342 heads = repo.heads() |
| 898 | 1343 br = None |
| 1344 if opts['branches']: | |
|
1551
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
1345 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
|
1346 for n in heads: |
| 898 | 1347 show_changeset(ui, repo, changenode=n, brinfo=br) |
| 221 | 1348 |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
1349 def identify(ui, repo): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1350 """print information about the working copy |
|
1470
fb9b84c91222
minor fix on command help docstrings
TK Soh <teekaysoh@yahoo.com>
parents:
1469
diff
changeset
|
1351 |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1352 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
|
1353 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1354 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
|
1355 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
|
1356 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
|
1357 """ |
| 1092 | 1358 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
|
1359 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
|
1360 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
|
1361 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
|
1362 |
| 1092 | 1363 hexfunc = ui.verbose and hex or short |
| 723 | 1364 (c, a, d, u) = repo.changes() |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
1365 output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]), |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
1366 (c or a or d) and "+" or "")] |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
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 if not ui.quiet: |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
1369 # multiple tags for a single parent separated by '/' |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
1370 parenttags = ['/'.join(tags) |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
1371 for tags in map(repo.nodetags, parents) if tags] |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
1372 # 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
|
1373 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
|
1374 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
|
1375 |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
1376 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
|
1377 |
| 437 | 1378 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
|
1379 """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
|
1380 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1381 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
|
1382 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1383 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
|
1384 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
|
1385 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1386 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
|
1387 "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
|
1388 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
|
1389 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
|
1390 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
|
1391 """ |
| 437 | 1392 patches = (patch1,) + patches |
|
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
1393 |
|
966
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
965
diff
changeset
|
1394 if not opts['force']: |
|
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
965
diff
changeset
|
1395 (c, a, d, u) = repo.changes() |
|
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
965
diff
changeset
|
1396 if c or a or d: |
|
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
|
1397 raise util.Abort(_("outstanding uncommitted changes")) |
|
966
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
965
diff
changeset
|
1398 |
| 437 | 1399 d = opts["base"] |
| 1400 strip = opts["strip"] | |
| 1401 | |
|
1193
04d1ca8ae9ec
Fortify the recognition of a diff header.
bos@serpentine.internal.keyresearch.com
parents:
1192
diff
changeset
|
1402 mailre = re.compile(r'(?:From |[\w-]+:)') |
|
1390
ce95599eedac
Borrow patch header detection heuristic from quilt
Matt Mackall <mpm@selenic.com>
parents:
1381
diff
changeset
|
1403 |
|
ce95599eedac
Borrow patch header detection heuristic from quilt
Matt Mackall <mpm@selenic.com>
parents:
1381
diff
changeset
|
1404 # 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
|
1405 # (this heuristic is borrowed from quilt) |
|
ce95599eedac
Borrow patch header detection heuristic from quilt
Matt Mackall <mpm@selenic.com>
parents:
1381
diff
changeset
|
1406 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
|
1407 'retrieving revision [0-9]+(\.[0-9]+)*$|' + |
|
ce95599eedac
Borrow patch header detection heuristic from quilt
Matt Mackall <mpm@selenic.com>
parents:
1381
diff
changeset
|
1408 '(---|\*\*\*)[ \t])') |
|
1190
737f9b90c571
Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents:
1189
diff
changeset
|
1409 |
| 437 | 1410 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
|
1411 ui.status(_("applying %s\n") % patch) |
| 437 | 1412 pf = os.path.join(d, patch) |
| 1413 | |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1414 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
|
1415 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
|
1416 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
|
1417 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
|
1418 line = line.rstrip() |
| 1220 | 1419 if (not message and not hgpatch and |
| 1420 mailre.match(line) and not opts['force']): | |
|
1190
737f9b90c571
Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents:
1189
diff
changeset
|
1421 if len(line) > 35: 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
|
1422 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
|
1423 'mail header: ') + line) |
|
1193
04d1ca8ae9ec
Fortify the recognition of a diff header.
bos@serpentine.internal.keyresearch.com
parents:
1192
diff
changeset
|
1424 if diffre.match(line): |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1425 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
|
1426 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
|
1427 # 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
|
1428 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
|
1429 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
|
1430 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
|
1431 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
|
1432 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
|
1433 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
|
1434 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
|
1435 hgpatch = True |
|
852
1df0983eb589
Allow HG patch to appear late in the input stream
Samuel Tardieu <sam@rfc1149.net>
parents:
849
diff
changeset
|
1436 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
|
1437 else: |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1438 message.append(line) |
|
607
94744f6fe0e7
[PATCH] Parse and use header data from an hg export'ed changeset
mpm@selenic.com
parents:
605
diff
changeset
|
1439 |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1440 # make sure message isn't empty |
|
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1441 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
|
1442 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
|
1443 else: |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1444 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
|
1445 ui.debug(_('message:\n%s\n') % message) |
| 437 | 1446 |
|
1285
1546c2aa6b30
Make 'hg import' platform independent.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
parents:
1281
diff
changeset
|
1447 files = util.patch(strip, pf, ui) |
| 437 | 1448 |
| 1449 if len(files) > 0: | |
| 1450 addremove(ui, repo, *files) | |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1451 repo.commit(files, message, user) |
| 437 | 1452 |
|
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
1453 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
|
1454 """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
|
1455 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1456 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
|
1457 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
|
1458 was requested. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1459 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1460 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
|
1461 """ |
| 1440 | 1462 source = ui.expandpath(source, repo.root) |
|
927
5a830d7bea52
Add hg incoming command for local repositories
mpm@selenic.com
parents:
924
diff
changeset
|
1463 other = hg.repository(ui, source) |
|
5a830d7bea52
Add hg incoming command for local repositories
mpm@selenic.com
parents:
924
diff
changeset
|
1464 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
|
1465 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
|
1466 o = repo.findincoming(other) |
| 931 | 1467 if not o: |
| 1468 return | |
|
1457
518da3c3b6ce
This implements the nodesbetween method, and it removes the newer method
Eric Hopper <hopper@omnifarious.org>
parents:
1381
diff
changeset
|
1469 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
|
1470 if opts['newest_first']: |
|
65cbe22b03fa
allow 'hg out' / 'hg in' to show newest commit first
Michal Kvasnica <kvasnica@gmail.com>
parents:
1437
diff
changeset
|
1471 o.reverse() |
|
927
5a830d7bea52
Add hg incoming command for local repositories
mpm@selenic.com
parents:
924
diff
changeset
|
1472 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
|
1473 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
|
1474 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
|
1475 continue |
|
927
5a830d7bea52
Add hg incoming command for local repositories
mpm@selenic.com
parents:
924
diff
changeset
|
1476 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
|
1477 if opts['patch']: |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
1478 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
|
1479 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
|
1480 ui.write("\n") |
|
927
5a830d7bea52
Add hg incoming command for local repositories
mpm@selenic.com
parents:
924
diff
changeset
|
1481 |
|
907
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
906
diff
changeset
|
1482 def init(ui, dest="."): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1483 """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
|
1484 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1485 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
|
1486 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
|
1487 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1488 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
|
1489 """ |
|
907
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
906
diff
changeset
|
1490 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
|
1491 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
|
1492 hg.repository(ui, dest, create=1) |
| 338 | 1493 |
| 627 | 1494 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
|
1495 """locate files matching specific patterns |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1496 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1497 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
|
1498 given patterns. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1499 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1500 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
|
1501 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
|
1502 of the repository. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1503 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1504 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
|
1505 names. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1506 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1507 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
|
1508 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
|
1509 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
|
1510 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
|
1511 """ |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1512 end = opts['print0'] and '\0' or '\n' |
| 742 | 1513 |
|
942
7eb8cbcca7c4
Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents:
940
diff
changeset
|
1514 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
|
1515 if repo.dirstate.state(abs) == '?': |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1516 continue |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1517 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
|
1518 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
|
1519 else: |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
723
diff
changeset
|
1520 ui.write(rel, end) |
| 627 | 1521 |
|
1031
503aaf19a040
Rewrite log command. New version is faster and more featureful.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1030
diff
changeset
|
1522 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
|
1523 """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
|
1524 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1525 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
|
1526 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1527 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
|
1528 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
|
1529 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
|
1530 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
|
1531 """ |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1552
diff
changeset
|
1532 class dui(object): |
| 1057 | 1533 # Implement and delegate some ui protocol. Save hunks of |
| 1534 # output for later display in the desired order. | |
| 1535 def __init__(self, ui): | |
| 1536 self.ui = ui | |
| 1537 self.hunk = {} | |
| 1538 def bump(self, rev): | |
| 1539 self.rev = rev | |
| 1540 self.hunk[rev] = [] | |
| 1541 def note(self, *args): | |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1542 if self.verbose: |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1543 self.write(*args) |
| 1057 | 1544 def status(self, *args): |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1545 if not self.quiet: |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1546 self.write(*args) |
| 1057 | 1547 def write(self, *args): |
| 1548 self.hunk[self.rev].append(args) | |
|
1381
c29c36745c6e
log --debug: fix misplaced manifest field
TK Soh <teekaysoh@yahoo.com>
parents:
1380
diff
changeset
|
1549 def debug(self, *args): |
|
c29c36745c6e
log --debug: fix misplaced manifest field
TK Soh <teekaysoh@yahoo.com>
parents:
1380
diff
changeset
|
1550 if self.debugflag: |
|
c29c36745c6e
log --debug: fix misplaced manifest field
TK Soh <teekaysoh@yahoo.com>
parents:
1380
diff
changeset
|
1551 self.write(*args) |
| 1057 | 1552 def __getattr__(self, key): |
| 1553 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
|
1554 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
|
1555 for st, rev, fns in changeiter: |
| 1057 | 1556 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
|
1557 du = dui(ui) |
| 1057 | 1558 elif st == 'add': |
| 1559 du.bump(rev) | |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
1560 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
|
1561 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
|
1562 if p != nullid] |
|
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
1563 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
|
1564 continue |
|
1436
db6d7b4005ba
add --only-merges (-m) log
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1435
diff
changeset
|
1565 if opts['only_merges'] and len(parents) != 2: |
|
db6d7b4005ba
add --only-merges (-m) log
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1435
diff
changeset
|
1566 continue |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
1567 |
|
1238
6a4f181497c9
Add log -b to show the branch a specific revision lives in
mason@suse.com
parents:
1233
diff
changeset
|
1568 br = None |
|
1373
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1569 if opts['keyword']: |
|
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1568
diff
changeset
|
1570 changes = getchange(rev) |
|
1373
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1571 miss = 0 |
|
1404
67e20e27d8df
log: make keyword search truly case-insensitive
TK Soh <teekaysoh@yahoo.com>
parents:
1402
diff
changeset
|
1572 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
|
1573 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
|
1574 k in changes[4].lower() or |
|
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1575 k in " ".join(changes[3][:20]).lower()): |
|
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1576 miss = 1 |
|
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1577 break |
|
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1578 if miss: |
|
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1579 continue |
|
965d1db5c95d
hg log: add -k for keyword searching
Matt Mackall <mpm@selenic.com>
parents:
1366
diff
changeset
|
1580 |
|
1405
6fd6527f95eb
log: speedup keyword search when used with --branch
TK Soh <teekaysoh@yahoo.com>
parents:
1404
diff
changeset
|
1581 if opts['branch']: |
|
6fd6527f95eb
log: speedup keyword search when used with --branch
TK Soh <teekaysoh@yahoo.com>
parents:
1404
diff
changeset
|
1582 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
|
1583 |
|
1238
6a4f181497c9
Add log -b to show the branch a specific revision lives in
mason@suse.com
parents:
1233
diff
changeset
|
1584 show_changeset(du, repo, rev, brinfo=br) |
| 1057 | 1585 if opts['patch']: |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
1586 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
|
1587 dodiff(du, du, repo, prev, changenode, match=matchfn) |
| 1057 | 1588 du.write("\n\n") |
| 1589 elif st == 'iter': | |
| 1590 for args in du.hunk[rev]: | |
| 1591 ui.write(*args) | |
| 255 | 1592 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1593 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
|
1594 """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
|
1595 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1596 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
|
1597 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1598 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
|
1599 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
|
1600 """ |
| 255 | 1601 if rev: |
| 689 | 1602 try: |
| 1603 # assume all revision numbers are for changesets | |
| 1604 n = repo.lookup(rev) | |
| 1605 change = repo.changelog.read(n) | |
| 1606 n = change[0] | |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1607 except hg.RepoError: |
| 689 | 1608 n = repo.manifest.lookup(rev) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1609 else: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1610 n = repo.manifest.tip() |
| 255 | 1611 m = repo.manifest.read(n) |
| 276 | 1612 mf = repo.manifest.readflags(n) |
| 255 | 1613 files = m.keys() |
| 1614 files.sort() | |
| 1615 | |
| 1616 for f in files: | |
| 1092 | 1617 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) |
| 255 | 1618 |
|
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
1619 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
|
1620 """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
|
1621 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1622 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
|
1623 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
|
1624 if a push was requested. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1625 """ |
| 1440 | 1626 dest = ui.expandpath(dest, repo.root) |
| 920 | 1627 other = hg.repository(ui, dest) |
| 1628 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
|
1629 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
|
1630 if opts['newest_first']: |
|
65cbe22b03fa
allow 'hg out' / 'hg in' to show newest commit first
Michal Kvasnica <kvasnica@gmail.com>
parents:
1437
diff
changeset
|
1631 o.reverse() |
| 920 | 1632 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
|
1633 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
|
1634 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
|
1635 continue |
| 920 | 1636 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
|
1637 if opts['patch']: |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
1638 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
|
1639 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
|
1640 ui.write("\n") |
| 920 | 1641 |
|
706
5107a7b6b14a
Make "hg parents REV" work (again?)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
705
diff
changeset
|
1642 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
|
1643 """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
|
1644 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1645 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
|
1646 """ |
|
706
5107a7b6b14a
Make "hg parents REV" work (again?)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
705
diff
changeset
|
1647 if rev: |
|
5107a7b6b14a
Make "hg parents REV" work (again?)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
705
diff
changeset
|
1648 p = repo.changelog.parents(repo.lookup(rev)) |
| 255 | 1649 else: |
| 1650 p = repo.dirstate.parents() | |
| 1651 | |
| 1652 for n in p: | |
| 1092 | 1653 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
|
1654 show_changeset(ui, repo, changenode=n) |
| 255 | 1655 |
| 1062 | 1656 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
|
1657 """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
|
1658 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1659 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
|
1660 definition of available names. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1661 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1662 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
|
1663 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
|
1664 """ |
| 915 | 1665 try: |
| 1666 repo = hg.repository(ui=ui) | |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1667 except hg.RepoError: |
| 915 | 1668 pass |
| 1669 | |
| 779 | 1670 if search: |
| 1671 for name, path in ui.configitems("paths"): | |
| 1672 if name == search: | |
| 1673 ui.write("%s\n" % path) | |
| 1674 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
|
1675 ui.warn(_("not found!\n")) |
| 779 | 1676 return 1 |
| 1677 else: | |
| 1678 for name, path in ui.configitems("paths"): | |
| 1679 ui.write("%s = %s\n" % (name, path)) | |
| 1680 | |
| 404 | 1681 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
|
1682 """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
|
1683 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1684 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
|
1685 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1686 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
|
1687 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
|
1688 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
|
1689 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1690 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
|
1691 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1692 local/filesystem/path |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1693 http://[user@]host[:port][/path] |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1694 https://[user@]host[:port][/path] |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1695 ssh://[user@]host[:port][/path] |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1696 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1697 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
|
1698 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
|
1699 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
|
1700 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
|
1701 """ |
| 1440 | 1702 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
|
1703 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
|
1704 |
|
963
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
1705 if opts['ssh']: |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
1706 ui.setconfig("ui", "ssh", opts['ssh']) |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
1707 if opts['remotecmd']: |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
1708 ui.setconfig("ui", "remotecmd", opts['remotecmd']) |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
961
diff
changeset
|
1709 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
1710 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
|
1711 revs = None |
|
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
1712 if opts['rev'] and not other.local(): |
|
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
1713 raise util.Abort("pull -r doesn't work for remote repositories yet") |
|
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
1714 elif opts['rev']: |
|
be6b5ce60b7f
Implementing pull -r and changing clone -r. Both now support
Eric Hopper <hopper@omnifarious.org>
parents:
1461
diff
changeset
|
1715 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
|
1716 r = repo.pull(other, heads=revs) |
| 625 | 1717 if not r: |
| 404 | 1718 if opts['update']: |
| 1719 return update(ui, repo) | |
| 580 | 1720 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
|
1721 ui.status(_("(run 'hg update' to get a working copy)\n")) |
| 404 | 1722 |
| 1723 return r | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
1724 |
| 961 | 1725 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
|
1726 """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
|
1727 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1728 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
|
1729 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1730 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
|
1731 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
|
1732 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
|
1733 from the current one. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1734 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1735 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
|
1736 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
|
1737 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
|
1738 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1739 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
|
1740 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1741 local/filesystem/path |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1742 ssh://[user@]host[:port][/path] |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1743 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1744 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
|
1745 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
|
1746 """ |
| 1440 | 1747 dest = ui.expandpath(dest, repo.root) |
|
640
b48b91d3fb4a
Switch push over to the new scheme
Matt Mackall <mpm@selenic.com>
parents:
639
diff
changeset
|
1748 ui.status('pushing to %s\n' % (dest)) |
| 319 | 1749 |
| 961 | 1750 if ssh: |
| 1751 ui.setconfig("ui", "ssh", ssh) | |
| 1752 if remotecmd: | |
| 1753 ui.setconfig("ui", "remotecmd", remotecmd) | |
| 1754 | |
|
640
b48b91d3fb4a
Switch push over to the new scheme
Matt Mackall <mpm@selenic.com>
parents:
639
diff
changeset
|
1755 other = hg.repository(ui, dest) |
| 818 | 1756 r = repo.push(other, force) |
|
640
b48b91d3fb4a
Switch push over to the new scheme
Matt Mackall <mpm@selenic.com>
parents:
639
diff
changeset
|
1757 return r |
| 319 | 1758 |
| 403 | 1759 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
|
1760 """raw commit interface |
|
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 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
|
1763 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1764 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
|
1765 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
|
1766 """ |
|
1496
3cf287a03664
remove the deprecated --text (t) option to rawcommit and tag
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1490
diff
changeset
|
1767 message = rc['message'] |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1768 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
|
1769 try: |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1770 message = open(rc['logfile']).read() |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1771 except IOError: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1772 pass |
|
762
312b4a10d862
Changed more occurances of 'text' to 'message'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
761
diff
changeset
|
1773 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
|
1774 raise util.Abort(_("missing commit message")) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
1775 |
| 403 | 1776 files = relpath(repo, list(flist)) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
1777 if rc['files']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
1778 files += open(rc['files']).read().splitlines() |
|
452
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
1779 |
|
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
1780 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
|
1781 |
|
1202
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
1782 try: |
|
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
1783 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
|
1784 except ValueError, inst: |
|
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
1785 raise util.Abort(str(inst)) |
|
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
1786 |
| 245 | 1787 def recover(ui, repo): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1788 """roll back an interrupted transaction |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1789 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1790 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
|
1791 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1792 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
|
1793 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
|
1794 """ |
|
1516
0b1b029b4de3
Automatically run "verify" whenever we run "recover"
Matt Mackall <mpm@selenic.com>
parents:
1514
diff
changeset
|
1795 if repo.recover(): |
|
0b1b029b4de3
Automatically run "verify" whenever we run "recover"
Matt Mackall <mpm@selenic.com>
parents:
1514
diff
changeset
|
1796 return repo.verify() |
|
0b1b029b4de3
Automatically run "verify" whenever we run "recover"
Matt Mackall <mpm@selenic.com>
parents:
1514
diff
changeset
|
1797 return False |
| 245 | 1798 |
|
1188
b3ceb2d470fc
Fix up remove command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1187
diff
changeset
|
1799 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
|
1800 """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
|
1801 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1802 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
|
1803 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1804 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
|
1805 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
|
1806 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
|
1807 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
|
1808 """ |
|
1188
b3ceb2d470fc
Fix up remove command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1187
diff
changeset
|
1809 names = [] |
|
1189
4cbcc54695b2
Make removal check more complete and informative.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1188
diff
changeset
|
1810 def okaytoremove(abs, rel, exact): |
|
4cbcc54695b2
Make removal check more complete and informative.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1188
diff
changeset
|
1811 c, a, d, u = repo.changes(files = [abs]) |
|
4cbcc54695b2
Make removal check more complete and informative.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1188
diff
changeset
|
1812 reason = 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
|
1813 if c: reason = _('is modified') |
|
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
|
1814 elif a: reason = _('has been marked for add') |
|
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
|
1815 elif u: 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
|
1816 if 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
|
1817 if exact: 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
|
1818 else: |
|
4cbcc54695b2
Make removal check more complete and informative.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1188
diff
changeset
|
1819 return True |
|
1188
b3ceb2d470fc
Fix up remove command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1187
diff
changeset
|
1820 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
|
1821 if okaytoremove(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
|
1822 if ui.verbose or not exact: 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
|
1823 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
|
1824 repo.remove(names, unlink=True) |
| 245 | 1825 |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
1826 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
|
1827 """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
|
1828 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1829 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
|
1830 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
|
1831 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
|
1832 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1833 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
|
1834 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
|
1835 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
|
1836 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1837 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
|
1838 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1839 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
|
1840 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
|
1841 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
|
1842 """ |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
1843 errs, copied = docopy(ui, repo, pats, opts) |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
1844 names = [] |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
1845 for abs, rel, exact in copied: |
|
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
|
1846 if ui.verbose or not exact: ui.status(_('removing %s\n') % rel) |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
1847 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
|
1848 repo.remove(names, unlink=True) |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
1849 return errs |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
1850 |
|
1472
3c909a747d7f
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1470
diff
changeset
|
1851 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
|
1852 """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
|
1853 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1854 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
|
1855 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
|
1856 an unmodified state. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1857 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1858 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
|
1859 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
|
1860 |
|
1472
3c909a747d7f
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1470
diff
changeset
|
1861 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
|
1862 |
|
1568
1d7d0c07e8f3
make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1567
diff
changeset
|
1863 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
|
1864 """ |
|
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
1865 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
|
1866 repo.dirstate.parents()[0] |
|
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
1867 |
|
1568
1d7d0c07e8f3
make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1567
diff
changeset
|
1868 files, choose, anypats, cwd = matchpats(repo, pats, opts) |
|
1472
3c909a747d7f
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1470
diff
changeset
|
1869 (c, a, d, u) = repo.changes(match=choose) |
|
3c909a747d7f
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1470
diff
changeset
|
1870 repo.forget(a) |
|
3c909a747d7f
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1470
diff
changeset
|
1871 repo.undelete(d) |
| 588 | 1872 |
|
1472
3c909a747d7f
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1470
diff
changeset
|
1873 return repo.update(node, False, True, choose, False) |
| 588 | 1874 |
| 468 | 1875 def root(ui, repo): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1876 """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
|
1877 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1878 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
|
1879 """ |
| 468 | 1880 ui.write(repo.root + "\n") |
| 1881 | |
| 245 | 1882 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
|
1883 """export the repository via HTTP |
|
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 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
|
1886 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1887 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
|
1888 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
|
1889 """ |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1890 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1891 if opts["stdio"]: |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1892 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
|
1893 sys.stdout = sys.stderr |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1894 |
|
1420
b32b3509c7ab
Avoid insertion/deletion of CRs on stdio during hg serve
olivier.maquelin@intel.com
parents:
1415
diff
changeset
|
1895 # Prevent insertion/deletion of CRs |
|
b32b3509c7ab
Avoid insertion/deletion of CRs on stdio during hg serve
olivier.maquelin@intel.com
parents:
1415
diff
changeset
|
1896 util.set_binary(fin) |
|
b32b3509c7ab
Avoid insertion/deletion of CRs on stdio during hg serve
olivier.maquelin@intel.com
parents:
1415
diff
changeset
|
1897 util.set_binary(fout) |
|
b32b3509c7ab
Avoid insertion/deletion of CRs on stdio during hg serve
olivier.maquelin@intel.com
parents:
1415
diff
changeset
|
1898 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1899 def getarg(): |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1900 argline = fin.readline()[:-1] |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1901 arg, l = argline.split() |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1902 val = fin.read(int(l)) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1903 return arg, val |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1904 def respond(v): |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1905 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
|
1906 fout.write(v) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1907 fout.flush() |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1908 |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1909 lock = None |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1910 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1911 while 1: |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1912 cmd = fin.readline()[:-1] |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1913 if cmd == '': |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1914 return |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1915 if cmd == "heads": |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1916 h = repo.heads() |
| 1092 | 1917 respond(" ".join(map(hex, h)) + "\n") |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1918 if cmd == "lock": |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1919 lock = repo.lock() |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1920 respond("") |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1921 if cmd == "unlock": |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1922 if lock: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1923 lock.release() |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1924 lock = None |
|
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
1925 respond("") |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1926 elif cmd == "branches": |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1927 arg, nodes = getarg() |
| 1092 | 1928 nodes = map(bin, nodes.split(" ")) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1929 r = [] |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1930 for b in repo.branches(nodes): |
| 1092 | 1931 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
|
1932 respond("".join(r)) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1933 elif cmd == "between": |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1934 arg, pairs = getarg() |
| 1092 | 1935 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
|
1936 r = [] |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1937 for b in repo.between(pairs): |
| 1092 | 1938 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
|
1939 respond("".join(r)) |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1940 elif cmd == "changegroup": |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1941 nodes = [] |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1942 arg, roots = getarg() |
| 1092 | 1943 nodes = map(bin, roots.split(" ")) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1944 |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1945 cg = repo.changegroup(nodes) |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1946 while 1: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1947 d = cg.read(4096) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1948 if not d: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1949 break |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
1950 fout.write(d) |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1951 |
|
667
31a9aa890016
A number of minor fixes to problems that pychecker found.
mark.williamson@cl.cam.ac.uk
parents:
654
diff
changeset
|
1952 fout.flush() |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
1953 |
|
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1954 elif cmd == "addchangegroup": |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1955 if not lock: |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1956 respond("not locked") |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1957 continue |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1958 respond("") |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1959 |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1960 r = repo.addchangegroup(fin) |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1961 respond("") |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
1962 |
| 987 | 1963 optlist = "name templates style address port ipv6 accesslog errorlog" |
| 1964 for o in optlist.split(): | |
| 1965 if opts[o]: | |
| 1966 ui.setconfig("web", o, opts[o]) | |
| 1967 | |
|
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
|
1968 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
|
1969 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
|
1970 except socket.error, inst: |
|
862f53c1d0f9
hg serve: print a more useful error message if server can't start.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1147
diff
changeset
|
1971 raise util.Abort('cannot start server: ' + inst.args[1]) |
| 987 | 1972 |
|
603
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1973 if ui.verbose: |
|
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1974 addr, port = httpd.socket.getsockname() |
|
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1975 if addr == '0.0.0.0': |
|
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1976 addr = socket.gethostname() |
|
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1977 else: |
|
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1978 try: |
|
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1979 addr = socket.gethostbyaddr(addr)[0] |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1980 except socket.error: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1981 pass |
|
603
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
1982 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
|
1983 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
|
1984 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
|
1985 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
|
1986 httpd.serve_forever() |
|
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
1987 |
|
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
729
diff
changeset
|
1988 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
|
1989 """show changed files in the working directory |
| 213 | 1990 |
|
1568
1d7d0c07e8f3
make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1567
diff
changeset
|
1991 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
|
1992 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
|
1993 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1994 The codes used to show the status of files are: |
| 746 | 1995 M = modified |
| 245 | 1996 A = added |
| 1997 R = removed | |
|
842
8fb488773063
Rewritten change type selection for hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
841
diff
changeset
|
1998 ? = not tracked |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
1999 """ |
| 312 | 2000 |
|
1568
1d7d0c07e8f3
make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1567
diff
changeset
|
2001 files, matchfn, anypats, cwd = matchpats(repo, pats, opts) |
|
884
087771ebe2e6
Fix walk code for files that do not exist anywhere, and unhandled types.
Bryan O'Sullivan <bos@serpentine.com>
parents:
883
diff
changeset
|
2002 (c, a, d, u) = [[util.pathto(cwd, x) for x in n] |
|
823
f0446f6963d2
Use list comprehension in hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
820
diff
changeset
|
2003 for n in repo.changes(files=files, match=matchfn)] |
| 213 | 2004 |
|
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
|
2005 changetypes = [(_('modified'), 'M', c), |
|
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
|
2006 (_('added'), 'A', 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
|
2007 (_('removed'), 'R', d), |
|
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
|
2008 (_('unknown'), '?', u)] |
|
842
8fb488773063
Rewritten change type selection for hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
841
diff
changeset
|
2009 |
|
1085
6f94688b81b6
status: added option -p and -0 to assist xargs
TK Soh <teekaysoh@yahoo.com>
parents:
1081
diff
changeset
|
2010 end = opts['print0'] and '\0' or '\n' |
|
1106
95a044b73bd5
Whitespace cleanup.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1105
diff
changeset
|
2011 |
|
842
8fb488773063
Rewritten change type selection for hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
841
diff
changeset
|
2012 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
|
2013 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
|
2014 if opts['no_status']: |
|
1085
6f94688b81b6
status: added option -p and -0 to assist xargs
TK Soh <teekaysoh@yahoo.com>
parents:
1081
diff
changeset
|
2015 format = "%%s%s" % end |
|
6f94688b81b6
status: added option -p and -0 to assist xargs
TK Soh <teekaysoh@yahoo.com>
parents:
1081
diff
changeset
|
2016 else: |
|
6f94688b81b6
status: added option -p and -0 to assist xargs
TK Soh <teekaysoh@yahoo.com>
parents:
1081
diff
changeset
|
2017 format = "%s %%s%s" % (char, end); |
|
1106
95a044b73bd5
Whitespace cleanup.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1105
diff
changeset
|
2018 |
|
842
8fb488773063
Rewritten change type selection for hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
841
diff
changeset
|
2019 for f in changes: |
|
1085
6f94688b81b6
status: added option -p and -0 to assist xargs
TK Soh <teekaysoh@yahoo.com>
parents:
1081
diff
changeset
|
2020 ui.write(format % f) |
| 213 | 2021 |
|
1596
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1589
diff
changeset
|
2022 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
|
2023 """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
|
2024 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2025 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
|
2026 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2027 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
|
2028 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
|
2029 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
|
2030 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2031 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
|
2032 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2033 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
|
2034 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
|
2035 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
|
2036 necessary. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2037 """ |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
2038 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
|
2039 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
|
2040 if opts['rev']: |
|
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1589
diff
changeset
|
2041 rev_ = opts['rev'] |
|
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1589
diff
changeset
|
2042 if rev_: |
|
41366b7d6709
fix 'hg tag <tagname> <revision>
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1589
diff
changeset
|
2043 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
|
2044 else: |
| 1092 | 2045 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
|
2046 |
|
1561
9c6d0abdb94e
disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1560
diff
changeset
|
2047 disallowed = (revrangesep, '\r', '\n') |
|
9c6d0abdb94e
disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1560
diff
changeset
|
2048 for c in disallowed: |
|
9c6d0abdb94e
disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1560
diff
changeset
|
2049 if name.find(c) >= 0: |
|
9c6d0abdb94e
disallow '\n' and '\r' in tag names
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1560
diff
changeset
|
2050 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
|
2051 |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
2052 if opts['local']: |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
2053 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
|
2054 return |
|
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
2055 |
| 723 | 2056 (c, a, d, u) = repo.changes() |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
2057 for x in (c, a, d, u): |
| 580 | 2058 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
|
2059 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
|
2060 "(please commit .hgtags manually)")) |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
2061 |
| 617 | 2062 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
|
2063 if repo.dirstate.state(".hgtags") == '?': |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2064 repo.add([".hgtags"]) |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
2065 |
|
1496
3cf287a03664
remove the deprecated --text (t) option to rawcommit and tag
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1490
diff
changeset
|
2066 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
|
2067 _("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
|
2068 try: |
|
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
2069 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
|
2070 except ValueError, inst: |
|
71111d796e40
Commit date validation: more stringent checks, more useful error messages.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1194
diff
changeset
|
2071 raise util.Abort(str(inst)) |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
2072 |
| 248 | 2073 def tags(ui, repo): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2074 """list repository tags |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2075 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2076 List the repository tags. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2077 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2078 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
|
2079 """ |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
2080 |
| 343 | 2081 l = repo.tagslist() |
| 2082 l.reverse() | |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
2083 for t, n in l: |
| 248 | 2084 try: |
| 1092 | 2085 r = "%5d:%s" % (repo.changelog.rev(n), hex(n)) |
| 248 | 2086 except KeyError: |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
2087 r = " ?:?" |
|
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
2088 ui.write("%-30s %s\n" % (t, r)) |
| 248 | 2089 |
| 245 | 2090 def tip(ui, repo): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2091 """show the tip revision |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2092 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2093 Show the tip revision. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2094 """ |
| 245 | 2095 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
|
2096 show_changeset(ui, repo, changenode=n) |
| 245 | 2097 |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2098 def unbundle(ui, repo, fname): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2099 """apply a changegroup file |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2100 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2101 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
|
2102 command. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2103 """ |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2104 f = urllib.urlopen(fname) |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2105 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2106 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
|
2107 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
|
2108 |
|
1374
c3654cfaa77d
Fix hg unbundle chunking performance bug
Eric Hopper <hopper@omnifarious.org>
parents:
1373
diff
changeset
|
2109 def bzgenerator(f): |
|
c3654cfaa77d
Fix hg unbundle chunking performance bug
Eric Hopper <hopper@omnifarious.org>
parents:
1373
diff
changeset
|
2110 zd = bz2.BZ2Decompressor() |
|
c3654cfaa77d
Fix hg unbundle chunking performance bug
Eric Hopper <hopper@omnifarious.org>
parents:
1373
diff
changeset
|
2111 for chunk in f: |
|
c3654cfaa77d
Fix hg unbundle chunking performance bug
Eric Hopper <hopper@omnifarious.org>
parents:
1373
diff
changeset
|
2112 yield zd.decompress(chunk) |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2113 |
|
1374
c3654cfaa77d
Fix hg unbundle chunking performance bug
Eric Hopper <hopper@omnifarious.org>
parents:
1373
diff
changeset
|
2114 bzgen = bzgenerator(util.filechunkiter(f, 4096)) |
|
c3654cfaa77d
Fix hg unbundle chunking performance bug
Eric Hopper <hopper@omnifarious.org>
parents:
1373
diff
changeset
|
2115 repo.addchangegroup(util.chunkbuffer(bzgen)) |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2116 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2117 def undo(ui, repo): |
| 596 | 2118 """undo the last commit or pull |
| 2119 | |
| 2120 Roll back the last pull or commit transaction on the | |
| 2121 repository, restoring the project to its earlier state. | |
| 2122 | |
| 2123 This command should be used with care. There is only one level of | |
| 2124 undo and there is no redo. | |
| 2125 | |
| 2126 This command is not intended for use on public repositories. Once | |
| 2127 a change is visible for pull by other users, undoing it locally is | |
| 2128 ineffective. | |
| 2129 """ | |
| 210 | 2130 repo.undo() |
| 2131 | |
|
1581
db10b7114de0
abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1571
diff
changeset
|
2132 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
|
2133 branch=None): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2134 """update or merge working directory |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2135 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2136 Update the working directory to the specified revision. |
| 254 | 2137 |
| 2138 If there are no outstanding changes in the working directory and | |
| 2139 there is a linear relationship between the current version and the | |
| 2140 requested version, the result is the requested version. | |
| 2141 | |
| 2142 Otherwise the result is a merge between the contents of the | |
| 2143 current working directory and the requested version. Files that | |
| 2144 changed between either parent are marked as changed for the next | |
| 2145 commit and a commit must be performed before any further updates | |
| 2146 are allowed. | |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2147 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2148 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
|
2149 merging or discarding local changes. |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2150 """ |
| 898 | 2151 if branch: |
| 2152 br = repo.branchlookup(branch=branch) | |
| 2153 found = [] | |
| 2154 for x in br: | |
| 2155 if branch in br[x]: | |
| 2156 found.append(x) | |
| 2157 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
|
2158 ui.warn(_("Found multiple heads for %s\n") % branch) |
| 898 | 2159 for x in found: |
| 2160 show_changeset(ui, repo, changenode=x, brinfo=br) | |
| 2161 return 1 | |
| 2162 if len(found) == 1: | |
| 2163 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
|
2164 ui.warn(_("Using head %s for branch %s\n") % (short(node), branch)) |
| 898 | 2165 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
|
2166 ui.warn(_("branch %s not found\n") % (branch)) |
| 898 | 2167 return 1 |
| 2168 else: | |
| 2169 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
|
2170 return repo.update(node, allow=merge, force=clean, forcemerge=force) |
| 254 | 2171 |
| 247 | 2172 def verify(ui, repo): |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2173 """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
|
2174 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2175 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
|
2176 |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2177 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
|
2178 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
|
2179 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
|
2180 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
|
2181 """ |
| 247 | 2182 return repo.verify() |
| 2183 | |
| 255 | 2184 # Command options and aliases are listed here, alphabetically |
| 2185 | |
| 209 | 2186 table = { |
|
841
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2187 "^add": |
|
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2188 (add, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2189 [('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
|
2190 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
| 913 | 2191 "hg add [OPTION]... [FILE]..."), |
|
841
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2192 "addremove": |
|
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2193 (addremove, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2194 [('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
|
2195 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
841
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2196 "hg addremove [OPTION]... [FILE]..."), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2197 "^annotate": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2198 (annotate, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2199 [('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
|
2200 ('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
|
2201 ('u', 'user', None, _('list the author')), |
| 1522 | 2202 ('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
|
2203 ('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
|
2204 ('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
|
2205 ('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
|
2206 ('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
|
2207 _('hg annotate [OPTION]... FILE...')), |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2208 "bundle": |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2209 (bundle, |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2210 [], |
|
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
|
2211 _('hg bundle FILE DEST')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2212 "cat": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2213 (cat, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2214 [('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
|
2215 ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2216 ('o', 'output', "", _('print output to file with formatted name')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2217 ('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
|
2218 _('hg cat [OPTION]... FILE...')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2219 "^clone": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2220 (clone, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2221 [('U', 'noupdate', None, _('do not update the new working directory')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2222 ('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
|
2223 ('', 'pull', None, _('use pull protocol to copy metadata')), |
| 1469 | 2224 ('r', 'rev', [], _('a changeset you would like to have after cloning')), |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2225 ('', 'remotecmd', "", _('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
|
2226 _('hg clone [OPTION]... SOURCE [DEST]')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2227 "^commit|ci": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2228 (commit, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2229 [('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
|
2230 ('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
|
2231 ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2232 ('m', 'message', "", _('use <text> as commit message')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2233 ('l', 'logfile', "", _('read the commit message from <file>')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2234 ('d', 'date', "", _('record datecode as commit date')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2235 ('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
|
2236 _('hg commit [OPTION]... [FILE]...')), |
|
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
2237 "copy|cp": (copy, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2238 [('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
|
2239 ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2240 ('A', 'after', None, _('record a copy that has already occurred')), |
|
1456
214f42f23a3b
Remove copy/rename --parents option
Matt Mackall <mpm@selenic.com>
parents:
1455
diff
changeset
|
2241 ('f', 'force', None, _('forcibly copy over an existing managed 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
|
2242 _('hg copy [OPTION]... [SOURCE]... DEST')), |
|
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
|
2243 "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
|
2244 "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
|
2245 "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
|
2246 "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
|
2247 "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
|
2248 "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
|
2249 "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
|
2250 "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
|
2251 "debugrename": (debugrename, [], _('debugrename FILE [REV]')), |
|
841
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2252 "debugwalk": |
|
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2253 (debugwalk, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2254 [('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
|
2255 ('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
|
2256 _('debugwalk [OPTION]... [FILE]...')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2257 "^diff": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2258 (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
|
2259 [('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
|
2260 ('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
|
2261 ('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
|
2262 ('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
|
2263 _('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
|
2264 "^export": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2265 (export, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2266 [('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
|
2267 ('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
|
2268 ('', 'switch-parent', None, _('diff against the second parent'))], |
|
1054
5139ee9bfc38
Fixed some synopsises in command help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1053
diff
changeset
|
2269 "hg export [-a] [-o OUTFILE] REV..."), |
|
841
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2270 "forget": |
|
03cc2ba291d1
Realigned command table again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
2271 (forget, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2272 [('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
|
2273 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
| 913 | 2274 "hg forget [OPTION]... FILE..."), |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
2275 "grep": |
|
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
2276 (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
|
2277 [('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
|
2278 ('I', 'include', [], _('include names matching the given patterns')), |
|
1490
c3ffdb2c4091
minor doc fix
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1483
diff
changeset
|
2279 ('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
|
2280 ('', '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
|
2281 ('i', 'ignore-case', None, _('ignore case when matching')), |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2282 ('l', 'files-with-matches', None, _('print only filenames and revs that match')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2283 ('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
|
2284 ('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
|
2285 ('u', 'user', None, _('print user who committed change'))], |
|
1108
7a75d8fbbdaf
Remove some options from 'hg grep':
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1106
diff
changeset
|
2286 "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
|
2287 "heads": |
|
65763ff9fa53
Update online help of hg heads for new --branches option.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
904
diff
changeset
|
2288 (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
|
2289 [('b', 'branches', None, _('find branch info')), |
|
1551
e793cbc8be00
Fixes to "hg heads -r FOO":
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1550
diff
changeset
|
2290 ('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
|
2291 _('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
|
2292 "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
|
2293 "identify|id": (identify, [], _('hg identify')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2294 "import|patch": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2295 (import_, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2296 [('p', 'strip', 1, _('directory strip option for patch. This has the same\n') + |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2297 _('meaning as the corresponding patch option')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2298 ('f', 'force', None, _('skip check for outstanding uncommitted changes')), |
|
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
|
2299 ('b', 'base', "", _('base path'))], |
|
1054
5139ee9bfc38
Fixed some synopsises in command help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1053
diff
changeset
|
2300 "hg import [-f] [-p NUM] [-b BASE] PATCH..."), |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
2301 "incoming|in": (incoming, |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
2302 [('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
|
2303 ('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
|
2304 ('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
|
2305 _('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
|
2306 "^init": (init, [], _('hg init [DEST]')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2307 "locate": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2308 (locate, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2309 [('r', 'rev', '', _('search the repository as it stood at rev')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2310 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2311 ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2312 ('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
|
2313 ('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
|
2314 _('hg locate [OPTION]... [PATTERN]...')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2315 "^log|history": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2316 (log, |
|
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')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2318 ('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
|
2319 ('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
|
2320 ('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
|
2321 ('r', 'rev', [], _('show the specified revision or range')), |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
2322 ('M', 'no-merges', None, _("do not show merges")), |
|
1436
db6d7b4005ba
add --only-merges (-m) log
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1435
diff
changeset
|
2323 ('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
|
2324 ('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
|
2325 _('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
|
2326 "manifest": (manifest, [], _('hg manifest [REV]')), |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
2327 "outgoing|out": (outgoing, |
|
1435
22b44fd9a166
add --no-merges (-M) for log, outgoing, incoming
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1431
diff
changeset
|
2328 [('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
|
2329 ('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
|
2330 ('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
|
2331 _('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
|
2332 "^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
|
2333 "paths": (paths, [], _('hg paths [NAME]')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2334 "^pull": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2335 (pull, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2336 [('u', 'update', None, _('update the working directory to tip after pull')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2337 ('e', 'ssh', "", _('specify ssh command to use')), |
| 1469 | 2338 ('r', 'rev', [], _('a specific revision you would like to pull')), |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2339 ('', 'remotecmd', "", _('specify hg command to run on the remote side'))], |
| 1469 | 2340 _('hg pull [-u] [-e FILE] [-r rev] [--remotecmd FILE] [SOURCE]')), |
| 818 | 2341 "^push": |
| 2342 (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
|
2343 [('f', 'force', None, _('force push')), |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2344 ('e', 'ssh', "", _('specify ssh command to use')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2345 ('', 'remotecmd', "", _('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
|
2346 _('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
|
2347 "rawcommit": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2348 (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
|
2349 [('p', 'parent', [], _('parent')), |
|
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
|
2350 ('d', 'date', "", _('date code')), |
|
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
|
2351 ('u', 'user', "", _('user')), |
|
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
|
2352 ('F', 'files', "", _('file list')), |
|
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
|
2353 ('m', 'message', "", _('commit message')), |
|
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
|
2354 ('l', 'logfile', "", _('commit message 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
|
2355 _('hg rawcommit [OPTION]... [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
|
2356 "recover": (recover, [], _("hg recover")), |
|
1188
b3ceb2d470fc
Fix up remove command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1187
diff
changeset
|
2357 "^remove|rm": (remove, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2358 [('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
|
2359 ('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
|
2360 _("hg remove [OPTION]... FILE...")), |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1250
diff
changeset
|
2361 "rename|mv": (rename, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2362 [('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
|
2363 ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2364 ('A', 'after', None, _('record a rename that has already occurred')), |
|
1456
214f42f23a3b
Remove copy/rename --parents option
Matt Mackall <mpm@selenic.com>
parents:
1455
diff
changeset
|
2365 ('f', 'force', None, _('forcibly copy over an existing managed 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
|
2366 _('hg rename [OPTION]... [SOURCE]... DEST')), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2367 "^revert": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2368 (revert, |
|
1472
3c909a747d7f
make revert use standard matcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1470
diff
changeset
|
2369 [('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
|
2370 ('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
|
2371 ("r", "rev", "", _("revision to revert to"))], |
|
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
|
2372 _("hg revert [-n] [-r REV] [NAME]...")), |
|
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
|
2373 "root": (root, [], _("hg root")), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2374 "^serve": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2375 (serve, |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2376 [('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
|
2377 ('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
|
2378 ('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
|
2379 ('a', 'address', '', _('address to use')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2380 ('n', 'name', "", _('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
|
2381 ('', 'stdio', None, _('for remote clients')), |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2382 ('t', 'templates', "", _('web templates to use')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2383 ('', '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
|
2384 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))], |
|
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
|
2385 _("hg serve [OPTION]...")), |
|
1507
cd8fadd8c689
Add explicit 'st' alias for status
Matt Mackall <mpm@selenic.com>
parents:
1506
diff
changeset
|
2386 "^status|st": |
|
840
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
2387 (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
|
2388 [('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
|
2389 ('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
|
2390 ('r', 'removed', None, _('show only removed 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
|
2391 ('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
|
2392 ('n', 'no-status', None, _('hide status prefix')), |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2393 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2394 ('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
|
2395 ('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
|
2396 _("hg status [OPTION]... [FILE]...")), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2397 "tag": |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2398 (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
|
2399 [('l', 'local', None, _('make the tag local')), |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2400 ('m', 'message', "", _('message for tag commit log entry')), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2401 ('d', 'date', "", _('record datecode as commit date')), |
|
1505
27f08094cfe0
Add support for -r option in hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
1504
diff
changeset
|
2402 ('u', 'user', "", _('record user as commiter')), |
|
27f08094cfe0
Add support for -r option in hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
1504
diff
changeset
|
2403 ('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
|
2404 _('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
|
2405 "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
|
2406 "tip": (tip, [], _('hg tip')), |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2407 "unbundle": |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2408 (unbundle, |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1215
diff
changeset
|
2409 [], |
|
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
|
2410 _('hg unbundle 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
|
2411 "undo": (undo, [], _('hg undo')), |
| 593 | 2412 "^update|up|checkout|co": |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2413 (update, |
|
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
|
2414 [('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
|
2415 ('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
|
2416 ('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
|
2417 ('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
|
2418 _('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
|
2419 "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
|
2420 "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
|
2421 } |
| 209 | 2422 |
|
1046
772507daaa17
Sort global options by topic: directories, ui, timing, other
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1044
diff
changeset
|
2423 globalopts = [ |
|
1437
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2424 ('R', 'repository', "", _("repository root directory")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2425 ('', 'cwd', '', _("change working directory")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2426 ('y', 'noninteractive', None, _("do not prompt, assume 'yes' for any required answers")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2427 ('q', 'quiet', None, _("suppress output")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2428 ('v', 'verbose', None, _("enable additional output")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2429 ('', 'debug', None, _("enable debugging output")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2430 ('', 'debugger', None, _("start debugger")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2431 ('', 'traceback', None, _("print traceback on exception")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2432 ('', 'time', None, _("time how long the command takes")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2433 ('', 'profile', None, _("print command execution profile")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2434 ('', 'version', None, _("output version information and exit")), |
|
ea51d296085f
import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1436
diff
changeset
|
2435 ('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
|
2436 ] |
| 596 | 2437 |
| 1262 | 2438 norepo = ("clone init version help debugancestor debugconfig debugdata" |
|
1065
6e94c0365d98
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
2439 " debugindex debugindexdot paths") |
| 209 | 2440 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2441 def find(cmd): |
|
1517
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
2442 """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
|
2443 choice = None |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2444 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
|
2445 aliases = e.lstrip("^").split("|") |
|
11c8b81f95fe
if unambigious command name are passed, use them
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1505
diff
changeset
|
2446 if cmd in aliases: |
|
1517
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
2447 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
|
2448 for a in aliases: |
|
11c8b81f95fe
if unambigious command name are passed, use them
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1505
diff
changeset
|
2449 if a.startswith(cmd): |
|
1517
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
2450 if choice: |
|
1518
ac4ca6bf2383
Improved error message for ambiguous command shortcuts.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1517
diff
changeset
|
2451 raise AmbiguousCommand(cmd) |
|
1517
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
2452 else: |
|
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
2453 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
|
2454 break |
|
1517
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
2455 if choice: |
|
b582dbc16165
Canonicalize command when using aliases or prefix matching.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1507
diff
changeset
|
2456 return choice |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2457 |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2458 raise UnknownCommand(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2459 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2460 class SignalInterrupt(Exception): |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2461 """Exception raised on SIGTERM and SIGHUP.""" |
| 214 | 2462 |
| 2463 def catchterm(*args): | |
| 2464 raise SignalInterrupt | |
| 2465 | |
| 249 | 2466 def run(): |
| 2467 sys.exit(dispatch(sys.argv[1:])) | |
| 2468 | |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2469 class ParseError(Exception): |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2470 """Exception raised on errors in parsing the command line.""" |
| 592 | 2471 |
|
1453
6fbb13b7a59f
get command defaults from hgrc
TK Soh <teekaysoh@yahoo.com>
parents:
1447
diff
changeset
|
2472 def parse(ui, args): |
| 209 | 2473 options = {} |
| 596 | 2474 cmdoptions = {} |
| 209 | 2475 |
| 592 | 2476 try: |
| 596 | 2477 args = fancyopts.fancyopts(args, globalopts, options) |
| 592 | 2478 except fancyopts.getopt.GetoptError, inst: |
|
618
4051b78c53c7
Handle unrecognised options correctly.
Bryan O'Sullivan <bos@serpentine.com>
parents:
617
diff
changeset
|
2479 raise ParseError(None, inst) |
| 209 | 2480 |
|
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
|
2481 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
|
2482 cmd, args = args[0], args[1:] |
|
1567
b4956bbbadc9
make command defaults works for aliases
TK Soh <teekaysoh@yahoo.com>
parents:
1565
diff
changeset
|
2483 aliases, i = find(cmd) |
|
b4956bbbadc9
make command defaults works for aliases
TK Soh <teekaysoh@yahoo.com>
parents:
1565
diff
changeset
|
2484 cmd = aliases[0] |
|
1453
6fbb13b7a59f
get command defaults from hgrc
TK Soh <teekaysoh@yahoo.com>
parents:
1447
diff
changeset
|
2485 defaults = ui.config("defaults", cmd) |
|
6fbb13b7a59f
get command defaults from hgrc
TK Soh <teekaysoh@yahoo.com>
parents:
1447
diff
changeset
|
2486 if defaults: |
|
1526
c230939283c3
fix a bug where command defaults suppress global options
TK Soh <teekaysoh@yahoo.com>
parents:
1525
diff
changeset
|
2487 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
|
2488 c = list(i[1]) |
| 209 | 2489 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
|
2490 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
|
2491 c = [] |
| 209 | 2492 |
| 592 | 2493 # combine global options into local |
| 596 | 2494 for o in globalopts: |
| 592 | 2495 c.append((o[0], o[1], options[o[1]], o[3])) |
| 214 | 2496 |
| 293 | 2497 try: |
| 596 | 2498 args = fancyopts.fancyopts(args, c, cmdoptions) |
| 293 | 2499 except fancyopts.getopt.GetoptError, inst: |
| 596 | 2500 raise ParseError(cmd, inst) |
| 209 | 2501 |
| 592 | 2502 # separate global options back out |
| 596 | 2503 for o in globalopts: |
| 592 | 2504 n = o[1] |
| 2505 options[n] = cmdoptions[n] | |
| 2506 del cmdoptions[n] | |
| 2507 | |
|
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
|
2508 return (cmd, cmd and i[0] or None, args, options, cmdoptions) |
| 596 | 2509 |
| 2510 def dispatch(args): | |
| 2511 signal.signal(signal.SIGTERM, catchterm) | |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2512 try: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2513 signal.signal(signal.SIGHUP, catchterm) |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2514 except AttributeError: |
|
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
2515 pass |
| 596 | 2516 |
|
1483
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1475
diff
changeset
|
2517 try: |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1475
diff
changeset
|
2518 u = ui.ui() |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1475
diff
changeset
|
2519 except util.Abort, inst: |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1475
diff
changeset
|
2520 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
|
2521 sys.exit(1) |
|
a4ba63e04134
Fix traceback on bad system hgrc files
Soh Tk-r28629 <tksoh@freescale.com>
parents:
1475
diff
changeset
|
2522 |
| 1071 | 2523 external = [] |
| 2524 for x in u.extensions(): | |
|
1545
d69070c2547a
fix errors found by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1543
diff
changeset
|
2525 def on_exception(exc, inst): |
|
1424
918cb47d725e
[issue21] cannot debug extension
Benoit Boissinot <mercurial-bugs@selenic.com>
parents:
1420
diff
changeset
|
2526 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
|
2527 u.warn("%s\n" % inst) |
|
918cb47d725e
[issue21] cannot debug extension
Benoit Boissinot <mercurial-bugs@selenic.com>
parents:
1420
diff
changeset
|
2528 if "--traceback" in sys.argv[1:]: |
|
918cb47d725e
[issue21] cannot debug extension
Benoit Boissinot <mercurial-bugs@selenic.com>
parents:
1420
diff
changeset
|
2529 traceback.print_exc() |
| 1071 | 2530 if x[1]: |
| 1342 | 2531 try: |
| 2532 mod = imp.load_source(x[0], x[1]) | |
|
1424
918cb47d725e
[issue21] cannot debug extension
Benoit Boissinot <mercurial-bugs@selenic.com>
parents:
1420
diff
changeset
|
2533 except Exception, inst: |
|
918cb47d725e
[issue21] cannot debug extension
Benoit Boissinot <mercurial-bugs@selenic.com>
parents:
1420
diff
changeset
|
2534 on_exception(Exception, inst) |
| 1342 | 2535 continue |
| 1071 | 2536 else: |
| 2537 def importh(name): | |
| 2538 mod = __import__(name) | |
| 2539 components = name.split('.') | |
| 2540 for comp in components[1:]: | |
| 2541 mod = getattr(mod, comp) | |
| 2542 return mod | |
| 1342 | 2543 try: |
| 2544 mod = importh(x[0]) | |
|
1424
918cb47d725e
[issue21] cannot debug extension
Benoit Boissinot <mercurial-bugs@selenic.com>
parents:
1420
diff
changeset
|
2545 except Exception, inst: |
|
918cb47d725e
[issue21] cannot debug extension
Benoit Boissinot <mercurial-bugs@selenic.com>
parents:
1420
diff
changeset
|
2546 on_exception(Exception, inst) |
| 1342 | 2547 continue |
| 2548 | |
| 1071 | 2549 external.append(mod) |
| 2550 for x in external: | |
|
1295
abcdf14449ea
Make contract with extensions optional.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1285
diff
changeset
|
2551 cmdtable = getattr(x, 'cmdtable', {}) |
|
abcdf14449ea
Make contract with extensions optional.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1285
diff
changeset
|
2552 for t in cmdtable: |
| 1071 | 2553 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
|
2554 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
|
2555 table.update(cmdtable) |
| 1071 | 2556 |
| 596 | 2557 try: |
|
1453
6fbb13b7a59f
get command defaults from hgrc
TK Soh <teekaysoh@yahoo.com>
parents:
1447
diff
changeset
|
2558 cmd, func, args, options, cmdoptions = parse(u, args) |
| 596 | 2559 except ParseError, inst: |
| 2560 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
|
2561 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
|
2562 help_(u, inst.args[0]) |
| 596 | 2563 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
|
2564 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
|
2565 help_(u, 'shortlist') |
| 596 | 2566 sys.exit(-1) |
|
1518
ac4ca6bf2383
Improved error message for ambiguous command shortcuts.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1517
diff
changeset
|
2567 except AmbiguousCommand, inst: |
|
ac4ca6bf2383
Improved error message for ambiguous command shortcuts.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1517
diff
changeset
|
2568 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
|
2569 sys.exit(1) |
| 596 | 2570 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
|
2571 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
|
2572 help_(u, 'shortlist') |
| 596 | 2573 sys.exit(1) |
| 2574 | |
|
783
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2575 if options["time"]: |
|
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2576 def get_times(): |
|
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2577 t = os.times() |
|
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2578 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
|
2579 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
|
2580 return t |
|
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2581 s = get_times() |
|
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2582 def print_time(): |
|
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2583 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
|
2584 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
|
2585 (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
|
2586 atexit.register(print_time) |
|
4b06fc1c0f26
Add a --time command line option to time hg commands
Stephen Darnell
parents:
779
diff
changeset
|
2587 |
| 1071 | 2588 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
|
2589 not options["noninteractive"]) |
| 592 | 2590 |
| 1225 | 2591 # enter the debugger before command execution |
| 2592 if options['debugger']: | |
| 2593 pdb.set_trace() | |
| 2594 | |
| 499 | 2595 try: |
| 527 | 2596 try: |
|
1048
7fbb440b2e63
Added options -h/--help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1047
diff
changeset
|
2597 if options['help']: |
|
1049
160a68cd393f
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1048
diff
changeset
|
2598 help_(u, cmd, options['version']) |
|
1048
7fbb440b2e63
Added options -h/--help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1047
diff
changeset
|
2599 sys.exit(0) |
|
7fbb440b2e63
Added options -h/--help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1047
diff
changeset
|
2600 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
|
2601 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
|
2602 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
|
2603 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
|
2604 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
|
2605 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
|
2606 |
|
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
|
2607 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
|
2608 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
|
2609 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
|
2610 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
|
2611 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
|
2612 (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
|
2613 |
| 527 | 2614 if cmd not in norepo.split(): |
| 2615 path = options["repository"] or "" | |
| 2616 repo = hg.repository(ui=u, path=path) | |
| 1071 | 2617 for x in external: |
|
1295
abcdf14449ea
Make contract with extensions optional.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1285
diff
changeset
|
2618 if hasattr(x, 'reposetup'): x.reposetup(u, repo) |
| 596 | 2619 d = lambda: func(u, repo, *args, **cmdoptions) |
| 527 | 2620 else: |
| 596 | 2621 d = lambda: func(u, *args, **cmdoptions) |
| 209 | 2622 |
| 527 | 2623 if options['profile']: |
| 2624 import hotshot, hotshot.stats | |
| 2625 prof = hotshot.Profile("hg.prof") | |
| 2626 r = prof.runcall(d) | |
| 2627 prof.close() | |
| 2628 stats = hotshot.stats.load("hg.prof") | |
| 2629 stats.strip_dirs() | |
| 2630 stats.sort_stats('time', 'calls') | |
| 2631 stats.print_stats(40) | |
| 2632 return r | |
| 2633 else: | |
| 2634 return d() | |
| 2635 except: | |
| 1225 | 2636 # enter the debugger when we hit an exception |
| 2637 if options['debugger']: | |
| 2638 pdb.post_mortem(sys.exc_info()[2]) | |
| 527 | 2639 if options['traceback']: |
| 2640 traceback.print_exc() | |
| 2641 raise | |
| 499 | 2642 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
|
2643 u.warn(_("abort: "), inst, "!\n") |
| 1214 | 2644 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
|
2645 u.warn(_("abort: "), inst, "!\n") |
| 214 | 2646 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
|
2647 u.warn(_("killed!\n")) |
| 209 | 2648 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
|
2649 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
|
2650 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
|
2651 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
|
2652 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
|
2653 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
|
2654 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
|
2655 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
|
2656 raise |
| 250 | 2657 except IOError, inst: |
| 395 | 2658 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
|
2659 u.warn(_("abort: %s\n") % inst) |
| 395 | 2660 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
|
2661 u.warn(_("abort: error: %s\n") % inst.reason[1]) |
| 395 | 2662 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
|
2663 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
|
2664 u.warn(_("broken pipe\n")) |
| 1350 | 2665 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
|
2666 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
|
2667 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
|
2668 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
|
2669 u.warn(_("abort: %s\n") % inst.strerror) |
| 250 | 2670 else: |
| 2671 raise | |
| 549 | 2672 except OSError, inst: |
| 2673 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
|
2674 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) |
| 549 | 2675 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
|
2676 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
|
2677 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
|
2678 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
|
2679 sys.exit(1) |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2680 except TypeError, inst: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2681 # was this an argument error? |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2682 tb = traceback.extract_tb(sys.exc_info()[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2683 if len(tb) > 2: # no |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
2684 raise |
| 293 | 2685 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
|
2686 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
|
2687 help_(u, cmd) |
|
1536
b4ed825282fe
Catch the exception raised with 'hg help <somethingambiguous>'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1525
diff
changeset
|
2688 except AmbiguousCommand, inst: |
|
b4ed825282fe
Catch the exception raised with 'hg help <somethingambiguous>'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1525
diff
changeset
|
2689 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
|
2690 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
|
2691 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
|
2692 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
|
2693 help_(u, 'shortlist') |
|
1215
8b4435aae40a
Add reporting instructions to unknown exception backtraces
mpm@selenic.com
parents:
1214
diff
changeset
|
2694 except SystemExit: |
| 1229 | 2695 # 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
|
2696 raise |
|
8b4435aae40a
Add reporting instructions to unknown exception backtraces
mpm@selenic.com
parents:
1214
diff
changeset
|
2697 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
|
2698 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
|
2699 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
|
2700 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
|
2701 % version.get_version()) |
|
1215
8b4435aae40a
Add reporting instructions to unknown exception backtraces
mpm@selenic.com
parents:
1214
diff
changeset
|
2702 raise |
| 293 | 2703 |
|
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
500
diff
changeset
|
2704 sys.exit(-1) |