Mercurial > hg
comparison hgext/rebase.py @ 7599:7bf7c073375e
lowercase ui.debug and assert output
This does not effect the log or status commands and should be okay
according to the compatibility rules.
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sat, 03 Jan 2009 17:15:21 +0100 |
| parents | 3e5db4228f8f |
| children | 4dd7b28003d2 |
comparison
equal
deleted
inserted
replaced
| 7598:26adfaccdf73 | 7599:7bf7c073375e |
|---|---|
| 32 return ancestor.ancestor(a, b, pfunc) | 32 return ancestor.ancestor(a, b, pfunc) |
| 33 | 33 |
| 34 if not first: | 34 if not first: |
| 35 ancestor.ancestor = newancestor | 35 ancestor.ancestor = newancestor |
| 36 else: | 36 else: |
| 37 repo.ui.debug(_("First revision, do not change ancestor\n")) | 37 repo.ui.debug(_("first revision, do not change ancestor\n")) |
| 38 stats = merge.update(repo, rev, True, True, False) | 38 stats = merge.update(repo, rev, True, True, False) |
| 39 return stats | 39 return stats |
| 40 | 40 |
| 41 def rebase(ui, repo, **opts): | 41 def rebase(ui, repo, **opts): |
| 42 """move changeset (and descendants) to a different branch | 42 """move changeset (and descendants) to a different branch |