Mercurial > public > mercurial-scm > hg
diff hgext/rebase.py @ 6923:ebf1462f2145
strip trailing whitespace, replace tabs by spaces
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Thu, 21 Aug 2008 11:35:17 +0200 |
parents | 808f03f61ebe |
children | b3239badc711 |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Aug 21 10:55:24 2008 +0200 +++ b/hgext/rebase.py Thu Aug 21 11:35:17 2008 +0200 @@ -86,7 +86,7 @@ ui.note(_('rebase merging completed\n')) if collapsef: - p1, p2 = defineparents(repo, min(state), target, + p1, p2 = defineparents(repo, min(state), target, state, targetancestors) concludenode(repo, rev, p1, external, state, collapsef, last=True, skipped=skipped) @@ -96,7 +96,7 @@ if not opts.get('keep'): # Remove no more useful revisions - if (util.set(repo.changelog.descendants(min(state))) + if (util.set(repo.changelog.descendants(min(state))) - util.set(state.keys())): ui.warn(_("warning: new changesets detected on source branch, " "not stripping\n")) @@ -174,7 +174,7 @@ repo.ui.debug('next revision set to %s\n' % p1) skipped[rev] = True state[rev] = p1 - + def defineparents(repo, rev, target, state, targetancestors): 'Return the new parent relationship of the revision that will be rebased' parents = repo[rev].parents() @@ -224,7 +224,7 @@ if rev not in skipped: repo.ui.debug('import mq patch %d (%s)\n' % (state[rev], mqrebase[rev])) - repo.mq.qimport(repo, (), patchname=mqrebase[rev], + repo.mq.qimport(repo, (), patchname=mqrebase[rev], git=opts.get('git', False),rev=[str(state[rev])]) repo.mq.save_dirty() @@ -330,7 +330,7 @@ cwdancestors.add(cwd) rebasingbranch = cwdancestors - targetancestors source = min(rebasingbranch) - + repo.ui.debug(_('rebase onto %d starting from %d\n') % (dest, source)) state = dict.fromkeys(repo.changelog.descendants(source), nullrev) external = nullrev @@ -379,7 +379,7 @@ # make sure 'hg help cmd' still works decorator.__doc__ = cmdentry[0].__doc__ decoratorentry = (decorator,) + cmdentry[1:] - rebaseopt = ('', 'rebase', None, + rebaseopt = ('', 'rebase', None, _("rebase working directory to branch head")) decoratorentry[1].append(rebaseopt) commands.table[cmdkey] = decoratorentry