Mercurial > hg
comparison hgext/patchbomb.py @ 12794:6bf8d48bec8e
merge with stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 20 Oct 2010 23:48:33 +0200 |
parents | 338b4b615d33 469850088fc1 |
children | d85e30889f26 |
comparison
equal
deleted
inserted
replaced
12792:0c6c600c03fd | 12794:6bf8d48bec8e |
---|---|
46 ''' | 46 ''' |
47 | 47 |
48 import os, errno, socket, tempfile, cStringIO, time | 48 import os, errno, socket, tempfile, cStringIO, time |
49 import email.MIMEMultipart, email.MIMEBase | 49 import email.MIMEMultipart, email.MIMEBase |
50 import email.Utils, email.Encoders, email.Generator | 50 import email.Utils, email.Encoders, email.Generator |
51 from mercurial import cmdutil, commands, hg, mail, patch, util, discovery | 51 from mercurial import cmdutil, commands, hg, mail, patch, util, discovery, url |
52 from mercurial.i18n import _ | 52 from mercurial.i18n import _ |
53 from mercurial.node import bin | 53 from mercurial.node import bin |
54 | 54 |
55 def prompt(ui, prompt, default=None, rest=':'): | 55 def prompt(ui, prompt, default=None, rest=':'): |
56 if not ui.interactive() and default is None: | 56 if not ui.interactive() and default is None: |
236 dest, branches = hg.parseurl(dest) | 236 dest, branches = hg.parseurl(dest) |
237 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | 237 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
238 if revs: | 238 if revs: |
239 revs = [repo.lookup(rev) for rev in revs] | 239 revs = [repo.lookup(rev) for rev in revs] |
240 other = hg.repository(hg.remoteui(repo, opts), dest) | 240 other = hg.repository(hg.remoteui(repo, opts), dest) |
241 ui.status(_('comparing with %s\n') % dest) | 241 ui.status(_('comparing with %s\n') % url.hidepassword(dest)) |
242 o = discovery.findoutgoing(repo, other) | 242 o = discovery.findoutgoing(repo, other) |
243 if not o: | 243 if not o: |
244 ui.status(_("no changes found\n")) | 244 ui.status(_("no changes found\n")) |
245 return [] | 245 return [] |
246 o = repo.changelog.nodesbetween(o, revs)[0] | 246 o = repo.changelog.nodesbetween(o, revs)[0] |