Mercurial > hg-stable
changeset 16880:15159abc5ab6 stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 06 Jun 2012 21:17:20 -0500 |
| parents | 6e578e77cbe6 (diff) d5f360250455 (current diff) |
| children | 2255950e1f76 a2d6e336e9cc 51932c835b74 |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/bugzilla.py Tue Jun 05 10:09:17 2012 -0300 +++ b/hgext/bugzilla.py Wed Jun 06 21:17:20 2012 -0500 @@ -654,8 +654,9 @@ if self.bzvermajor >= 4: args['ids'] = [bugid] args['comment'] = {'body' : text} - args['status'] = self.fixstatus - args['resolution'] = self.fixresolution + if 'fix' in newstate: + args['status'] = self.fixstatus + args['resolution'] = self.fixresolution self.bzproxy.Bug.update(args) else: if 'fix' in newstate:
--- a/mercurial/commands.py Tue Jun 05 10:09:17 2012 -0300 +++ b/mercurial/commands.py Wed Jun 06 21:17:20 2012 -0500 @@ -2695,7 +2695,7 @@ stats = mergemod.update(repo, ctx.node(), True, True, False, ctx.p1().node()) finally: - ui.setconfig('ui', 'forcemerge', '') + repo.ui.setconfig('ui', 'forcemerge', '') # drop the second merge parent repo.setparents(current.node(), nullid) repo.dirstate.write() @@ -2950,7 +2950,7 @@ ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), ('c', 'closed', False, _('show normal and closed branch heads')), ] + templateopts, - _('[-ac] [-r STARTREV] [REV]...')) + _('[-ct] [-r STARTREV] [REV]...')) def heads(ui, repo, *branchrevs, **opts): """show current repository heads or show branch heads @@ -5607,10 +5607,10 @@ current named branch and move the current bookmark (see :hg:`help bookmarks`). - If the changeset is not a descendant of the working directory's - parent, the update is aborted. With the -c/--check option, the - working directory is checked for uncommitted changes; if none are - found, the working directory is updated to the specified + If the changeset is not a descendant or ancestor of the working + directory's parent, the update is aborted. With the -c/--check + option, the working directory is checked for uncommitted changes; if + none are found, the working directory is updated to the specified changeset. Update sets the working directory's parent revison to the specified
--- a/mercurial/templates/gitweb/filediff.tmpl Tue Jun 05 10:09:17 2012 -0300 +++ b/mercurial/templates/gitweb/filediff.tmpl Wed Jun 06 21:17:20 2012 -0500 @@ -26,8 +26,9 @@ <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | diff | -<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/> | +<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a> | <a href="{url}help{sessionvars%urlparameter}">help</a> +<br/> </div> <div class="title">{file|escape}</div>