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