Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/commands.py @ 254:c03f58e5fd2d
unify checkout and resolve into update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
unify checkout and resolve into update
This replaces checkout and resolve with a single command:
$ hg help co
hg update [node]
update or merge working directory
If there are no outstanding changes in the working directory and
there is a linear relationship between the current version and the
requested version, the result is the requested version.
Otherwise the result is a merge between the contents of the
current working directory and the requested version. Files that
changed between either parent are marked as changed for the next
commit and a commit must be performed before any further updates
are allowed.
manifest hash: 513d285d7fb775d0560de49387042a685ea062f7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC
YBldZtA7yIuTnV2vIbn7OSE=
=QtM/
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 04 Jun 2005 18:34:35 -0800 |
| parents | 5eda6c542978 |
| children | 20a44c82795f |
| 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 | |
| 8 import os, re, sys, signal, time, mdiff | |
| 209 | 9 from mercurial import fancyopts, ui, hg |
| 10 | |
| 11 class UnknownCommand(Exception): pass | |
| 12 | |
| 245 | 13 def filterfiles(filters, files): |
| 14 l = [ x for x in files if x in filters ] | |
| 213 | 15 |
| 245 | 16 for t in filters: |
| 17 if t and t[-1] != os.sep: t += os.sep | |
| 18 l += [ x for x in files if x.startswith(t) ] | |
| 213 | 19 return l |
| 20 | |
| 245 | 21 def relfilter(repo, files): |
| 213 | 22 if os.getcwd() != repo.root: |
| 23 p = os.getcwd()[len(repo.root) + 1: ] | |
| 245 | 24 return filterfiles(p, files) |
| 25 return files | |
| 213 | 26 |
| 209 | 27 def relpath(repo, args): |
| 28 if os.getcwd() != repo.root: | |
| 29 p = os.getcwd()[len(repo.root) + 1: ] | |
| 245 | 30 return [ os.path.normpath(os.path.join(p, x)) for x in args ] |
| 209 | 31 return args |
| 245 | 32 |
| 33 def dodiff(repo, files = None, node1 = None, node2 = None): | |
| 34 def date(c): | |
| 35 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | |
| 36 | |
| 37 if node2: | |
| 38 change = repo.changelog.read(node2) | |
| 39 mmap2 = repo.manifest.read(change[0]) | |
| 40 (c, a, d) = repo.diffrevs(node1, node2) | |
| 41 def read(f): return repo.file(f).read(mmap2[f]) | |
| 42 date2 = date(change) | |
| 43 else: | |
| 44 date2 = time.asctime() | |
| 45 (c, a, d, u) = repo.diffdir(repo.root, node1) | |
| 46 if not node1: | |
| 47 node1 = repo.dirstate.parents()[0] | |
| 48 def read(f): return file(os.path.join(repo.root, f)).read() | |
| 49 | |
| 50 change = repo.changelog.read(node1) | |
| 51 mmap = repo.manifest.read(change[0]) | |
| 52 date1 = date(change) | |
| 53 | |
| 54 if files: | |
| 55 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | |
| 56 | |
| 57 for f in c: | |
| 58 to = repo.file(f).read(mmap[f]) | |
| 59 tn = read(f) | |
| 60 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 61 for f in a: | |
| 62 to = "" | |
| 63 tn = read(f) | |
| 64 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 65 for f in d: | |
| 66 to = repo.file(f).read(mmap[f]) | |
| 67 tn = "" | |
| 68 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 209 | 69 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
70 def help(ui, cmd=None): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
71 '''show help''' |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
72 if cmd: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
73 try: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
74 i = find(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
75 ui.write("%s\n\n" % i[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
76 ui.write(i[0].__doc__, "\n") |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
77 except UnknownCommand: |
| 252 | 78 ui.warn("unknown command %s" % cmd) |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
79 sys.exit(0) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
80 |
| 209 | 81 ui.status("""\ |
| 82 hg commands: | |
| 83 | |
| 84 add [files...] add the given files in the next commit | |
| 85 addremove add all new files, delete all missing files | |
| 86 annotate [files...] show changeset number per file line | |
| 87 branch <path> create a branch of <path> in this directory | |
| 88 checkout [changeset] checkout the latest or given changeset | |
| 89 commit commit all changes to the repository | |
| 90 diff [files...] diff working directory (or selected files) | |
| 91 dump <file> [rev] dump the latest or given revision of a file | |
| 92 dumpmanifest [rev] dump the latest or given revision of the manifest | |
| 93 export <rev> dump the changeset header and diffs for a revision | |
| 94 history show changeset history | |
| 95 init create a new repository in this directory | |
| 96 log <file> show revision history of a single file | |
| 97 merge <path> merge changes from <path> into local repository | |
| 98 recover rollback an interrupted transaction | |
| 99 remove [files...] remove the given files in the next commit | |
| 100 serve export the repository via HTTP | |
| 101 status show new, missing, and changed files in working dir | |
| 102 tags show current changeset tags | |
| 103 undo undo the last transaction | |
| 104 """) | |
| 105 | |
| 245 | 106 def add(ui, repo, file, *files): |
| 107 '''add the specified files on the next commit''' | |
| 108 repo.add(relpath(repo, (file,) + files)) | |
| 213 | 109 |
| 245 | 110 def addremove(ui, repo): |
| 230 | 111 (c, a, d, u) = repo.diffdir(repo.root) |
| 245 | 112 repo.add(a) |
| 113 repo.remove(d) | |
|
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
114 |
| 245 | 115 def annotate(u, repo, file, *files, **ops): |
| 209 | 116 def getnode(rev): |
| 117 return hg.short(repo.changelog.node(rev)) | |
| 118 | |
| 119 def getname(rev): | |
| 120 try: | |
| 121 return bcache[rev] | |
| 122 except KeyError: | |
| 123 cl = repo.changelog.read(repo.changelog.node(rev)) | |
| 124 name = cl[1] | |
| 125 f = name.find('@') | |
| 126 if f >= 0: | |
| 127 name = name[:f] | |
| 128 bcache[rev] = name | |
| 129 return name | |
| 130 | |
| 131 bcache = {} | |
| 132 opmap = [['user', getname], ['number', str], ['changeset', getnode]] | |
| 133 if not ops['user'] and not ops['changeset']: | |
| 134 ops['number'] = 1 | |
| 135 | |
| 227 | 136 node = repo.dirstate.parents()[0] |
| 209 | 137 if ops['revision']: |
| 138 node = repo.changelog.lookup(ops['revision']) | |
| 139 change = repo.changelog.read(node) | |
| 140 mmap = repo.manifest.read(change[0]) | |
| 141 maxuserlen = 0 | |
| 142 maxchangelen = 0 | |
| 245 | 143 for f in relpath(repo, (file,) + files): |
| 209 | 144 lines = repo.file(f).annotate(mmap[f]) |
| 145 pieces = [] | |
| 146 | |
| 147 for o, f in opmap: | |
| 148 if ops[o]: | |
| 149 l = [ f(n) for n,t in lines ] | |
| 150 m = max(map(len, l)) | |
| 151 pieces.append([ "%*s" % (m, x) for x in l]) | |
| 152 | |
| 153 for p,l in zip(zip(*pieces), lines): | |
| 154 u.write(" ".join(p) + ": " + l[1]) | |
| 155 | |
| 245 | 156 def branch(ui, path): |
| 157 '''branch from a local repository''' | |
| 158 # this should eventually support remote repos | |
| 159 os.system("cp -al %s/.hg .hg" % path) | |
| 160 | |
| 248 | 161 def cat(ui, repo, file, rev = []): |
| 162 r = repo.file(file) | |
| 163 n = r.tip() | |
| 164 if rev: n = r.lookup(rev) | |
| 165 sys.stdout.write(r.read(n)) | |
| 166 | |
| 245 | 167 def commit(ui, repo, *files): |
| 168 """commit the specified files or all outstanding changes""" | |
| 169 repo.commit(relpath(repo, files)) | |
| 170 | |
| 248 | 171 def debugaddchangegroup(ui, repo): |
| 172 data = sys.stdin.read() | |
| 173 repo.addchangegroup(data) | |
| 174 | |
| 175 def debugchangegroup(ui, repo, roots): | |
| 176 newer = repo.newer(map(repo.lookup, roots)) | |
| 177 for chunk in repo.changegroup(newer): | |
| 178 sys.stdout.write(chunk) | |
| 179 | |
| 180 def debugindex(ui, file): | |
| 181 r = hg.revlog(open, file, "") | |
| 182 print " rev offset length base linkrev"+\ | |
| 183 " p1 p2 nodeid" | |
| 184 for i in range(r.count()): | |
| 185 e = r.index[i] | |
| 186 print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % ( | |
| 187 i, e[0], e[1], e[2], e[3], | |
| 188 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])) | |
| 189 | |
| 190 def debugindexdot(ui, file): | |
| 191 r = hg.revlog(open, file, "") | |
| 192 print "digraph G {" | |
| 193 for i in range(r.count()): | |
| 194 e = r.index[i] | |
| 195 print "\t%d -> %d" % (r.rev(e[4]), i) | |
| 196 if e[5] != hg.nullid: | |
| 197 print "\t%d -> %d" % (r.rev(e[5]), i) | |
| 198 print "}" | |
| 199 | |
| 245 | 200 def diff(ui, repo, *files, **opts): |
| 201 revs = [] | |
| 202 if opts['rev']: | |
| 203 revs = map(lambda x: repo.lookup(x), opts['rev']) | |
| 204 | |
| 205 if len(revs) > 2: | |
| 206 self.ui.warn("too many revisions to diff\n") | |
| 207 sys.exit(1) | |
| 208 | |
| 209 if files: | |
| 210 files = relpath(repo, files) | |
| 211 else: | |
| 212 files = relpath(repo, [""]) | |
| 213 | |
| 214 dodiff(repo, files, *revs) | |
| 215 | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
216 def export(ui, repo, changeset): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
217 node = repo.lookup(changeset) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
218 prev, other = repo.changelog.parents(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
219 change = repo.changelog.read(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
220 print "# HG changeset patch" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
221 print "# User %s" % change[1] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
222 print "# Node ID %s" % hg.hex(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
223 print "# Parent %s" % hg.hex(prev) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
224 print |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
225 if other != hg.nullid: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
226 print "# Parent %s" % hg.hex(other) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
227 print change[4].rstrip() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
228 print |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
229 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
230 dodiff(repo, None, prev, node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
231 |
| 245 | 232 def forget(ui, repo, file, *files): |
| 233 """don't add the specified files on the next commit""" | |
| 234 repo.forget(relpath(repo, (file,) + files)) | |
| 235 | |
| 221 | 236 def heads(ui, repo): |
| 237 '''show current repository heads''' | |
| 238 for n in repo.changelog.heads(): | |
| 239 i = repo.changelog.rev(n) | |
| 240 changes = repo.changelog.read(n) | |
| 241 (p1, p2) = repo.changelog.parents(n) | |
| 242 (h, h1, h2) = map(hg.hex, (n, p1, p2)) | |
| 243 (i1, i2) = map(repo.changelog.rev, (p1, p2)) | |
| 244 print "rev: %4d:%s" % (i, h) | |
| 245 print "parents: %4d:%s" % (i1, h1) | |
| 246 if i2: print " %4d:%s" % (i2, h2) | |
| 247 print "manifest: %4d:%s" % (repo.manifest.rev(changes[0]), | |
| 248 hg.hex(changes[0])) | |
| 249 print "user:", changes[1] | |
| 250 print "date:", time.asctime( | |
| 251 time.localtime(float(changes[2].split(' ')[0]))) | |
| 252 if ui.verbose: print "files:", " ".join(changes[3]) | |
| 253 print "description:" | |
| 254 print changes[4] | |
| 255 | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
256 def history(ui, repo): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
257 """show the changelog history""" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
258 for i in range(repo.changelog.count()): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
259 n = repo.changelog.node(i) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
260 changes = repo.changelog.read(n) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
261 (p1, p2) = repo.changelog.parents(n) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
262 (h, h1, h2) = map(hg.hex, (n, p1, p2)) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
263 (i1, i2) = map(repo.changelog.rev, (p1, p2)) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
264 print "rev: %4d:%s" % (i, h) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
265 print "parents: %4d:%s" % (i1, h1) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
266 if i2: print " %4d:%s" % (i2, h2) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
267 print "manifest: %4d:%s" % (repo.manifest.rev(changes[0]), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
268 hg.hex(changes[0])) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
269 print "user:", changes[1] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
270 print "date:", time.asctime( |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
271 time.localtime(float(changes[2].split(' ')[0]))) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
272 if ui.verbose: print "files:", " ".join(changes[3]) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
273 print "description:" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
274 print changes[4] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
275 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
276 def patch(ui, repo, patches, opts): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
277 """import an ordered set of patches""" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
278 try: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
279 import psyco |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
280 psyco.full() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
281 except: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
282 pass |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
283 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
284 d = opts["base"] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
285 strip = opts["strip"] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
286 quiet = opts["quiet"] and "> /dev/null" or "" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
287 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
288 for patch in patches: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
289 ui.status("applying %s\n" % patch) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
290 pf = os.path.join(d, patch) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
291 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
292 text = "" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
293 for l in file(pf): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
294 if l[:4] == "--- ": break |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
295 text += l |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
296 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
297 f = os.popen("lsdiff --strip %d %s" % (strip, pf)) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
298 files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines())) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
299 f.close() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
300 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
301 if files: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
302 if os.system("patch -p%d < %s %s" % (strip, pf, quiet)): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
303 raise "patch failed!" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
304 repo.commit(files, text) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
305 |
| 245 | 306 def init(ui): |
| 307 """create a repository""" | |
| 308 hg.repository(ui, ".", create=1) | |
| 309 | |
| 310 def log(ui, repo, f): | |
| 311 f = relpath(repo, [f])[0] | |
| 312 | |
| 313 r = repo.file(f) | |
| 314 for i in range(r.count()): | |
| 315 n = r.node(i) | |
| 316 (p1, p2) = r.parents(n) | |
| 317 (h, h1, h2) = map(hg.hex, (n, p1, p2)) | |
| 318 (i1, i2) = map(r.rev, (p1, p2)) | |
| 319 cr = r.linkrev(n) | |
| 320 cn = hg.hex(repo.changelog.node(cr)) | |
| 321 print "rev: %4d:%s" % (i, h) | |
| 322 print "changeset: %4d:%s" % (cr, cn) | |
| 323 print "parents: %4d:%s" % (i1, h1) | |
| 324 if i2: print " %4d:%s" % (i2, h2) | |
| 325 changes = repo.changelog.read(repo.changelog.node(cr)) | |
| 326 print "user: %s" % changes[1] | |
| 327 print "date: %s" % time.asctime( | |
| 328 time.localtime(float(changes[2].split(' ')[0]))) | |
| 329 print "description:" | |
| 330 print changes[4].rstrip() | |
| 331 print | |
| 332 | |
| 248 | 333 def manifest(ui, repo, rev = []): |
| 334 n = repo.manifest.tip() | |
| 335 if rev: | |
| 336 n = repo.manifest.lookup(rev) | |
| 337 m = repo.manifest.read(n) | |
| 338 files = m.keys() | |
| 339 files.sort() | |
| 340 | |
| 341 for f in files: | |
| 342 print hg.hex(m[f]), f | |
| 343 | |
| 227 | 344 def parents(ui, repo, node = None): |
| 345 '''show the parents of the current working dir''' | |
| 346 if node: | |
| 347 p = repo.changelog.parents(repo.lookup(hg.bin(node))) | |
| 348 else: | |
| 349 p = repo.dirstate.parents() | |
| 350 | |
| 351 for n in p: | |
| 352 if n != hg.nullid: | |
| 353 ui.write("%d:%s\n" % (repo.changelog.rev(n), hg.hex(n))) | |
| 354 | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
355 def pull(ui, repo, source): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
356 """pull changes from the specified source""" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
357 paths = {} |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
358 try: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
359 pf = os.path.expanduser("~/.hgpaths") |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
360 for l in file(pf): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
361 name, path = l.split() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
362 paths[name] = path |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
363 except IOError: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
364 pass |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
365 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
366 if source in paths: source = paths[source] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
367 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
368 other = hg.repository(ui, source) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
369 cg = repo.getchangegroup(other) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
370 repo.addchangegroup(cg) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
371 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
372 def rawcommit(ui, repo, files, rc): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
373 "raw commit interface" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
374 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
375 text = rc['text'] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
376 if not text and rc['logfile']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
377 try: text = open(rc['logfile']).read() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
378 except IOError: pass |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
379 if not text and not rc['logfile']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
380 print "missing commit text" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
381 return 1 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
382 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
383 files = relpath(repo, files) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
384 if rc['files']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
385 files += open(rc['files']).read().splitlines() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
386 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
387 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent']) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
388 |
| 245 | 389 def recover(ui, repo): |
| 390 repo.recover() | |
| 391 | |
| 392 def remove(ui, repo, file, *files): | |
| 393 """remove the specified files on the next commit""" | |
| 394 repo.remove(relpath(repo, (file,) + files)) | |
| 395 | |
| 396 def serve(ui, repo, **opts): | |
| 397 from mercurial import hgweb | |
| 398 hgweb.server(repo.root, opts["name"], opts["templates"], | |
| 399 opts["address"], opts["port"]) | |
| 400 | |
| 213 | 401 def status(ui, repo): |
| 402 '''show changed files in the working directory | |
| 403 | |
| 245 | 404 C = changed |
| 405 A = added | |
| 406 R = removed | |
| 407 ? = not tracked''' | |
| 408 | |
| 230 | 409 (c, a, d, u) = repo.diffdir(repo.root) |
| 220 | 410 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) |
| 213 | 411 |
| 412 for f in c: print "C", f | |
| 220 | 413 for f in a: print "A", f |
| 213 | 414 for f in d: print "R", f |
| 220 | 415 for f in u: print "?", f |
| 213 | 416 |
| 248 | 417 def tags(ui, repo): |
| 418 repo.lookup(0) # prime the cache | |
| 419 i = repo.tags.items() | |
| 420 i.sort() | |
| 421 for k, n in i: | |
| 422 try: | |
| 423 r = repo.changelog.rev(n) | |
| 424 except KeyError: | |
| 425 r = "?" | |
| 426 print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n)) | |
| 427 | |
| 245 | 428 def tip(ui, repo): |
| 429 n = repo.changelog.tip() | |
| 430 t = repo.changelog.rev(n) | |
| 431 ui.status("%d:%s\n" % (t, hg.hex(n))) | |
| 432 | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
433 def undo(ui, repo): |
| 210 | 434 repo.undo() |
| 435 | |
| 254 | 436 def update(ui, repo, node=None): |
| 437 '''update or merge working directory | |
| 438 | |
| 439 If there are no outstanding changes in the working directory and | |
| 440 there is a linear relationship between the current version and the | |
| 441 requested version, the result is the requested version. | |
| 442 | |
| 443 Otherwise the result is a merge between the contents of the | |
| 444 current working directory and the requested version. Files that | |
| 445 changed between either parent are marked as changed for the next | |
| 446 commit and a commit must be performed before any further updates | |
| 447 are allowed. | |
| 448 ''' | |
| 449 node = node and repo.lookup(node) or repo.changelog.tip() | |
| 450 repo.update(node) | |
| 451 | |
| 247 | 452 def verify(ui, repo): |
| 453 """verify the integrity of the repository""" | |
| 454 return repo.verify() | |
| 455 | |
| 209 | 456 table = { |
| 245 | 457 "add": (add, [], "hg add [files]"), |
| 458 "addremove": (addremove, [], "hg addremove"), | |
| 209 | 459 "ann|annotate": (annotate, |
| 460 [('r', 'revision', '', 'revision'), | |
| 461 ('u', 'user', None, 'show user'), | |
| 462 ('n', 'number', None, 'show revision number'), | |
| 463 ('c', 'changeset', None, 'show changeset')], | |
| 464 'hg annotate [-u] [-c] [-n] [-r id] [files]'), | |
| 245 | 465 "branch|clone": (branch, [], 'hg branch [path]'), |
| 248 | 466 "cat|dump": (cat, [], 'hg cat <file> [rev]'), |
| 245 | 467 "commit|ci": (commit, [], 'hg commit [files]'), |
| 248 | 468 "debugaddchangegroup": (debugaddchangegroup, [], 'debugaddchangegroup'), |
| 469 "debugchangegroup": (debugchangegroup, [], 'debugchangegroup [roots]'), | |
| 470 "debugindex": (debugindex, [], 'debugindex <file>'), | |
| 471 "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'), | |
| 245 | 472 "diff": (diff, [('r', 'rev', [], 'revision')], |
| 473 'hg diff [-r A] [-r B] [files]'), | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
474 "export": (export, [], "hg export <changeset>"), |
| 245 | 475 "forget": (forget, [], "hg forget [files]"), |
| 476 "heads": (heads, [], 'hg heads'), | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
477 "history": (history, [], 'hg history'), |
| 245 | 478 "help": (help, [], 'hg help [command]'), |
| 479 "init": (init, [], 'hg init'), | |
| 480 "log": (log, [], 'hg log <file>'), | |
| 248 | 481 "manifest|dumpmanifest": (manifest, [], 'hg manifest [rev]'), |
| 227 | 482 "parents": (parents, [], 'hg parents [node]'), |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
483 "patch|import": (patch, |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
484 [('p', 'strip', 1, 'path strip'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
485 ('b', 'base', "", 'base path'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
486 ('q', 'quiet', "", 'silence diff')], |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
487 "hg import [options] patches"), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
488 "pull|merge": (pull, [], 'hg pull [source]'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
489 "rawcommit": (rawcommit, |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
490 [('p', 'parent', [], 'parent'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
491 ('d', 'date', "", 'data'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
492 ('u', 'user', "", 'user'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
493 ('F', 'files', "", 'file list'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
494 ('t', 'text', "", 'commit text'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
495 ('l', 'logfile', "", 'commit text file')], |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
496 'hg rawcommit [options] [files]'), |
| 245 | 497 "recover": (recover, [], "hg recover"), |
| 498 "remove": (remove, [], "hg remove [files]"), | |
| 499 "serve": (serve, [('p', 'port', 8000, 'listen port'), | |
| 500 ('a', 'address', '', 'interface address'), | |
| 501 ('n', 'name', os.getcwd(), 'repository name'), | |
| 502 ('t', 'templates', "", 'template map')], | |
| 503 "hg serve [options]"), | |
| 213 | 504 "status": (status, [], 'hg status'), |
| 248 | 505 "tags": (tags, [], 'hg tags'), |
| 245 | 506 "tip": (tip, [], 'hg tip'), |
| 210 | 507 "undo": (undo, [], 'hg undo'), |
| 254 | 508 "update|up|checkout|co|resolve": (update, [], 'hg update [node]'), |
| 247 | 509 "verify": (verify, [], 'hg verify'), |
| 209 | 510 } |
| 511 | |
| 248 | 512 norepo = "init branch help debugindex debugindexdot" |
| 209 | 513 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
514 def find(cmd): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
515 i = None |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
516 for e in table.keys(): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
517 if re.match(e + "$", cmd): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
518 return table[e] |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
519 |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
520 raise UnknownCommand(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
521 |
| 214 | 522 class SignalInterrupt(Exception): pass |
| 523 | |
| 524 def catchterm(*args): | |
| 525 raise SignalInterrupt | |
| 526 | |
| 249 | 527 def run(): |
| 528 sys.exit(dispatch(sys.argv[1:])) | |
| 529 | |
| 209 | 530 def dispatch(args): |
| 531 options = {} | |
| 532 opts = [('v', 'verbose', None, 'verbose'), | |
| 533 ('d', 'debug', None, 'debug'), | |
| 534 ('q', 'quiet', None, 'quiet'), | |
| 535 ('y', 'noninteractive', None, 'run non-interactively'), | |
| 536 ] | |
| 537 | |
| 538 args = fancyopts.fancyopts(args, opts, options, | |
| 539 'hg [options] <command> [options] [files]') | |
| 540 | |
| 541 if not args: | |
| 542 cmd = "help" | |
| 543 else: | |
| 544 cmd, args = args[0], args[1:] | |
| 545 | |
| 546 u = ui.ui(options["verbose"], options["debug"], options["quiet"], | |
| 547 not options["noninteractive"]) | |
| 548 | |
| 252 | 549 try: |
| 550 i = find(cmd) | |
| 551 except UnknownCommand: | |
| 552 u.warn("unknown command '%s'\n" % cmd) | |
| 553 help(u) | |
| 554 sys.exit(1) | |
| 209 | 555 |
| 214 | 556 signal.signal(signal.SIGTERM, catchterm) |
| 557 | |
| 209 | 558 cmdoptions = {} |
| 559 args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2]) | |
| 560 | |
| 561 if cmd not in norepo.split(): | |
| 562 repo = hg.repository(ui = u) | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
563 d = lambda: i[0](u, repo, *args, **cmdoptions) |
| 209 | 564 else: |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
565 d = lambda: i[0](u, *args, **cmdoptions) |
| 209 | 566 |
| 567 try: | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
568 return d() |
| 214 | 569 except SignalInterrupt: |
| 570 u.warn("killed!\n") | |
| 209 | 571 except KeyboardInterrupt: |
| 572 u.warn("interrupted!\n") | |
| 250 | 573 except IOError, inst: |
| 574 if inst.errno == 32: | |
| 575 u.warn("broken pipe\n") | |
| 576 else: | |
| 577 raise | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
578 except TypeError, inst: |
| 249 | 579 import traceback |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
580 # was this an argument error? |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
581 tb = traceback.extract_tb(sys.exc_info()[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
582 if len(tb) > 2: # no |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
583 raise |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
584 u.warn("%s: invalid arguments\n" % i[0].__name__) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
585 u.warn("syntax: %s\n" % i[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
586 sys.exit(-1) |