Mercurial > hg
changeset 62:022d98aa0a2a
Fix tabs
Update version number
Set new merge as the default
| author | mpm@selenic.com |
|---|---|
| date | Thu, 12 May 2005 01:23:26 -0800 |
| parents | 1215bf60468f |
| children | 1c590d34bf61 |
| files | hg |
| diffstat | 1 files changed, 16 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/hg Thu May 12 01:22:37 2005 -0800 +++ b/hg Thu May 12 01:23:26 2005 -0800 @@ -1,7 +1,7 @@ #!/usr/bin/env python # # mercurial - a minimal scalable distributed SCM -# v0.4d "oedipa maas" +# v0.4e "sabina" # # Copyright 2005 Matt Mackall <mpm@selenic.com> # @@ -147,11 +147,11 @@ ui.status("applying %s\n" % patch) pf = os.path.join(d, patch) - text = "" - for l in file(pf): + text = "" + for l in file(pf): if l[:3] == "---": break - text += l - + text += l + if os.system("patch -p%d < %s %s" % (strip, pf, quiet)): raise "patch failed!" f = os.popen("lsdiff --strip %d %s" % (strip, pf)) @@ -188,23 +188,13 @@ elif cmd == "debugchangegroup": newer = repo.newer(map(repo.changelog.lookup, args)) - cg = repo.changegroup(newer) - sys.stdout.write(cg) + for chunk in repo.changegroup(newer): + sys.stdout.write(chunk) elif cmd == "debugaddchangegroup": data = sys.stdin.read() repo.addchangegroup(data) -elif cmd == "debuggetchangegroup": - if args: - other = hg.repository(ui, args[0]) - print "building changegroup" - cg = repo.getchangegroup(other) - print "applying changegroup" - repo.addchangegroup(cg) - else: - print "missing source repository" - elif cmd == "addremove": (c, a, d) = repo.diffdir(repo.root, repo.current) repo.add(a) @@ -283,6 +273,15 @@ elif cmd == "merge": if args: other = hg.repository(ui, args[0]) + print "retrieving changegroup" + cg = repo.getchangegroup(other) + repo.addchangegroup(cg) + else: + print "missing source repository" + +elif cmd == "debugoldmerge": + if args: + other = hg.repository(ui, args[0]) repo.merge(other) else: print "missing source repository"