Mercurial > hg
changeset 9219:3f650f6aa130
merge with crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Thu, 23 Jul 2009 20:44:26 +0200 |
| parents | d3db87d68337 (current diff) 2250b5f1ab76 (diff) |
| children | 8a4da1388553 |
| files | hgext/fetch.py hgext/keyword.py mercurial/commands.py mercurial/subrepo.py |
| diffstat | 7 files changed, 17 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Thu Jul 23 00:26:42 2009 +0200 +++ b/.hgsigs Thu Jul 23 20:44:26 2009 +0200 @@ -13,3 +13,4 @@ 11efa41037e280d08cfb07c09ad485df30fb0ea8 0 iEYEABECAAYFAkmvJRQACgkQywK+sNU5EO9XZwCeLMgDgPSMWMm6vgjL4lDs2pEc5+0AnRxfiFbpbBfuEFTqKz9nbzeyoBlx 02981000012e3adf40c4849bd7b3d5618f9ce82d 0 iEYEABECAAYFAknEH3wACgkQywK+sNU5EO+uXwCeI+LbLMmhjU1lKSfU3UWJHjjUC7oAoIZLvYDGOL/tNZFUuatc3RnZ2eje 196d40e7c885fa6e95f89134809b3ec7bdbca34b 0 iEYEABECAAYFAkpL2X4ACgkQywK+sNU5EO9FOwCfXJycjyKJXsvQqKkHrglwOQhEKS4An36GfKzptfN8b1qNc3+ya/5c2WOM +3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 0 iEYEABECAAYFAkpopLIACgkQywK+sNU5EO8QSgCfZ0ztsd071rOa2lhmp9Fyue/WoI0AoLTei80/xrhRlB8L/rZEf2KBl8dA
--- a/.hgtags Thu Jul 23 00:26:42 2009 +0200 +++ b/.hgtags Thu Jul 23 20:44:26 2009 +0200 @@ -25,3 +25,4 @@ 11efa41037e280d08cfb07c09ad485df30fb0ea8 1.2 02981000012e3adf40c4849bd7b3d5618f9ce82d 1.2.1 196d40e7c885fa6e95f89134809b3ec7bdbca34b 1.3 +3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 1.3.1
--- a/hgext/fetch.py Thu Jul 23 00:26:42 2009 +0200 +++ b/hgext/fetch.py Thu Jul 23 20:44:26 2009 +0200 @@ -127,8 +127,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/hgext/keyword.py Thu Jul 23 00:26:42 2009 +0200 +++ b/hgext/keyword.py Thu Jul 23 20:44:26 2009 +0200 @@ -528,7 +528,7 @@ 'kwdemo': (demo, [('d', 'default', None, _('show default keyword template maps')), - ('f', 'rcfile', [], _('read maps from rcfile'))], + ('f', 'rcfile', '', _('read maps from rcfile'))], _('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')), 'kwexpand': (expand, commands.walkopts, _('hg kwexpand [OPTION]... [FILE]...')),
--- a/mercurial/commands.py Thu Jul 23 00:26:42 2009 +0200 +++ b/mercurial/commands.py Thu Jul 23 20:44:26 2009 +0200 @@ -1359,6 +1359,8 @@ closed = opts.get('closed') hideinactive, _heads = opts.get('active'), None if not branchrevs: + if closed: + raise error.Abort(_('you must specify a branch to use --closed')) # Assume we're looking repo-wide heads if no revs were specified. heads = repo.heads(start) else: @@ -3013,7 +3015,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) @@ -3175,7 +3177,7 @@ [('a', 'active', False, _('show only branches that have unmerged heads')), ('c', 'closed', False, - _('show normal and closed heads'))], + _('show normal and closed branches'))], _('[-a]')), "bundle": (bundle, @@ -3292,9 +3294,9 @@ (heads, [('r', 'rev', '', _('show only heads which are descendants of REV')), ('a', 'active', False, - _('show only the active heads from open branches')), + _('show only the active branch heads from open branches')), ('c', 'closed', False, - _('show normal and closed heads')), + _('show normal and closed branch heads')), ] + templateopts, _('[-r STARTREV] [REV]...')), "help": (help_, [], _('[TOPIC]')),
--- a/mercurial/subrepo.py Thu Jul 23 00:26:42 2009 +0200 +++ b/mercurial/subrepo.py Thu Jul 23 20:44:26 2009 +0200 @@ -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)
--- a/tests/test-branches.out Thu Jul 23 00:26:42 2009 +0200 +++ b/tests/test-branches.out Thu Jul 23 20:44:26 2009 +0200 @@ -63,26 +63,7 @@ c 6:589736a22561 (inactive) a 5:d8cbc61dbaa6 (inactive) default 0:19709c5a4e75 (inactive) -changeset: 10:bfbe841b666e -branch: b -tag: tip -user: test -date: Thu Jan 01 00:00:09 1970 +0000 -summary: adding another cset to branch b - -changeset: 8:eebb944467c9 -branch: b -parent: 4:aee39cd168d0 -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: adding cset to branch b - -changeset: 7:10ff5895aa57 -branch: a branch name much longer than the default justification used by branches -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Adding d branch - +abort: you must specify a branch to use --closed changeset: 10:bfbe841b666e branch: b tag: tip