Mercurial > hg
comparison hgext/rebase.py @ 30490:ee2097c560c1
rebase: refer to dirstateguard by its new name
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 21 Nov 2016 21:27:12 -0500 |
parents | bccd89b46cbf |
children | d528ddc11b33 |
comparison
equal
deleted
inserted
replaced
30489:0ae83ede68c5 | 30490:ee2097c560c1 |
---|---|
30 bookmarks, | 30 bookmarks, |
31 cmdutil, | 31 cmdutil, |
32 commands, | 32 commands, |
33 copies, | 33 copies, |
34 destutil, | 34 destutil, |
35 dirstateguard, | |
35 error, | 36 error, |
36 extensions, | 37 extensions, |
37 hg, | 38 hg, |
38 lock, | 39 lock, |
39 merge as mergemod, | 40 merge as mergemod, |
788 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None, | 789 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None, |
789 keepbranches=False, date=None): | 790 keepbranches=False, date=None): |
790 '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev | 791 '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev |
791 but also store useful information in extra. | 792 but also store useful information in extra. |
792 Return node of committed revision.''' | 793 Return node of committed revision.''' |
793 dsguard = cmdutil.dirstateguard(repo, 'rebase') | 794 dsguard = dirstateguard.dirstateguard(repo, 'rebase') |
794 try: | 795 try: |
795 repo.setparents(repo[p1].node(), repo[p2].node()) | 796 repo.setparents(repo[p1].node(), repo[p2].node()) |
796 ctx = repo[rev] | 797 ctx = repo[rev] |
797 if commitmsg is None: | 798 if commitmsg is None: |
798 commitmsg = ctx.description() | 799 commitmsg = ctx.description() |