author | Bryan O'Sullivan <bos@serpentine.com> |
Sat, 16 Jul 2005 15:13:40 -0800 | |
changeset 723 | 9e0f3ba4a9c2 |
parent 705 | 574869103985 |
child 724 | 1c0c413cccdd |
permissions | -rw-r--r-- |
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 |
698
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
9 |
demandload(globals(), "os re sys signal shutil") |
613
5374955ec5b1
Demand-load most modules in the commands and ui modules.
Bryan O'Sullivan <bos@serpentine.com>
parents:
612
diff
changeset
|
10 |
demandload(globals(), "fancyopts ui hg util") |
627 | 11 |
demandload(globals(), "fnmatch hgweb mdiff random signal time traceback") |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
12 |
demandload(globals(), "errno socket version struct") |
209 | 13 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
14 |
class UnknownCommand(Exception): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
15 |
"""Exception raised if command is not in the command table.""" |
209 | 16 |
|
245 | 17 |
def filterfiles(filters, files): |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
18 |
l = [x for x in files if x in filters] |
213 | 19 |
|
245 | 20 |
for t in filters: |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
21 |
if t and t[-1] != "/": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
22 |
t += "/" |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
23 |
l += [x for x in files if x.startswith(t)] |
213 | 24 |
return l |
25 |
||
245 | 26 |
def relfilter(repo, files): |
628
8d7f6e68828a
Use repo.getcwd() in a few obvious places.
Bryan O'Sullivan <bos@serpentine.com>
parents:
627
diff
changeset
|
27 |
cwd = repo.getcwd() |
8d7f6e68828a
Use repo.getcwd() in a few obvious places.
Bryan O'Sullivan <bos@serpentine.com>
parents:
627
diff
changeset
|
28 |
if cwd: |
8d7f6e68828a
Use repo.getcwd() in a few obvious places.
Bryan O'Sullivan <bos@serpentine.com>
parents:
627
diff
changeset
|
29 |
return filterfiles([util.pconvert(cwd)], files) |
245 | 30 |
return files |
213 | 31 |
|
209 | 32 |
def relpath(repo, args): |
628
8d7f6e68828a
Use repo.getcwd() in a few obvious places.
Bryan O'Sullivan <bos@serpentine.com>
parents:
627
diff
changeset
|
33 |
cwd = repo.getcwd() |
8d7f6e68828a
Use repo.getcwd() in a few obvious places.
Bryan O'Sullivan <bos@serpentine.com>
parents:
627
diff
changeset
|
34 |
if cwd: |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
35 |
return [util.pconvert(os.path.normpath(os.path.join(cwd, x))) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
36 |
for x in args] |
209 | 37 |
return args |
245 | 38 |
|
580 | 39 |
revrangesep = ':' |
40 |
||
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
41 |
def revrange(ui, repo, revs, revlog=None): |
580 | 42 |
if revlog is None: |
43 |
revlog = repo.changelog |
|
44 |
revcount = revlog.count() |
|
45 |
def fix(val, defval): |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
46 |
if not val: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
47 |
return defval |
580 | 48 |
try: |
49 |
num = int(val) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
50 |
if str(num) != val: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
51 |
raise ValueError |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
52 |
if num < 0: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
53 |
num += revcount |
580 | 54 |
if not (0 <= num < revcount): |
55 |
raise ValueError |
|
56 |
except ValueError: |
|
57 |
try: |
|
58 |
num = repo.changelog.rev(repo.lookup(val)) |
|
59 |
except KeyError: |
|
60 |
try: |
|
61 |
num = revlog.rev(revlog.lookup(val)) |
|
62 |
except KeyError: |
|
63 |
ui.warn('abort: invalid revision identifier %s\n' % val) |
|
64 |
sys.exit(1) |
|
65 |
return num |
|
66 |
for spec in revs: |
|
67 |
if spec.find(revrangesep) >= 0: |
|
68 |
start, end = spec.split(revrangesep, 1) |
|
69 |
start = fix(start, 0) |
|
70 |
end = fix(end, revcount - 1) |
|
71 |
if end > start: |
|
72 |
end += 1 |
|
73 |
step = 1 |
|
74 |
else: |
|
75 |
end -= 1 |
|
76 |
step = -1 |
|
77 |
for rev in xrange(start, end, step): |
|
78 |
yield str(rev) |
|
79 |
else: |
|
80 |
yield spec |
|
81 |
||
632 | 82 |
def make_filename(repo, r, pat, node=None, |
83 |
total=None, seqno=None, revwidth=None): |
|
84 |
node_expander = { |
|
85 |
'H': lambda: hg.hex(node), |
|
86 |
'R': lambda: str(r.rev(node)), |
|
87 |
'h': lambda: hg.short(node), |
|
88 |
} |
|
89 |
expander = { |
|
90 |
'%': lambda: '%', |
|
91 |
'b': lambda: os.path.basename(repo.root), |
|
92 |
} |
|
93 |
||
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
94 |
if node: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
95 |
expander.update(node_expander) |
632 | 96 |
if node and revwidth is not None: |
97 |
expander['r'] = lambda: str(r.rev(node)).zfill(revwidth) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
98 |
if total is not None: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
99 |
expander['N'] = lambda: str(total) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
100 |
if seqno is not None: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
101 |
expander['n'] = lambda: str(seqno) |
632 | 102 |
if total is not None and seqno is not None: |
103 |
expander['n'] = lambda:str(seqno).zfill(len(str(total))) |
|
104 |
||
105 |
newname = [] |
|
106 |
patlen = len(pat) |
|
107 |
i = 0 |
|
108 |
while i < patlen: |
|
109 |
c = pat[i] |
|
110 |
if c == '%': |
|
111 |
i += 1 |
|
112 |
c = pat[i] |
|
113 |
c = expander[c]() |
|
114 |
newname.append(c) |
|
115 |
i += 1 |
|
116 |
return ''.join(newname) |
|
117 |
||
700
d01b93efecd6
Removed extra spaces for default parameters according to PEP8.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
699
diff
changeset
|
118 |
def dodiff(fp, ui, repo, files=None, node1=None, node2=None): |
245 | 119 |
def date(c): |
120 |
return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
|
121 |
||
561 | 122 |
(c, a, d, u) = repo.changes(node1, node2, files) |
537 | 123 |
if files: |
124 |
c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) |
|
125 |
||
126 |
if not c and not a and not d: |
|
127 |
return |
|
128 |
||
245 | 129 |
if node2: |
130 |
change = repo.changelog.read(node2) |
|
131 |
mmap2 = repo.manifest.read(change[0]) |
|
132 |
date2 = date(change) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
133 |
def read(f): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
134 |
return repo.file(f).read(mmap2[f]) |
245 | 135 |
else: |
136 |
date2 = time.asctime() |
|
137 |
if not node1: |
|
138 |
node1 = repo.dirstate.parents()[0] |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
139 |
def read(f): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
140 |
return repo.wfile(f).read() |
245 | 141 |
|
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
|
142 |
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
|
143 |
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
|
144 |
else: |
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
395
diff
changeset
|
145 |
hexfunc = ui.verbose and hg.hex or hg.short |
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
395
diff
changeset
|
146 |
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
|
147 |
|
245 | 148 |
change = repo.changelog.read(node1) |
149 |
mmap = repo.manifest.read(change[0]) |
|
150 |
date1 = date(change) |
|
151 |
||
152 |
for f in c: |
|
275 | 153 |
to = None |
154 |
if f in mmap: |
|
155 |
to = repo.file(f).read(mmap[f]) |
|
245 | 156 |
tn = read(f) |
580 | 157 |
fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) |
245 | 158 |
for f in a: |
264
4c1d7072d5cd
Attempt to make diff deal with null sources properly
mpm@selenic.com
parents:
262
diff
changeset
|
159 |
to = None |
245 | 160 |
tn = read(f) |
580 | 161 |
fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) |
245 | 162 |
for f in d: |
163 |
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
|
164 |
tn = None |
580 | 165 |
fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) |
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
166 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
167 |
def show_changeset(ui, repo, rev=0, changenode=None, filelog=None): |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
168 |
"""show a single changeset or file revision""" |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
169 |
changelog = repo.changelog |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
170 |
if filelog: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
171 |
log = filelog |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
172 |
filerev = rev |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
173 |
node = filenode = filelog.node(filerev) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
174 |
changerev = filelog.linkrev(filenode) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
175 |
changenode = changenode or changelog.node(changerev) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
176 |
else: |
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
177 |
log = changelog |
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
178 |
changerev = rev |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
179 |
if changenode is None: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
180 |
changenode = changelog.node(changerev) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
181 |
elif not changerev: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
182 |
rev = changerev = changelog.rev(changenode) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
183 |
node = changenode |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
184 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
185 |
if ui.quiet: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
186 |
ui.write("%d:%s\n" % (rev, hg.hex(node))) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
187 |
return |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
188 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
189 |
changes = changelog.read(changenode) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
190 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
191 |
parents = [(log.rev(parent), hg.hex(parent)) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
192 |
for parent in log.parents(node) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
193 |
if ui.debugflag or parent != hg.nullid] |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
194 |
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
|
195 |
parents = [] |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
196 |
|
687 | 197 |
ui.write("changeset: %d:%s\n" % (changerev, hg.hex(changenode))) |
198 |
for tag in repo.nodetags(changenode): |
|
199 |
ui.status("tag: %s\n" % tag) |
|
200 |
for parent in parents: |
|
201 |
ui.write("parent: %d:%s\n" % parent) |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
202 |
if filelog: |
687 | 203 |
ui.debug("file rev: %d:%s\n" % (filerev, hg.hex(filenode))) |
204 |
ui.note("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]), |
|
205 |
hg.hex(changes[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
|
206 |
ui.status("user: %s\n" % changes[1]) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
207 |
ui.status("date: %s\n" % time.asctime( |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
208 |
time.localtime(float(changes[2].split(' ')[0])))) |
493
30752b14f759
Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
209 |
if ui.debugflag: |
536 | 210 |
files = repo.changes(changelog.parents(changenode)[0], changenode) |
490
df9b77f67998
Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
211 |
for key, value in zip(["files:", "files+:", "files-:"], files): |
df9b77f67998
Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
212 |
if value: |
df9b77f67998
Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
213 |
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
|
214 |
else: |
30752b14f759
Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
215 |
ui.note("files: %s\n" % " ".join(changes[3])) |
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
216 |
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
|
217 |
if description: |
330 | 218 |
if ui.verbose: |
219 |
ui.status("description:\n") |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
220 |
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
|
221 |
ui.status("\n\n") |
330 | 222 |
else: |
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
223 |
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
|
224 |
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
|
225 |
|
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
226 |
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
|
227 |
"""output version and copyright information""" |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
228 |
ui.write("Mercurial version %s\n" % version.get_version()) |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
229 |
ui.status( |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
230 |
"\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
|
231 |
"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
|
232 |
"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
|
233 |
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
234 |
) |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
235 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
236 |
def help_(ui, cmd=None): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
237 |
"""show help for a given command or all commands""" |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
238 |
if cmd: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
239 |
try: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
240 |
i = find(cmd) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
241 |
ui.write("%s\n\n" % i[2]) |
293 | 242 |
|
243 |
if i[1]: |
|
244 |
for s, l, d, c in i[1]: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
245 |
opt = ' ' |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
246 |
if s: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
247 |
opt = opt + '-' + s + ' ' |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
248 |
if l: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
249 |
opt = opt + '--' + l + ' ' |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
250 |
if d: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
251 |
opt = opt + '(' + str(d) + ')' |
293 | 252 |
ui.write(opt, "\n") |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
253 |
if c: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
254 |
ui.write(' %s\n' % c) |
293 | 255 |
ui.write("\n") |
256 |
||
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
257 |
ui.write(i[0].__doc__, "\n") |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
258 |
except UnknownCommand: |
268 | 259 |
ui.warn("hg: unknown command %s\n" % cmd) |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
260 |
sys.exit(0) |
255 | 261 |
else: |
593 | 262 |
if ui.verbose: |
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
263 |
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
|
264 |
ui.write('\n') |
593 | 265 |
if ui.verbose: |
266 |
ui.write('hg commands:\n\n') |
|
267 |
else: |
|
596 | 268 |
ui.write('basic hg commands (use "hg help -v" for more):\n\n') |
209 | 269 |
|
255 | 270 |
h = {} |
479
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
271 |
for c, e in table.items(): |
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
272 |
f = c.split("|")[0] |
593 | 273 |
if not ui.verbose and not f.startswith("^"): |
479
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
274 |
continue |
593 | 275 |
if not ui.debugflag and f.startswith("debug"): |
276 |
continue |
|
277 |
f = f.lstrip("^") |
|
255 | 278 |
d = "" |
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
279 |
if e[0].__doc__: |
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
280 |
d = e[0].__doc__.splitlines(0)[0].rstrip() |
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
281 |
h[f] = d |
255 | 282 |
|
283 |
fns = h.keys() |
|
284 |
fns.sort() |
|
285 |
m = max(map(len, fns)) |
|
286 |
for f in fns: |
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
287 |
ui.write(' %-*s %s\n' % (m, f, h[f])) |
255 | 288 |
|
289 |
# Commands start here, listed alphabetically |
|
209 | 290 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
291 |
def add(ui, repo, file1, *files): |
245 | 292 |
'''add the specified files on the next commit''' |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
293 |
repo.add(relpath(repo, (file1,) + files)) |
213 | 294 |
|
353 | 295 |
def addremove(ui, repo, *files): |
255 | 296 |
"""add all new files, delete all missing files""" |
353 | 297 |
if files: |
298 |
files = relpath(repo, files) |
|
299 |
d = [] |
|
300 |
u = [] |
|
301 |
for f in files: |
|
302 |
p = repo.wjoin(f) |
|
303 |
s = repo.dirstate.state(f) |
|
304 |
isfile = os.path.isfile(p) |
|
305 |
if s != 'r' and not isfile: |
|
306 |
d.append(f) |
|
307 |
elif s not in 'nmai' and isfile: |
|
308 |
u.append(f) |
|
309 |
else: |
|
723 | 310 |
(c, a, d, u) = repo.changes() |
259 | 311 |
repo.add(u) |
245 | 312 |
repo.remove(d) |
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
313 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
314 |
def annotate(u, repo, file1, *files, **ops): |
255 | 315 |
"""show changeset information per file line""" |
209 | 316 |
def getnode(rev): |
317 |
return hg.short(repo.changelog.node(rev)) |
|
318 |
||
319 |
def getname(rev): |
|
320 |
try: |
|
321 |
return bcache[rev] |
|
322 |
except KeyError: |
|
323 |
cl = repo.changelog.read(repo.changelog.node(rev)) |
|
324 |
name = cl[1] |
|
325 |
f = name.find('@') |
|
326 |
if f >= 0: |
|
327 |
name = name[:f] |
|
534
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
532
diff
changeset
|
328 |
f = name.find('<') |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
532
diff
changeset
|
329 |
if f >= 0: |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
532
diff
changeset
|
330 |
name = name[f+1:] |
209 | 331 |
bcache[rev] = name |
332 |
return name |
|
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
333 |
|
209 | 334 |
bcache = {} |
335 |
opmap = [['user', getname], ['number', str], ['changeset', getnode]] |
|
336 |
if not ops['user'] and not ops['changeset']: |
|
337 |
ops['number'] = 1 |
|
338 |
||
227 | 339 |
node = repo.dirstate.parents()[0] |
209 | 340 |
if ops['revision']: |
341 |
node = repo.changelog.lookup(ops['revision']) |
|
342 |
change = repo.changelog.read(node) |
|
343 |
mmap = repo.manifest.read(change[0]) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
344 |
for f in relpath(repo, (file1,) + files): |
209 | 345 |
lines = repo.file(f).annotate(mmap[f]) |
346 |
pieces = [] |
|
347 |
||
348 |
for o, f in opmap: |
|
349 |
if ops[o]: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
350 |
l = [f(n) for n, dummy in lines] |
209 | 351 |
m = max(map(len, l)) |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
352 |
pieces.append(["%*s" % (m, x) for x in l]) |
209 | 353 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
354 |
for p, l in zip(zip(*pieces), lines): |
209 | 355 |
u.write(" ".join(p) + ": " + l[1]) |
356 |
||
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
357 |
def cat(ui, repo, file1, rev=None, **opts): |
255 | 358 |
"""output the latest or given revision of a file""" |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
359 |
r = repo.file(relpath(repo, [file1])[0]) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
360 |
if rev: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
361 |
n = r.lookup(rev) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
362 |
else: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
363 |
n = r.tip() |
632 | 364 |
if opts['output'] and opts['output'] != '-': |
365 |
try: |
|
366 |
outname = make_filename(repo, r, opts['output'], node=n) |
|
367 |
fp = open(outname, 'wb') |
|
368 |
except KeyError, inst: |
|
369 |
ui.warn("error: invlaid format spec '%%%s' in output file name\n" % |
|
370 |
inst.args[0]) |
|
371 |
sys.exit(1); |
|
372 |
else: |
|
373 |
fp = sys.stdout |
|
374 |
fp.write(r.read(n)) |
|
248 | 375 |
|
698
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
376 |
def clone(ui, source, dest=None, **opts): |
485 | 377 |
"""make a copy of an existing repository""" |
378 |
if dest is None: |
|
528 | 379 |
dest = os.path.basename(os.path.normpath(source)) |
532
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
380 |
|
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
381 |
if os.path.exists(dest): |
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
382 |
ui.warn("abort: destination '%s' already exists\n" % dest) |
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
383 |
return 1 |
523
003df62ae39f
[PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents:
522
diff
changeset
|
384 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
385 |
class Dircleanup: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
386 |
def __init__(self, dir_): |
625 | 387 |
self.rmtree = shutil.rmtree |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
388 |
self.dir_ = dir_ |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
389 |
os.mkdir(dir_) |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
390 |
def close(self): |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
391 |
self.dir_ = None |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
392 |
def __del__(self): |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
393 |
if self.dir_: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
394 |
self.rmtree(self.dir_, True) |
485 | 395 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
396 |
d = Dircleanup(dest) |
562
be6233a2bfdd
hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents:
561
diff
changeset
|
397 |
abspath = source |
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
632
diff
changeset
|
398 |
source = ui.expandpath(source) |
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
632
diff
changeset
|
399 |
other = hg.repository(ui, source) |
485 | 400 |
|
675
49de76abc4da
hg clone stored path fix
Mikael Berthe <mikael@lilotux.net>
parents:
674
diff
changeset
|
401 |
if other.dev() != -1: |
49de76abc4da
hg clone stored path fix
Mikael Berthe <mikael@lilotux.net>
parents:
674
diff
changeset
|
402 |
abspath = os.path.abspath(source) |
698
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
403 |
copyfile = (os.stat(dest).st_dev == other.dev() |
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
404 |
and getattr(os, 'link', None) or shutil.copy2) |
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
405 |
if copyfile is not shutil.copy2: |
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
406 |
ui.note("cloning by hardlink\n") |
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
407 |
util.copytree(os.path.join(source, ".hg"), os.path.join(dest, ".hg"), |
df78d8ccac4c
Use python function instead of external 'cp' command when cloning repos.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
697
diff
changeset
|
408 |
copyfile) |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
409 |
try: |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
410 |
os.unlink(os.path.join(dest, ".hg", "dirstate")) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
411 |
except IOError: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
412 |
pass |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
413 |
|
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
414 |
repo = hg.repository(ui, dest) |
485 | 415 |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
416 |
else: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
417 |
repo = hg.repository(ui, dest, create=1) |
625 | 418 |
repo.pull(other) |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
500
diff
changeset
|
419 |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
420 |
f = repo.opener("hgrc", "w") |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
421 |
f.write("[paths]\n") |
562
be6233a2bfdd
hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents:
561
diff
changeset
|
422 |
f.write("default = %s\n" % abspath) |
515 | 423 |
|
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
424 |
if not opts['noupdate']: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
425 |
update(ui, repo) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
426 |
|
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
427 |
d.close() |
515 | 428 |
|
289 | 429 |
def commit(ui, repo, *files, **opts): |
245 | 430 |
"""commit the specified files or all outstanding changes""" |
289 | 431 |
text = opts['text'] |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
432 |
logfile = opts['logfile'] |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
433 |
if not text and logfile: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
434 |
try: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
435 |
text = open(logfile).read() |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
436 |
except IOError, why: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
437 |
ui.warn("Can't read commit text %s: %s\n" % (logfile, why)) |
289 | 438 |
|
354 | 439 |
if opts['addremove']: |
440 |
addremove(ui, repo, *files) |
|
317 | 441 |
repo.commit(relpath(repo, files), text, opts['user'], opts['date']) |
245 | 442 |
|
363 | 443 |
def copy(ui, repo, source, dest): |
444 |
"""mark a file as copied or renamed for the next commit""" |
|
445 |
return repo.copy(*relpath(repo, (source, dest))) |
|
446 |
||
596 | 447 |
def debugcheckstate(ui, repo): |
448 |
"""validate the correctness of the current dirstate""" |
|
460 | 449 |
parent1, parent2 = repo.dirstate.parents() |
555 | 450 |
repo.dirstate.read() |
451 |
dc = repo.dirstate.map |
|
460 | 452 |
keys = dc.keys() |
453 |
keys.sort() |
|
454 |
m1n = repo.changelog.read(parent1)[0] |
|
455 |
m2n = repo.changelog.read(parent2)[0] |
|
456 |
m1 = repo.manifest.read(m1n) |
|
457 |
m2 = repo.manifest.read(m2n) |
|
458 |
errors = 0 |
|
459 |
for f in dc: |
|
460 |
state = repo.dirstate.state(f) |
|
461 |
if state in "nr" and f not in m1: |
|
582 | 462 |
ui.warn("%s in state %s, but not in manifest1\n" % (f, state)) |
460 | 463 |
errors += 1 |
464 |
if state in "a" and f in m1: |
|
582 | 465 |
ui.warn("%s in state %s, but also in manifest1\n" % (f, state)) |
460 | 466 |
errors += 1 |
467 |
if state in "m" and f not in m1 and f not in m2: |
|
582 | 468 |
ui.warn("%s in state %s, but not in either manifest\n" % |
469 |
(f, state)) |
|
460 | 470 |
errors += 1 |
471 |
for f in m1: |
|
472 |
state = repo.dirstate.state(f) |
|
473 |
if state not in "nrm": |
|
582 | 474 |
ui.warn("%s in manifest1, but listed as state %s" % (f, state)) |
460 | 475 |
errors += 1 |
476 |
if errors: |
|
582 | 477 |
ui.warn(".hg/dirstate inconsistent with current parent's manifest\n") |
460 | 478 |
sys.exit(1) |
479 |
||
596 | 480 |
def debugstate(ui, repo): |
481 |
"""show the contents of the current dirstate""" |
|
555 | 482 |
repo.dirstate.read() |
483 |
dc = repo.dirstate.map |
|
460 | 484 |
keys = dc.keys() |
485 |
keys.sort() |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
486 |
for file_ in keys: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
487 |
ui.write("%c %s\n" % (dc[file_][0], file_)) |
460 | 488 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
489 |
def debugindex(ui, file_): |
596 | 490 |
"""dump the contents of an index file""" |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
491 |
r = hg.revlog(hg.opener(""), file_, "") |
582 | 492 |
ui.write(" rev offset length base linkrev" + |
493 |
" p1 p2 nodeid\n") |
|
248 | 494 |
for i in range(r.count()): |
495 |
e = r.index[i] |
|
582 | 496 |
ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % ( |
497 |
i, e[0], e[1], e[2], e[3], |
|
498 |
hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5]))) |
|
248 | 499 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
500 |
def debugindexdot(ui, file_): |
596 | 501 |
"""dump an index DAG as a .dot file""" |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
502 |
r = hg.revlog(hg.opener(""), file_, "") |
582 | 503 |
ui.write("digraph G {\n") |
248 | 504 |
for i in range(r.count()): |
505 |
e = r.index[i] |
|
582 | 506 |
ui.write("\t%d -> %d\n" % (r.rev(e[4]), i)) |
248 | 507 |
if e[5] != hg.nullid: |
582 | 508 |
ui.write("\t%d -> %d\n" % (r.rev(e[5]), i)) |
509 |
ui.write("}\n") |
|
248 | 510 |
|
245 | 511 |
def diff(ui, repo, *files, **opts): |
255 | 512 |
"""diff working directory (or selected files)""" |
245 | 513 |
revs = [] |
514 |
if opts['rev']: |
|
515 |
revs = map(lambda x: repo.lookup(x), 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
|
516 |
|
245 | 517 |
if len(revs) > 2: |
480
430a10669928
Fixed call to ui.warn()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
479
diff
changeset
|
518 |
ui.warn("too many revisions to diff\n") |
245 | 519 |
sys.exit(1) |
520 |
||
521 |
if files: |
|
522 |
files = relpath(repo, files) |
|
523 |
else: |
|
524 |
files = relpath(repo, [""]) |
|
525 |
||
580 | 526 |
dodiff(sys.stdout, ui, repo, files, *revs) |
245 | 527 |
|
580 | 528 |
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
|
529 |
node = repo.lookup(changeset) |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
530 |
prev, other = repo.changelog.parents(node) |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
531 |
change = repo.changelog.read(node) |
580 | 532 |
|
533 |
if opts['output'] and opts['output'] != '-': |
|
534 |
try: |
|
632 | 535 |
outname = make_filename(repo, repo.changelog, opts['output'], |
536 |
node=node, total=total, seqno=seqno, |
|
537 |
revwidth=revwidth) |
|
538 |
fp = open(outname, 'wb') |
|
580 | 539 |
except KeyError, inst: |
540 |
ui.warn("error: invalid format spec '%%%s' in output file name\n" % |
|
541 |
inst.args[0]) |
|
542 |
sys.exit(1) |
|
543 |
else: |
|
544 |
fp = sys.stdout |
|
545 |
||
582 | 546 |
fp.write("# HG changeset patch\n") |
547 |
fp.write("# User %s\n" % change[1]) |
|
548 |
fp.write("# Node ID %s\n" % hg.hex(node)) |
|
549 |
fp.write("# Parent %s\n" % hg.hex(prev)) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
550 |
if other != hg.nullid: |
582 | 551 |
fp.write("# Parent %s\n" % hg.hex(other)) |
552 |
fp.write(change[4].rstrip()) |
|
553 |
fp.write("\n\n") |
|
580 | 554 |
|
555 |
dodiff(fp, ui, repo, None, prev, node) |
|
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
|
556 |
|
580 | 557 |
def export(ui, repo, *changesets, **opts): |
558 |
"""dump the header and diffs for one or more changesets""" |
|
610
4c02464cb9f0
check export options for changeset before running
shaleh@speakeasy.net
parents:
609
diff
changeset
|
559 |
if not changesets: |
4c02464cb9f0
check export options for changeset before running
shaleh@speakeasy.net
parents:
609
diff
changeset
|
560 |
ui.warn("error: export requires at least one changeset\n") |
4c02464cb9f0
check export options for changeset before running
shaleh@speakeasy.net
parents:
609
diff
changeset
|
561 |
sys.exit(1) |
580 | 562 |
seqno = 0 |
563 |
revs = list(revrange(ui, repo, changesets)) |
|
564 |
total = len(revs) |
|
565 |
revwidth = max(len(revs[0]), len(revs[-1])) |
|
566 |
for cset in revs: |
|
567 |
seqno += 1 |
|
568 |
doexport(ui, repo, cset, seqno, total, revwidth, opts) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
569 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
570 |
def forget(ui, repo, file1, *files): |
245 | 571 |
"""don't add the specified files on the next commit""" |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
572 |
repo.forget(relpath(repo, (file1,) + files)) |
245 | 573 |
|
221 | 574 |
def heads(ui, repo): |
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
575 |
"""show current repository heads""" |
221 | 576 |
for n in repo.changelog.heads(): |
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
577 |
show_changeset(ui, repo, changenode=n) |
221 | 578 |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
579 |
def identify(ui, repo): |
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
580 |
"""print information about the working copy""" |
343 | 581 |
parents = [p for p in repo.dirstate.parents() if p != hg.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
|
582 |
if not parents: |
343 | 583 |
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
|
584 |
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
|
585 |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
586 |
hexfunc = ui.verbose and hg.hex or hg.short |
723 | 587 |
(c, a, d, u) = repo.changes() |
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
588 |
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
|
589 |
(c or a or d) and "+" or "")] |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
590 |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
591 |
if not ui.quiet: |
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
592 |
# multiple tags for a single parent separated by '/' |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
593 |
parenttags = ['/'.join(tags) |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
594 |
for tags in map(repo.nodetags, parents) if tags] |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
595 |
# tags for multiple parents separated by ' + ' |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
596 |
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
|
597 |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
598 |
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
|
599 |
|
437 | 600 |
def import_(ui, repo, patch1, *patches, **opts): |
601 |
"""import an ordered set of patches""" |
|
602 |
try: |
|
603 |
import psyco |
|
604 |
psyco.full() |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
605 |
except ImportError: |
437 | 606 |
pass |
607 |
||
608 |
patches = (patch1,) + patches |
|
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
609 |
|
437 | 610 |
d = opts["base"] |
611 |
strip = opts["strip"] |
|
612 |
||
613 |
for patch in patches: |
|
614 |
ui.status("applying %s\n" % patch) |
|
615 |
pf = os.path.join(d, patch) |
|
616 |
||
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
|
617 |
text = [] |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
618 |
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
|
619 |
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
|
620 |
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
|
621 |
line = line.rstrip() |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
622 |
if line.startswith("--- ") or line.startswith("diff -r"): |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
623 |
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
|
624 |
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
|
625 |
# 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
|
626 |
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
|
627 |
user = line[7:] |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
628 |
ui.debug('User: %s\n' % 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
|
629 |
elif not line.startswith("# ") and line: |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
630 |
text.append(line) |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
631 |
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
|
632 |
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
|
633 |
hgpatch = True |
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
|
634 |
else: |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
635 |
text.append(line) |
607
94744f6fe0e7
[PATCH] Parse and use header data from an hg export'ed changeset
mpm@selenic.com
parents:
605
diff
changeset
|
636 |
|
437 | 637 |
# make sure text isn't empty |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
638 |
if not text: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
639 |
text = "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
|
640 |
else: |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
641 |
text = "%s\n" % '\n'.join(text) |
80ed193efff7
On importing the result of 'hg export', parse while reading and drop headers.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
700
diff
changeset
|
642 |
ui.debug('text:\n%s\n' % text) |
437 | 643 |
|
644 |
f = os.popen("patch -p%d < %s" % (strip, pf)) |
|
645 |
files = [] |
|
646 |
for l in f.read().splitlines(): |
|
647 |
l.rstrip('\r\n'); |
|
481
2705d20f77c9
hg import checking for quiet mode didn't work. Fixed using the ui module.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
480
diff
changeset
|
648 |
ui.status("%s\n" % l) |
674
6513ba7d858a
Make consistent use of str.startswith() in conditionals.
chad.netzer@gmail.com
parents:
668
diff
changeset
|
649 |
if l.startswith('patching file '): |
443 | 650 |
pf = l[14:] |
651 |
if pf not in files: |
|
652 |
files.append(pf) |
|
653 |
patcherr = f.close() |
|
654 |
if patcherr: |
|
655 |
sys.stderr.write("patch failed") |
|
656 |
sys.exit(1) |
|
437 | 657 |
|
658 |
if len(files) > 0: |
|
659 |
addremove(ui, repo, *files) |
|
607
94744f6fe0e7
[PATCH] Parse and use header data from an hg export'ed changeset
mpm@selenic.com
parents:
605
diff
changeset
|
660 |
repo.commit(files, text, user) |
437 | 661 |
|
496 | 662 |
def init(ui, source=None): |
663 |
"""create a new repository in the current directory""" |
|
290 | 664 |
|
665 |
if source: |
|
496 | 666 |
ui.warn("no longer supported: use \"hg clone\" instead\n") |
667 |
sys.exit(1) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
668 |
hg.repository(ui, ".", create=1) |
338 | 669 |
|
627 | 670 |
def locate(ui, repo, *pats, **opts): |
671 |
"""locate files matching specific patterns""" |
|
672 |
if [p for p in pats if os.sep in p]: |
|
673 |
ui.warn("error: patterns may not contain '%s'\n" % os.sep) |
|
674 |
ui.warn("use '-i <dir>' instead\n") |
|
675 |
sys.exit(1) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
676 |
def compile(pats, head='^', tail=os.sep, on_empty=True): |
627 | 677 |
if not pats: |
678 |
class c: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
679 |
def match(self, x): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
680 |
return on_empty |
627 | 681 |
return c() |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
682 |
fnpats = [fnmatch.translate(os.path.normpath(os.path.normcase(p)))[:-1] |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
683 |
for p in pats] |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
684 |
regexp = r'%s(?:%s)%s' % (head, '|'.join(fnpats), tail) |
627 | 685 |
return re.compile(regexp) |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
686 |
exclude = compile(opts['exclude'], on_empty=False) |
627 | 687 |
include = compile(opts['include']) |
699
64046575a6f7
Removed duplicate use of os.path.normcase().
Thomas Arendsen Hein <thomas@intevation.de>
parents:
698
diff
changeset
|
688 |
pat = compile(pats, head='', tail='$') |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
689 |
end = opts['print0'] and '\0' or '\n' |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
690 |
if opts['rev']: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
691 |
node = repo.manifest.lookup(opts['rev']) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
692 |
else: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
693 |
node = repo.manifest.tip() |
627 | 694 |
manifest = repo.manifest.read(node) |
695 |
cwd = repo.getcwd() |
|
696 |
cwd_plus = cwd and (cwd + os.sep) |
|
697 |
found = [] |
|
698 |
for f in manifest: |
|
699 |
f = os.path.normcase(f) |
|
700 |
if exclude.match(f) or not(include.match(f) and |
|
701 |
f.startswith(cwd_plus) and |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
702 |
pat.match(os.path.basename(f))): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
703 |
continue |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
704 |
if opts['fullpath']: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
705 |
f = os.path.join(repo.root, f) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
706 |
elif cwd: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
707 |
f = f[len(cwd_plus):] |
627 | 708 |
found.append(f) |
709 |
found.sort() |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
710 |
for f in found: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
711 |
ui.write(f, end) |
627 | 712 |
|
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
713 |
def log(ui, repo, f=None, **opts): |
509 | 714 |
"""show the revision history of the repository or a single file""" |
715 |
if f: |
|
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
716 |
files = relpath(repo, [f]) |
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
717 |
filelog = repo.file(files[0]) |
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
718 |
log = filelog |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
719 |
lookup = filelog.lookup |
509 | 720 |
else: |
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
721 |
files = None |
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
722 |
filelog = None |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
723 |
log = repo.changelog |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
724 |
lookup = repo.lookup |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
725 |
revlist = [] |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
726 |
revs = [log.rev(lookup(rev)) for rev in opts['rev']] |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
727 |
while revs: |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
728 |
if len(revs) == 1: |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
729 |
revlist.append(revs.pop(0)) |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
730 |
else: |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
731 |
a = revs.pop(0) |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
732 |
b = revs.pop(0) |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
733 |
off = a > b and -1 or 1 |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
734 |
revlist.extend(range(a, b + off, off)) |
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
735 |
|
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
736 |
for i in revlist or range(log.count() - 1, -1, -1): |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
737 |
show_changeset(ui, repo, filelog=filelog, rev=i) |
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
738 |
if opts['patch']: |
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
739 |
if filelog: |
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
740 |
filenode = filelog.node(i) |
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
741 |
i = filelog.linkrev(filenode) |
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
742 |
changenode = repo.changelog.node(i) |
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
743 |
prev, other = repo.changelog.parents(changenode) |
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
610
diff
changeset
|
744 |
dodiff(sys.stdout, ui, repo, files, prev, changenode) |
696
b266e92bcd0b
Removed extra newline in hg log when not using the --patch option, fixed tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
689
diff
changeset
|
745 |
ui.write("\n\n") |
255 | 746 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
747 |
def manifest(ui, repo, rev=None): |
255 | 748 |
"""output the latest or given revision of the project manifest""" |
749 |
if rev: |
|
689 | 750 |
try: |
751 |
# assume all revision numbers are for changesets |
|
752 |
n = repo.lookup(rev) |
|
753 |
change = repo.changelog.read(n) |
|
754 |
n = change[0] |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
755 |
except hg.RepoError: |
689 | 756 |
n = repo.manifest.lookup(rev) |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
757 |
else: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
758 |
n = repo.manifest.tip() |
255 | 759 |
m = repo.manifest.read(n) |
276 | 760 |
mf = repo.manifest.readflags(n) |
255 | 761 |
files = m.keys() |
762 |
files.sort() |
|
763 |
||
764 |
for f in files: |
|
276 | 765 |
ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f)) |
255 | 766 |
|
700
d01b93efecd6
Removed extra spaces for default parameters according to PEP8.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
699
diff
changeset
|
767 |
def parents(ui, repo, node=None): |
255 | 768 |
'''show the parents of the current working dir''' |
769 |
if node: |
|
770 |
p = repo.changelog.parents(repo.lookup(hg.bin(node))) |
|
771 |
else: |
|
772 |
p = repo.dirstate.parents() |
|
773 |
||
774 |
for n in p: |
|
775 |
if n != hg.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
|
776 |
show_changeset(ui, repo, changenode=n) |
255 | 777 |
|
404 | 778 |
def pull(ui, repo, source="default", **opts): |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
779 |
"""pull changes from the specified source""" |
506 | 780 |
source = ui.expandpath(source) |
404 | 781 |
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
|
782 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
783 |
other = hg.repository(ui, source) |
625 | 784 |
r = repo.pull(other) |
785 |
if not r: |
|
404 | 786 |
if opts['update']: |
787 |
return update(ui, repo) |
|
580 | 788 |
else: |
404 | 789 |
ui.status("(run 'hg update' to get a working copy)\n") |
790 |
||
791 |
return r |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
792 |
|
371
6e3436082697
hg push: "default-push" default target path
mpm@selenic.com
parents:
367
diff
changeset
|
793 |
def push(ui, repo, dest="default-push"): |
319 | 794 |
"""push changes to the specified destination""" |
506 | 795 |
dest = ui.expandpath(dest) |
640
b48b91d3fb4a
Switch push over to the new scheme
Matt Mackall <mpm@selenic.com>
parents:
639
diff
changeset
|
796 |
ui.status('pushing to %s\n' % (dest)) |
319 | 797 |
|
640
b48b91d3fb4a
Switch push over to the new scheme
Matt Mackall <mpm@selenic.com>
parents:
639
diff
changeset
|
798 |
other = hg.repository(ui, dest) |
b48b91d3fb4a
Switch push over to the new scheme
Matt Mackall <mpm@selenic.com>
parents:
639
diff
changeset
|
799 |
r = repo.push(other) |
b48b91d3fb4a
Switch push over to the new scheme
Matt Mackall <mpm@selenic.com>
parents:
639
diff
changeset
|
800 |
return r |
319 | 801 |
|
403 | 802 |
def rawcommit(ui, repo, *flist, **rc): |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
803 |
"raw commit interface" |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
804 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
805 |
text = rc['text'] |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
806 |
if not text and rc['logfile']: |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
807 |
try: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
808 |
text = open(rc['logfile']).read() |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
809 |
except IOError: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
810 |
pass |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
811 |
if not text and not rc['logfile']: |
582 | 812 |
ui.warn("abort: missing commit text\n") |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
813 |
return 1 |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
814 |
|
403 | 815 |
files = relpath(repo, list(flist)) |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
816 |
if rc['files']: |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
817 |
files += open(rc['files']).read().splitlines() |
452
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
818 |
|
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
819 |
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
|
820 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
821 |
repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent']) |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
822 |
|
245 | 823 |
def recover(ui, repo): |
255 | 824 |
"""roll back an interrupted transaction""" |
245 | 825 |
repo.recover() |
826 |
||
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
827 |
def remove(ui, repo, file1, *files): |
245 | 828 |
"""remove the specified files on the next commit""" |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
829 |
repo.remove(relpath(repo, (file1,) + files)) |
245 | 830 |
|
588 | 831 |
def revert(ui, repo, *names, **opts): |
832 |
"""revert modified files or dirs back to their unmodified states""" |
|
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
833 |
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
|
834 |
repo.dirstate.parents()[0] |
588 | 835 |
root = os.path.realpath(repo.root) |
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
836 |
|
588 | 837 |
def trimpath(p): |
838 |
p = os.path.realpath(p) |
|
839 |
if p.startswith(root): |
|
840 |
rest = p[len(root):] |
|
841 |
if not rest: |
|
842 |
return rest |
|
843 |
if p.startswith(os.sep): |
|
844 |
return rest[1:] |
|
845 |
return p |
|
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
846 |
|
588 | 847 |
relnames = map(trimpath, names or [os.getcwd()]) |
848 |
chosen = {} |
|
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
849 |
|
588 | 850 |
def choose(name): |
851 |
def body(name): |
|
852 |
for r in relnames: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
853 |
if not name.startswith(r): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
854 |
continue |
588 | 855 |
rest = name[len(r):] |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
856 |
if not rest: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
857 |
return r, True |
588 | 858 |
depth = rest.count(os.sep) |
859 |
if not r: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
860 |
if depth == 0 or not opts['nonrecursive']: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
861 |
return r, True |
588 | 862 |
elif rest[0] == os.sep: |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
863 |
if depth == 1 or not opts['nonrecursive']: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
864 |
return r, True |
588 | 865 |
return None, False |
866 |
relname, ret = body(name) |
|
867 |
if ret: |
|
868 |
chosen[relname] = 1 |
|
869 |
return ret |
|
870 |
||
871 |
r = repo.update(node, False, True, choose, False) |
|
872 |
for n in relnames: |
|
873 |
if n not in chosen: |
|
874 |
ui.warn('error: no matches for %s\n' % n) |
|
875 |
r = 1 |
|
876 |
sys.stdout.flush() |
|
877 |
return r |
|
878 |
||
468 | 879 |
def root(ui, repo): |
880 |
"""print the root (top) of the current working dir""" |
|
881 |
ui.write(repo.root + "\n") |
|
882 |
||
245 | 883 |
def serve(ui, repo, **opts): |
255 | 884 |
"""export the repository via HTTP""" |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
885 |
|
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
886 |
if opts["stdio"]: |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
887 |
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
|
888 |
sys.stdout = sys.stderr |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
889 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
890 |
def getarg(): |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
891 |
argline = fin.readline()[:-1] |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
892 |
arg, l = argline.split() |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
893 |
val = fin.read(int(l)) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
894 |
return arg, val |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
895 |
def respond(v): |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
896 |
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
|
897 |
fout.write(v) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
898 |
fout.flush() |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
899 |
|
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
900 |
lock = None |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
901 |
|
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
902 |
while 1: |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
903 |
cmd = fin.readline()[:-1] |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
904 |
if cmd == '': |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
905 |
return |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
906 |
if cmd == "heads": |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
907 |
h = repo.heads() |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
908 |
respond(" ".join(map(hg.hex, h)) + "\n") |
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
909 |
if cmd == "lock": |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
910 |
lock = repo.lock() |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
911 |
respond("") |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
912 |
if cmd == "unlock": |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
913 |
if lock: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
914 |
lock.release() |
638
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
915 |
lock = None |
35f7adfefa69
Add a scheme for handling remote locking
Matt Mackall <mpm@selenic.com>
parents:
635
diff
changeset
|
916 |
respond("") |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
917 |
elif cmd == "branches": |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
918 |
arg, nodes = getarg() |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
919 |
nodes = map(hg.bin, nodes.split(" ")) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
920 |
r = [] |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
921 |
for b in repo.branches(nodes): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
922 |
r.append(" ".join(map(hg.hex, b)) + "\n") |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
923 |
respond("".join(r)) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
924 |
elif cmd == "between": |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
925 |
arg, pairs = getarg() |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
926 |
pairs = [map(hg.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
|
927 |
r = [] |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
928 |
for b in repo.between(pairs): |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
929 |
r.append(" ".join(map(hg.hex, b)) + "\n") |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
930 |
respond("".join(r)) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
931 |
elif cmd == "changegroup": |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
932 |
nodes = [] |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
933 |
arg, roots = getarg() |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
934 |
nodes = map(hg.bin, roots.split(" ")) |
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
935 |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
936 |
cg = repo.changegroup(nodes) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
937 |
while 1: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
938 |
d = cg.read(4096) |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
939 |
if not d: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
940 |
break |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
941 |
fout.write(d) |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
942 |
|
667
31a9aa890016
A number of minor fixes to problems that pychecker found.
mark.williamson@cl.cam.ac.uk
parents:
654
diff
changeset
|
943 |
fout.flush() |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
944 |
|
639
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
945 |
elif cmd == "addchangegroup": |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
946 |
if not lock: |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
947 |
respond("not locked") |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
948 |
continue |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
949 |
respond("") |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
950 |
|
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
951 |
r = repo.addchangegroup(fin) |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
952 |
respond("") |
31cebba881a0
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com>
parents:
638
diff
changeset
|
953 |
|
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
604
diff
changeset
|
954 |
def openlog(opt, default): |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
955 |
if opts[opt] and opts[opt] != '-': |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
956 |
return open(opts[opt], 'w') |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
957 |
else: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
958 |
return default |
624
876333a295ff
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com>
parents:
618
diff
changeset
|
959 |
|
603
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
960 |
httpd = hgweb.create_server(repo.root, opts["name"], opts["templates"], |
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
604
diff
changeset
|
961 |
opts["address"], opts["port"], |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
604
diff
changeset
|
962 |
openlog('accesslog', sys.stdout), |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
604
diff
changeset
|
963 |
openlog('errorlog', sys.stderr)) |
603
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
964 |
if ui.verbose: |
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
965 |
addr, port = httpd.socket.getsockname() |
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
966 |
if addr == '0.0.0.0': |
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
967 |
addr = socket.gethostname() |
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
968 |
else: |
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
969 |
try: |
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
970 |
addr = socket.gethostbyaddr(addr)[0] |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
971 |
except socket.error: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
972 |
pass |
603
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
596
diff
changeset
|
973 |
if port != 80: |
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
604
diff
changeset
|
974 |
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
|
975 |
else: |
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
604
diff
changeset
|
976 |
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
|
977 |
httpd.serve_forever() |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
978 |
|
213 | 979 |
def status(ui, repo): |
980 |
'''show changed files in the working directory |
|
981 |
||
245 | 982 |
C = changed |
983 |
A = added |
|
984 |
R = removed |
|
985 |
? = not tracked''' |
|
312 | 986 |
|
723 | 987 |
(c, a, d, u) = repo.changes() |
220 | 988 |
(c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) |
213 | 989 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
990 |
for f in c: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
991 |
ui.write("C ", f, "\n") |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
992 |
for f in a: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
993 |
ui.write("A ", f, "\n") |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
994 |
for f in d: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
995 |
ui.write("R ", f, "\n") |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
996 |
for f in u: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
997 |
ui.write("? ", f, "\n") |
213 | 998 |
|
700
d01b93efecd6
Removed extra spaces for default parameters according to PEP8.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
699
diff
changeset
|
999 |
def tag(ui, repo, name, rev=None, **opts): |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1000 |
"""add a tag for the current tip or a given revision""" |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
1001 |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1002 |
if name == "tip": |
580 | 1003 |
ui.warn("abort: 'tip' is a reserved name!\n") |
1004 |
return -1 |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1005 |
if rev: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1006 |
r = hg.hex(repo.lookup(rev)) |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1007 |
else: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1008 |
r = hg.hex(repo.changelog.tip()) |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1009 |
|
580 | 1010 |
if name.find(revrangesep) >= 0: |
1011 |
ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep) |
|
1012 |
return -1 |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1013 |
|
609
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1014 |
if opts['local']: |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1015 |
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
|
1016 |
return |
2acf1f5df2e6
[PATCH] hg tag: local tag support in file .hg/localtags
Matt Mackall <mpm@selenic.com>
parents:
607
diff
changeset
|
1017 |
|
723 | 1018 |
(c, a, d, u) = repo.changes() |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1019 |
for x in (c, a, d, u): |
580 | 1020 |
if ".hgtags" in x: |
1021 |
ui.warn("abort: working copy of .hgtags is changed!\n") |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1022 |
ui.status("(please commit .hgtags manually)\n") |
580 | 1023 |
return -1 |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1024 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1025 |
add = not os.path.exists(repo.wjoin(".hgtags")) |
617 | 1026 |
repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name)) |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1027 |
if add: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1028 |
repo.add([".hgtags"]) |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1029 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1030 |
if not opts['text']: |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1031 |
opts['text'] = "Added tag %s for changeset %s" % (name, r) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1032 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1033 |
repo.commit([".hgtags"], opts['text'], opts['user'], opts['date']) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
1034 |
|
248 | 1035 |
def tags(ui, repo): |
255 | 1036 |
"""list repository tags""" |
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
1037 |
|
343 | 1038 |
l = repo.tagslist() |
1039 |
l.reverse() |
|
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
1040 |
for t, n in l: |
248 | 1041 |
try: |
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
1042 |
r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n)) |
248 | 1043 |
except KeyError: |
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
1044 |
r = " ?:?" |
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
1045 |
ui.write("%-30s %s\n" % (t, r)) |
248 | 1046 |
|
245 | 1047 |
def tip(ui, repo): |
255 | 1048 |
"""show the tip revision""" |
245 | 1049 |
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
|
1050 |
show_changeset(ui, repo, changenode=n) |
245 | 1051 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1052 |
def undo(ui, repo): |
596 | 1053 |
"""undo the last commit or pull |
1054 |
||
1055 |
Roll back the last pull or commit transaction on the |
|
1056 |
repository, restoring the project to its earlier state. |
|
1057 |
||
1058 |
This command should be used with care. There is only one level of |
|
1059 |
undo and there is no redo. |
|
1060 |
||
1061 |
This command is not intended for use on public repositories. Once |
|
1062 |
a change is visible for pull by other users, undoing it locally is |
|
1063 |
ineffective. |
|
1064 |
""" |
|
210 | 1065 |
repo.undo() |
1066 |
||
275 | 1067 |
def update(ui, repo, node=None, merge=False, clean=False): |
254 | 1068 |
'''update or merge working directory |
1069 |
||
1070 |
If there are no outstanding changes in the working directory and |
|
1071 |
there is a linear relationship between the current version and the |
|
1072 |
requested version, the result is the requested version. |
|
1073 |
||
1074 |
Otherwise the result is a merge between the contents of the |
|
1075 |
current working directory and the requested version. Files that |
|
1076 |
changed between either parent are marked as changed for the next |
|
1077 |
commit and a commit must be performed before any further updates |
|
1078 |
are allowed. |
|
1079 |
''' |
|
1080 |
node = node and repo.lookup(node) or repo.changelog.tip() |
|
275 | 1081 |
return repo.update(node, allow=merge, force=clean) |
254 | 1082 |
|
247 | 1083 |
def verify(ui, repo): |
1084 |
"""verify the integrity of the repository""" |
|
1085 |
return repo.verify() |
|
1086 |
||
255 | 1087 |
# Command options and aliases are listed here, alphabetically |
1088 |
||
209 | 1089 |
table = { |
593 | 1090 |
"^add": (add, [], "hg add [files]"), |
353 | 1091 |
"addremove": (addremove, [], "hg addremove [files]"), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1092 |
"^annotate": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1093 |
(annotate, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1094 |
[('r', 'revision', '', 'revision'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1095 |
('u', 'user', None, 'show user'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1096 |
('n', 'number', None, 'show revision number'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1097 |
('c', 'changeset', None, 'show changeset')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1098 |
'hg annotate [-u] [-c] [-n] [-r id] [files]'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1099 |
"cat": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1100 |
(cat, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1101 |
[('o', 'output', "", 'output to file')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1102 |
'hg cat [-o outfile] <file> [rev]'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1103 |
"^clone": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1104 |
(clone, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1105 |
[('U', 'noupdate', None, 'skip update after cloning')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1106 |
'hg clone [options] <source> [dest]'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1107 |
"^commit|ci": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1108 |
(commit, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1109 |
[('t', 'text', "", 'commit text'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1110 |
('A', 'addremove', None, 'run add/remove during commit'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1111 |
('l', 'logfile', "", 'commit text file'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1112 |
('d', 'date', "", 'date code'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1113 |
('u', 'user', "", 'user')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1114 |
'hg commit [files]'), |
363 | 1115 |
"copy": (copy, [], 'hg copy <source> <dest>'), |
596 | 1116 |
"debugcheckstate": (debugcheckstate, [], 'debugcheckstate'), |
1117 |
"debugstate": (debugstate, [], 'debugstate'), |
|
248 | 1118 |
"debugindex": (debugindex, [], 'debugindex <file>'), |
1119 |
"debugindexdot": (debugindexdot, [], 'debugindexdot <file>'), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1120 |
"^diff": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1121 |
(diff, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1122 |
[('r', 'rev', [], 'revision')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1123 |
'hg diff [-r A] [-r B] [files]'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1124 |
"^export": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1125 |
(export, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1126 |
[('o', 'output', "", 'output to file')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1127 |
"hg export [-o file] <changeset> ..."), |
245 | 1128 |
"forget": (forget, [], "hg forget [files]"), |
1129 |
"heads": (heads, [], 'hg heads'), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1130 |
"help": (help_, [], 'hg help [command]'), |
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
1131 |
"identify|id": (identify, [], 'hg identify'), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1132 |
"import|patch": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1133 |
(import_, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1134 |
[('p', 'strip', 1, 'path strip'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1135 |
('b', 'base', "", 'base path')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1136 |
"hg import [options] <patches>"), |
593 | 1137 |
"^init": (init, [], 'hg init'), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1138 |
"locate": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1139 |
(locate, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1140 |
[('0', 'print0', None, 'end records with NUL'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1141 |
('f', 'fullpath', None, 'print complete paths'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1142 |
('i', 'include', [], 'include path in search'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1143 |
('r', 'rev', '', 'revision'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1144 |
('x', 'exclude', [], 'exclude path from search')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1145 |
'hg locate [options] [files]'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1146 |
"^log|history": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1147 |
(log, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1148 |
[('r', 'rev', [], 'revision'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1149 |
('p', 'patch', None, 'show patch')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1150 |
'hg log [-r A] [-r B] [-p] [file]'), |
437 | 1151 |
"manifest": (manifest, [], 'hg manifest [rev]'), |
227 | 1152 |
"parents": (parents, [], 'hg parents [node]'), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1153 |
"^pull": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1154 |
(pull, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1155 |
[('u', 'update', None, 'update working directory')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1156 |
'hg pull [options] [source]'), |
593 | 1157 |
"^push": (push, [], 'hg push <destination>'), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1158 |
"rawcommit": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1159 |
(rawcommit, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1160 |
[('p', 'parent', [], 'parent'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1161 |
('d', 'date', "", 'date code'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1162 |
('u', 'user', "", 'user'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1163 |
('F', 'files', "", 'file list'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1164 |
('t', 'text', "", 'commit text'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1165 |
('l', 'logfile', "", 'commit text file')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1166 |
'hg rawcommit [options] [files]'), |
245 | 1167 |
"recover": (recover, [], "hg recover"), |
593 | 1168 |
"^remove|rm": (remove, [], "hg remove [files]"), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1169 |
"^revert": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1170 |
(revert, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1171 |
[("n", "nonrecursive", None, "don't recurse into subdirs"), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1172 |
("r", "rev", "", "revision")], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1173 |
"hg revert [files|dirs]"), |
468 | 1174 |
"root": (root, [], "hg root"), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1175 |
"^serve": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1176 |
(serve, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1177 |
[('A', 'accesslog', '', 'access log file'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1178 |
('E', 'errorlog', '', 'error log file'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1179 |
('p', 'port', 8000, 'listen port'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1180 |
('a', 'address', '', 'interface address'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1181 |
('n', 'name', os.getcwd(), 'repository name'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1182 |
('', 'stdio', None, 'for remote clients'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1183 |
('t', 'templates', "", 'template map')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1184 |
"hg serve [options]"), |
593 | 1185 |
"^status": (status, [], 'hg status'), |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1186 |
"tag": |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1187 |
(tag, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1188 |
[('l', 'local', None, 'make the tag local'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1189 |
('t', 'text', "", 'commit text'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1190 |
('d', 'date', "", 'date code'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1191 |
('u', 'user', "", 'user')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1192 |
'hg tag [options] <name> [rev]'), |
248 | 1193 |
"tags": (tags, [], 'hg tags'), |
245 | 1194 |
"tip": (tip, [], 'hg tip'), |
210 | 1195 |
"undo": (undo, [], 'hg undo'), |
593 | 1196 |
"^update|up|checkout|co": |
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1197 |
(update, |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1198 |
[('m', 'merge', None, 'allow merging of conflicts'), |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1199 |
('C', 'clean', None, 'overwrite locally modified files')], |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1200 |
'hg update [options] [node]'), |
247 | 1201 |
"verify": (verify, [], 'hg verify'), |
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
1202 |
"version": (show_version, [], 'hg version'), |
209 | 1203 |
} |
1204 |
||
596 | 1205 |
globalopts = [('v', 'verbose', None, 'verbose'), |
1206 |
('', 'debug', None, 'debug'), |
|
1207 |
('q', 'quiet', None, 'quiet'), |
|
1208 |
('', 'profile', None, 'profile'), |
|
1209 |
('R', 'repository', "", 'repository root directory'), |
|
1210 |
('', 'traceback', None, 'print traceback on exception'), |
|
1211 |
('y', 'noninteractive', None, 'run non-interactively'), |
|
1212 |
('', 'version', None, 'output version information and exit'), |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1213 |
] |
596 | 1214 |
|
485 | 1215 |
norepo = "clone init version help debugindex debugindexdot" |
209 | 1216 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1217 |
def find(cmd): |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1218 |
for e in table.keys(): |
335 | 1219 |
if re.match("(%s)$" % e, cmd): |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1220 |
return table[e] |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1221 |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1222 |
raise UnknownCommand(cmd) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1223 |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1224 |
class SignalInterrupt(Exception): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1225 |
"""Exception raised on SIGTERM and SIGHUP.""" |
214 | 1226 |
|
1227 |
def catchterm(*args): |
|
1228 |
raise SignalInterrupt |
|
1229 |
||
249 | 1230 |
def run(): |
1231 |
sys.exit(dispatch(sys.argv[1:])) |
|
1232 |
||
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1233 |
class ParseError(Exception): |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1234 |
"""Exception raised on errors in parsing the command line.""" |
592 | 1235 |
|
596 | 1236 |
def parse(args): |
209 | 1237 |
options = {} |
596 | 1238 |
cmdoptions = {} |
209 | 1239 |
|
592 | 1240 |
try: |
596 | 1241 |
args = fancyopts.fancyopts(args, globalopts, options) |
592 | 1242 |
except fancyopts.getopt.GetoptError, inst: |
618
4051b78c53c7
Handle unrecognised options correctly.
Bryan O'Sullivan <bos@serpentine.com>
parents:
617
diff
changeset
|
1243 |
raise ParseError(None, inst) |
209 | 1244 |
|
596 | 1245 |
if options["version"]: |
1246 |
return ("version", show_version, [], options, cmdoptions) |
|
1247 |
elif not args: |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1248 |
return ("help", help_, [], options, cmdoptions) |
209 | 1249 |
else: |
1250 |
cmd, args = args[0], args[1:] |
|
1251 |
||
596 | 1252 |
i = find(cmd) |
209 | 1253 |
|
592 | 1254 |
# combine global options into local |
1255 |
c = list(i[1]) |
|
596 | 1256 |
for o in globalopts: |
592 | 1257 |
c.append((o[0], o[1], options[o[1]], o[3])) |
214 | 1258 |
|
293 | 1259 |
try: |
596 | 1260 |
args = fancyopts.fancyopts(args, c, cmdoptions) |
293 | 1261 |
except fancyopts.getopt.GetoptError, inst: |
596 | 1262 |
raise ParseError(cmd, inst) |
209 | 1263 |
|
592 | 1264 |
# separate global options back out |
596 | 1265 |
for o in globalopts: |
592 | 1266 |
n = o[1] |
1267 |
options[n] = cmdoptions[n] |
|
1268 |
del cmdoptions[n] |
|
1269 |
||
596 | 1270 |
return (cmd, i[0], args, options, cmdoptions) |
1271 |
||
1272 |
def dispatch(args): |
|
1273 |
signal.signal(signal.SIGTERM, catchterm) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1274 |
try: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1275 |
signal.signal(signal.SIGHUP, catchterm) |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1276 |
except AttributeError: |
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1277 |
pass |
596 | 1278 |
|
1279 |
try: |
|
1280 |
cmd, func, args, options, cmdoptions = parse(args) |
|
1281 |
except ParseError, inst: |
|
1282 |
u = ui.ui() |
|
1283 |
if inst.args[0]: |
|
1284 |
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
|
1285 |
help_(u, inst.args[0]) |
596 | 1286 |
else: |
1287 |
u.warn("hg: %s\n" % inst.args[1]) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1288 |
help_(u) |
596 | 1289 |
sys.exit(-1) |
1290 |
except UnknownCommand, inst: |
|
1291 |
u = ui.ui() |
|
1292 |
u.warn("hg: unknown command '%s'\n" % inst.args[0]) |
|
697
cb1be2327220
Multiple cleanups of things detected by pylint.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
696
diff
changeset
|
1293 |
help_(u) |
596 | 1294 |
sys.exit(1) |
1295 |
||
1296 |
u = ui.ui(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
|
1297 |
not options["noninteractive"]) |
592 | 1298 |
|
499 | 1299 |
try: |
527 | 1300 |
try: |
1301 |
if cmd not in norepo.split(): |
|
1302 |
path = options["repository"] or "" |
|
1303 |
repo = hg.repository(ui=u, path=path) |
|
596 | 1304 |
d = lambda: func(u, repo, *args, **cmdoptions) |
527 | 1305 |
else: |
596 | 1306 |
d = lambda: func(u, *args, **cmdoptions) |
209 | 1307 |
|
527 | 1308 |
if options['profile']: |
1309 |
import hotshot, hotshot.stats |
|
1310 |
prof = hotshot.Profile("hg.prof") |
|
1311 |
r = prof.runcall(d) |
|
1312 |
prof.close() |
|
1313 |
stats = hotshot.stats.load("hg.prof") |
|
1314 |
stats.strip_dirs() |
|
1315 |
stats.sort_stats('time', 'calls') |
|
1316 |
stats.print_stats(40) |
|
1317 |
return r |
|
1318 |
else: |
|
1319 |
return d() |
|
1320 |
except: |
|
1321 |
if options['traceback']: |
|
1322 |
traceback.print_exc() |
|
1323 |
raise |
|
508 | 1324 |
except util.CommandError, inst: |
1325 |
u.warn("abort: %s\n" % inst.args) |
|
499 | 1326 |
except hg.RepoError, inst: |
1327 |
u.warn("abort: ", inst, "!\n") |
|
214 | 1328 |
except SignalInterrupt: |
1329 |
u.warn("killed!\n") |
|
209 | 1330 |
except KeyboardInterrupt: |
1331 |
u.warn("interrupted!\n") |
|
250 | 1332 |
except IOError, inst: |
395 | 1333 |
if hasattr(inst, "code"): |
1334 |
u.warn("abort: %s\n" % inst) |
|
1335 |
elif hasattr(inst, "reason"): |
|
1336 |
u.warn("abort: error %d: %s\n" % (inst.reason[0], inst.reason[1])) |
|
1337 |
elif hasattr(inst, "args") and inst[0] == errno.EPIPE: |
|
693 | 1338 |
if u.debugflag: u.warn("broken pipe\n") |
250 | 1339 |
else: |
1340 |
raise |
|
549 | 1341 |
except OSError, inst: |
1342 |
if hasattr(inst, "filename"): |
|
1343 |
u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename)) |
|
1344 |
else: |
|
1345 |
u.warn("abort: %s\n" % inst.strerror) |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1346 |
except TypeError, inst: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1347 |
# was this an argument error? |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1348 |
tb = traceback.extract_tb(sys.exc_info()[2]) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1349 |
if len(tb) > 2: # no |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1350 |
raise |
293 | 1351 |
u.debug(inst, "\n") |
596 | 1352 |
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
|
1353 |
help_(u, cmd) |
293 | 1354 |
|
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
500
diff
changeset
|
1355 |
sys.exit(-1) |