Mercurial > hg
changeset 9188:4c287332e03b
Merge with crew-stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 22 Jul 2009 18:08:02 -0500 |
| parents | 7bb1dbfd3082 (diff) f6eb03027411 (current diff) |
| children | c2041f80f22a |
| files | hgext/fetch.py mercurial/commands.py |
| diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fetch.py Wed Jul 22 15:26:27 2009 -0700 +++ b/hgext/fetch.py Wed Jul 22 18:08:02 2009 -0500 @@ -128,8 +128,7 @@ editor = cmdutil.commiteditor if opts.get('force_editor') or opts.get('edit'): editor = cmdutil.commitforceeditor - n = repo.commit(message, opts['user'], opts['date'], - force=True, editor=editor) + n = repo.commit(message, opts['user'], opts['date'], editor=editor) ui.status(_('new changeset %d:%s merges remote changes ' 'with local\n') % (repo.changelog.rev(n), short(n)))
--- a/mercurial/commands.py Wed Jul 22 15:26:27 2009 -0700 +++ b/mercurial/commands.py Wed Jul 22 18:08:02 2009 -0500 @@ -3048,7 +3048,7 @@ raise util.Abort(_("you can't specify a revision and a date")) rev = cmdutil.finddate(ui, repo, date) - if clean: + if clean or check: return hg.clean(repo, rev) else: return hg.update(repo, rev)
--- a/mercurial/subrepo.py Wed Jul 22 15:26:27 2009 -0700 +++ b/mercurial/subrepo.py Wed Jul 22 18:08:02 2009 -0500 @@ -107,7 +107,12 @@ source = repo._subsource if source.startswith('/') or '://' in source: return source - return os.path.join(_abssource(repo._subparent), repo._subsource) + parent = _abssource(repo._subparent) + if '://' in parent: + if parent[-1] == '/': + parent = parent[:-1] + return parent + '/' + source + return os.path.join(parent, repo._subsource) if push and repo.ui.config('paths', 'default-push'): return repo.ui.config('paths', 'default-push', repo.root) return repo.ui.config('paths', 'default', repo.root)